AyeCode / invoicing

includes/wpinv-payment-functions.php

Spacing +160 added lines, -160 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-function wpinv_get_subscriptions( $args = array() ) {
-    if ( empty( $args['parent_invoice_id'] ) ) {
+function wpinv_get_subscriptions($args = array()) {
+    if (empty($args['parent_invoice_id'])) {
         return false;
     }
     
@@ -14,18 +14,18 @@ 
     );
 
     $args['post_parent']    = $args['parent_invoice_id'];
-    $args                   = wp_parse_args( $args, $defaults );
+    $args                   = wp_parse_args($args, $defaults);
 
-    if( $args['numberposts'] < 1 ) {
+    if ($args['numberposts'] < 1) {
         $args['numberposts'] = 999999999999;
     }
 
-    $posts          = get_posts( $args );
+    $posts          = get_posts($args);
     $subscriptions  = array();
-    if ( !empty( $posts ) ) {
-        foreach ( $posts as $post ) {
-            if ( !empty( $post->ID ) ) {
-                $subscriptions[] = wpinv_get_invoice( $post->ID );
+    if (!empty($posts)) {
+        foreach ($posts as $post) {
+            if (!empty($post->ID)) {
+                $subscriptions[] = wpinv_get_invoice($post->ID);
             }
         }
     }
@@ -33,19 +33,19 @@ 
     
     return $subscriptions;
 }
-function wpinv_get_subscription( $id = 0, $by_profile_id = false ) {
+function wpinv_get_subscription($id = 0, $by_profile_id = false) {
     global $wpdb;
 
-    if ( empty( $id ) ) {
+    if (empty($id)) {
         return false;
     }
 
-    $id = esc_sql( $id );
+    $id = esc_sql($id);
 
-    $invoice_id = $wpdb->get_var( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_profile_id' AND meta_value = '{$id}' LIMIT 1" );
+    $invoice_id = $wpdb->get_var("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_profile_id' AND meta_value = '{$id}' LIMIT 1");
 
-    if ( $invoice_id != null ) {
-        return wpinv_get_invoice( $invoice_id );
+    if ($invoice_id != null) {
+        return wpinv_get_invoice($invoice_id);
     }
 
     return false;
@@ -55,49 +55,49 @@ 
  * Records a new payment on the subscription
  * 
  */
-function wpinv_recurring_add_subscription_payment( $parent_invoice_id, $subscription_args = array() ) {    
-    $args = wp_parse_args( $subscription_args, array(
+function wpinv_recurring_add_subscription_payment($parent_invoice_id, $subscription_args = array()) {    
+    $args = wp_parse_args($subscription_args, array(
         'amount'         => '',
         'transaction_id' => '',
         'gateway'        => ''
-    ) );
+    ));
 
-    if ( wpinv_payment_exists( $args['transaction_id'] ) ) {
+    if (wpinv_payment_exists($args['transaction_id'])) {
         return false;
     }
     
-    $parent_invoice = wpinv_get_invoice( $parent_invoice_id );
-    if ( empty( $parent_invoice ) ) {
+    $parent_invoice = wpinv_get_invoice($parent_invoice_id);
+    if (empty($parent_invoice)) {
         return;
     }
 
     $invoice = new WPInv_Invoice();
-    $invoice->set( 'parent_invoice', $parent_invoice_id );
-    $invoice->set( 'currency', $parent_invoice->get_currency() );
+    $invoice->set('parent_invoice', $parent_invoice_id);
+    $invoice->set('currency', $parent_invoice->get_currency());
     //$invoice->set( 'status', 'publish' );
-    $invoice->set( 'transaction_id', $args['transaction_id'] );
-    $invoice->set( 'key', $parent_invoice->get_key() );
+    $invoice->set('transaction_id', $args['transaction_id']);
+    $invoice->set('key', $parent_invoice->get_key());
     
-    $invoice->set( 'ip', $parent_invoice->ip );
-    $invoice->set( 'user_id', $parent_invoice->get_user_id() );
-    $invoice->set( 'first_name', $parent_invoice->get_first_name() );
-    $invoice->set( 'last_name', $parent_invoice->get_last_name() );
+    $invoice->set('ip', $parent_invoice->ip);
+    $invoice->set('user_id', $parent_invoice->get_user_id());
+    $invoice->set('first_name', $parent_invoice->get_first_name());
+    $invoice->set('last_name', $parent_invoice->get_last_name());
     ///$invoice->set( 'email', $parent_invoice->get_email() );
-    $invoice->set( 'phone', $parent_invoice->phone );
-    $invoice->set( 'address', $parent_invoice->address );
-    $invoice->set( 'city', $parent_invoice->city );
-    $invoice->set( 'country', $parent_invoice->country );
-    $invoice->set( 'state', $parent_invoice->state );
-    $invoice->set( 'zip', $parent_invoice->zip );
-    $invoice->set( 'company', $parent_invoice->company );
-    $invoice->set( 'vat_number', $parent_invoice->vat_number );
-    $invoice->set( 'vat_rate', $parent_invoice->vat_rate );
-    $invoice->set( 'adddress_confirmed', $parent_invoice->adddress_confirmed );
-
-    if ( empty( $args['gateway'] ) ) {
-        $invoice->set( 'gateway', $parent_invoice->get_gateway() );
+    $invoice->set('phone', $parent_invoice->phone);
+    $invoice->set('address', $parent_invoice->address);
+    $invoice->set('city', $parent_invoice->city);
+    $invoice->set('country', $parent_invoice->country);
+    $invoice->set('state', $parent_invoice->state);
+    $invoice->set('zip', $parent_invoice->zip);
+    $invoice->set('company', $parent_invoice->company);
+    $invoice->set('vat_number', $parent_invoice->vat_number);
+    $invoice->set('vat_rate', $parent_invoice->vat_rate);
+    $invoice->set('adddress_confirmed', $parent_invoice->adddress_confirmed);
+
+    if (empty($args['gateway'])) {
+        $invoice->set('gateway', $parent_invoice->get_gateway());
     } else {
-        $invoice->set( 'gateway', $args['gateway'] );
+        $invoice->set('gateway', $args['gateway']);
     }
     
     $recurring_details = $parent_invoice->get_recurring_details();
@@ -105,11 +105,11 @@ 
     // increase the earnings for each item in the subscription
     $items = $recurring_details['cart_details'];
     
-    if ( $items ) {        
+    if ($items) {        
         $add_items      = array();
         $cart_details   = array();
         
-        foreach ( $items as $item ) {
+        foreach ($items as $item) {
             $add_item             = array();
             $add_item['id']       = $item['id'];
             $add_item['quantity'] = $item['quantity'];
@@ -119,7 +119,7 @@ 
             break;
         }
         
-        $invoice->set( 'items', $add_items );
+        $invoice->set('items', $add_items);
         $invoice->cart_details = $cart_details;
     }
     
@@ -129,277 +129,277 @@ 
     $tax                = $recurring_details['tax'];
     $discount           = $recurring_details['discount'];
     
-    if ( $discount > 0 ) {
-        $invoice->set( 'discount_code', $parent_invoice->discount_code );
+    if ($discount > 0) {
+        $invoice->set('discount_code', $parent_invoice->discount_code);
     }
     
-    $invoice->subtotal = wpinv_format_amount( $subtotal, NULL, true );
-    $invoice->tax      = wpinv_format_amount( $tax, NULL, true );
-    $invoice->discount = wpinv_format_amount( $discount, NULL, true );
-    $invoice->total    = wpinv_format_amount( $total, NULL, true );
+    $invoice->subtotal = wpinv_format_amount($subtotal, NULL, true);
+    $invoice->tax      = wpinv_format_amount($tax, NULL, true);
+    $invoice->discount = wpinv_format_amount($discount, NULL, true);
+    $invoice->total    = wpinv_format_amount($total, NULL, true);
     $invoice->save();
     
-    wpinv_update_payment_status( $invoice->ID, 'publish' );
+    wpinv_update_payment_status($invoice->ID, 'publish');
     sleep(1);
-    wpinv_update_payment_status( $invoice->ID, 'renewal' );
+    wpinv_update_payment_status($invoice->ID, 'renewal');
     
-    $invoice = wpinv_get_invoice( $invoice->ID );
+    $invoice = wpinv_get_invoice($invoice->ID);
     
-    $subscription_data                      = wpinv_payment_subscription_data( $parent_invoice );
+    $subscription_data                      = wpinv_payment_subscription_data($parent_invoice);
     $subscription_data['recurring_amount']  = $invoice->get_total();
-    $subscription_data['created']           = current_time( 'mysql', 0 );
-    $subscription_data['expiration']        = $invoice->get_new_expiration( $subscription_data['item_id'] );
+    $subscription_data['created']           = current_time('mysql', 0);
+    $subscription_data['expiration']        = $invoice->get_new_expiration($subscription_data['item_id']);
     
     // Retrieve pending subscription from database and update it's status to active and set proper profile ID
-    $invoice->update_subscription( $subscription_data );
+    $invoice->update_subscription($subscription_data);
 
-    do_action( 'wpinv_recurring_add_subscription_payment', $invoice, $parent_invoice, $subscription_args );
-    do_action( 'wpinv_recurring_record_payment', $invoice->ID, $parent_invoice_id, $subscription_args );
+    do_action('wpinv_recurring_add_subscription_payment', $invoice, $parent_invoice, $subscription_args);
+    do_action('wpinv_recurring_record_payment', $invoice->ID, $parent_invoice_id, $subscription_args);
 
     return $invoice;
 }
 
-function wpinv_payment_exists( $txn_id = '' ) {
+function wpinv_payment_exists($txn_id = '') {
     global $wpdb;
 
-    if ( empty( $txn_id ) ) {
+    if (empty($txn_id)) {
         return false;
     }
 
-    $txn_id = esc_sql( $txn_id );
+    $txn_id = esc_sql($txn_id);
 
-    $invoice = $wpdb->get_var( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_transaction_id' AND meta_value = '{$txn_id}' LIMIT 1" );
+    $invoice = $wpdb->get_var("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_transaction_id' AND meta_value = '{$txn_id}' LIMIT 1");
 
-    if ( $invoice != null ) {
+    if ($invoice != null) {
         return true;
     }
 
     return false;
 }
 
-function wpinv_is_subscription_payment( $invoice = '' ) {
-    if ( empty( $invoice ) ) {
+function wpinv_is_subscription_payment($invoice = '') {
+    if (empty($invoice)) {
         return false;
     }
     
-    if ( !is_object( $invoice ) && is_scalar( $invoice ) ) {
-        $invoice = wpinv_get_invoice( $invoice );
+    if (!is_object($invoice) && is_scalar($invoice)) {
+        $invoice = wpinv_get_invoice($invoice);
     }
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
         
-    if ( $invoice->is_renewal() ) {
+    if ($invoice->is_renewal()) {
         return true;
     }
 
     return false;
 }
 
-function wpinv_payment_subscription_data( $invoice = '' ) {
-    if ( empty( $invoice ) ) {
+function wpinv_payment_subscription_data($invoice = '') {
+    if (empty($invoice)) {
         return false;
     }
     
-    if ( !is_object( $invoice ) && is_scalar( $invoice ) ) {
-        $invoice = wpinv_get_invoice( $invoice );
+    if (!is_object($invoice) && is_scalar($invoice)) {
+        $invoice = wpinv_get_invoice($invoice);
     }
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }    
 
     return $invoice->get_subscription_data();
 }
 
-function wpinv_payment_link_transaction_id( $invoice = '' ) {
-    if ( empty( $invoice ) ) {
+function wpinv_payment_link_transaction_id($invoice = '') {
+    if (empty($invoice)) {
         return false;
     }
     
-    if ( !is_object( $invoice ) && is_scalar( $invoice ) ) {
-        $invoice = wpinv_get_invoice( $invoice );
+    if (!is_object($invoice) && is_scalar($invoice)) {
+        $invoice = wpinv_get_invoice($invoice);
     }
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
 
-    return apply_filters( 'wpinv_payment_details_transaction_id-' . $invoice->gateway, $invoice->get_transaction_id(), $invoice->ID, $invoice );
+    return apply_filters('wpinv_payment_details_transaction_id-' . $invoice->gateway, $invoice->get_transaction_id(), $invoice->ID, $invoice);
 }
 
-function wpinv_get_pretty_subscription_period( $period ) {
+function wpinv_get_pretty_subscription_period($period) {
     $frequency = '';
     //Format period details
-    switch ( $period ) {
+    switch ($period) {
         case 'D' :
         case 'day' :
-            $frequency = __( 'Daily', 'invoicing' );
+            $frequency = __('Daily', 'invoicing');
             break;
         case 'W' :
         case 'week' :
-            $frequency = __( 'Weekly', 'invoicing' );
+            $frequency = __('Weekly', 'invoicing');
             break;
         case 'M' :
         case 'month' :
-            $frequency = __( 'Monthly', 'invoicing' );
+            $frequency = __('Monthly', 'invoicing');
             break;
         case 'Y' :
         case 'year' :
-            $frequency = __( 'Yearly', 'invoicing' );
+            $frequency = __('Yearly', 'invoicing');
             break;
         default :
-            $frequency = apply_filters( 'wpinv_pretty_subscription_period', $frequency, $period );
+            $frequency = apply_filters('wpinv_pretty_subscription_period', $frequency, $period);
             break;
     }
 
     return $frequency;
 }
 
-function wpinv_get_pretty_subscription_period_name( $period ) {
+function wpinv_get_pretty_subscription_period_name($period) {
     $frequency = '';
     //Format period details
-    switch ( $period ) {
+    switch ($period) {
         case 'D' :
         case 'day' :
-            $frequency = __( 'Day', 'invoicing' );
+            $frequency = __('Day', 'invoicing');
             break;
         case 'W' :
         case 'week' :
-            $frequency = __( 'Week', 'invoicing' );
+            $frequency = __('Week', 'invoicing');
             break;
         case 'M' :
         case 'month' :
-            $frequency = __( 'Month', 'invoicing' );
+            $frequency = __('Month', 'invoicing');
             break;
         case 'Y' :
         case 'year' :
-            $frequency = __( 'Year', 'invoicing' );
+            $frequency = __('Year', 'invoicing');
             break;
         default :
-            $frequency = apply_filters( 'wpinv_pretty_subscription_period_name', $frequency, $period );
+            $frequency = apply_filters('wpinv_pretty_subscription_period_name', $frequency, $period);
             break;
     }
 
     return $frequency;
 }
 
-function wpinv_subscription_initial_payment_desc( $amount, $period, $interval, $trial_period = '', $trial_interval = 0 ) {
+function wpinv_subscription_initial_payment_desc($amount, $period, $interval, $trial_period = '', $trial_interval = 0) {
     $interval   = (int)$interval > 0 ? (int)$interval : 1;
     
-    if ( $trial_interval > 0 && !empty( $trial_period ) ) {
-        $amount = __( 'Free', 'invoicing' );
+    if ($trial_interval > 0 && !empty($trial_period)) {
+        $amount = __('Free', 'invoicing');
         $interval = $trial_interval;
         $period = $trial_period;
     }
     
     $description = '';
-    switch ( $period ) {
+    switch ($period) {
         case 'D' :
         case 'day' :
-            $description = wp_sprintf( _n( '%s for the first day.', '%s for the first %d days.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first day.', '%s for the first %d days.', $interval, 'invoicing'), $amount, $interval);
             break;
         case 'W' :
         case 'week' :
-            $description = wp_sprintf( _n( '%s for the first week.', '%s for the first %d weeks.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first week.', '%s for the first %d weeks.', $interval, 'invoicing'), $amount, $interval);
             break;
         case 'M' :
         case 'month' :
-            $description = wp_sprintf( _n( '%s for the first month.', '%s for the first %d months.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first month.', '%s for the first %d months.', $interval, 'invoicing'), $amount, $interval);
             break;
         case 'Y' :
         case 'year' :
-            $description = wp_sprintf( _n( '%s for the first year.', '%s for the first %d years.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first year.', '%s for the first %d years.', $interval, 'invoicing'), $amount, $interval);
             break;
     }
 
-    return apply_filters( 'wpinv_subscription_initial_payment_desc', $description, $amount, $period, $interval, $trial_period, $trial_interval  );
+    return apply_filters('wpinv_subscription_initial_payment_desc', $description, $amount, $period, $interval, $trial_period, $trial_interval);
 }
 
-function wpinv_subscription_recurring_payment_desc( $amount, $period, $interval, $bill_times = 0, $trial_period = '', $trial_interval = 0 ) {
+function wpinv_subscription_recurring_payment_desc($amount, $period, $interval, $bill_times = 0, $trial_period = '', $trial_interval = 0) {
     $interval   = (int)$interval > 0 ? (int)$interval : 1;
     $bill_times = (int)$bill_times > 0 ? (int)$bill_times : 0;
     
     $description = '';
-    switch ( $period ) {
+    switch ($period) {
         case 'D' :
         case 'day' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d days, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int)$bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d days, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d days.', 'invoicing' ), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d days.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one day.', '%s for each day, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one day.', '%s for each day, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each day.', '%s for each %d days.', $interval, 'invoicing'), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each day.', '%s for each %d days.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
         case 'W' :
         case 'week' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d weeks, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int)$bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d weeks, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d weeks.', 'invoicing' ), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d weeks.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one week.', '%s for each week, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one week.', '%s for each week, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each week.', '%s for each %d weeks.', $interval, 'invoicing' ), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each week.', '%s for each %d weeks.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
         case 'M' :
         case 'month' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d months, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int)$bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d months, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d months.', 'invoicing' ), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d months.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one month.', '%s for each month, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one month.', '%s for each month, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each month.', '%s for each %d months.', $interval, 'invoicing' ), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each month.', '%s for each %d months.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
         case 'Y' :
         case 'year' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d years, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int)$bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d years, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d years.', 'invoicing'), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d years.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one year.', '%s for each year, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one year.', '%s for each year, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each year.', '%s for each %d years.', $interval, 'invoicing' ), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each year.', '%s for each %d years.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
     }
 
-    return apply_filters( 'wpinv_subscription_recurring_payment_desc', $description, $amount, $period, $interval, $bill_times, $trial_period, $trial_interval );
+    return apply_filters('wpinv_subscription_recurring_payment_desc', $description, $amount, $period, $interval, $bill_times, $trial_period, $trial_interval);
 }
 
-function wpinv_subscription_payment_desc( $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_subscription_payment_desc($invoice) {
+    if (empty($invoice)) {
         return NULL;
     }
     
     $description = '';
-    if ( $invoice->is_parent() && $item = $invoice->get_recurring( true ) ) {
-        if ( $item->has_free_trial() ) {
+    if ($invoice->is_parent() && $item = $invoice->get_recurring(true)) {
+        if ($item->has_free_trial()) {
             $trial_period = $item->get_trial_period();
             $trial_interval = $item->get_trial_interval();
         } else {
@@ -407,45 +407,45 @@ 
             $trial_interval = 0;
         }
         
-        $description = wpinv_get_billing_cycle( $invoice->get_total(), $invoice->get_recurring_details( 'total' ), $item->get_recurring_period(), $item->get_recurring_interval(), $item->get_recurring_limit(), $trial_period, $trial_interval, $invoice->get_currency() );
+        $description = wpinv_get_billing_cycle($invoice->get_total(), $invoice->get_recurring_details('total'), $item->get_recurring_period(), $item->get_recurring_interval(), $item->get_recurring_limit(), $trial_period, $trial_interval, $invoice->get_currency());
     }
     
-    return apply_filters( 'wpinv_subscription_payment_desc', $description, $invoice );
+    return apply_filters('wpinv_subscription_payment_desc', $description, $invoice);
 }
 
-function wpinv_get_billing_cycle( $initial, $recurring, $period, $interval, $bill_times, $trial_period = '', $trial_interval = 0, $currency = '' ) {
-    $initial_total      = wpinv_format_amount( $initial );
-    $recurring_total    = wpinv_format_amount( $recurring );
+function wpinv_get_billing_cycle($initial, $recurring, $period, $interval, $bill_times, $trial_period = '', $trial_interval = 0, $currency = '') {
+    $initial_total      = wpinv_format_amount($initial);
+    $recurring_total    = wpinv_format_amount($recurring);
     
-    if ( $trial_interval > 0 && !empty( $trial_period ) ) {
+    if ($trial_interval > 0 && !empty($trial_period)) {
         // Free trial
     } else {
-        if ( $bill_times == 1 ) {
+        if ($bill_times == 1) {
             $recurring_total = $initial_total;
-        } else if ( $bill_times > 1 && $initial_total != $recurring_total ) {
+        } else if ($bill_times > 1 && $initial_total != $recurring_total) {
             $bill_times--;
         }
     }
     
-    $initial_amount     = wpinv_price( $initial_total, $currency );
-    $recurring_amount   = wpinv_price( $recurring_total, $currency );
+    $initial_amount     = wpinv_price($initial_total, $currency);
+    $recurring_amount   = wpinv_price($recurring_total, $currency);
     
-    $recurring          = wpinv_subscription_recurring_payment_desc( $recurring_amount, $period, $interval, $bill_times, $trial_period, $trial_interval );
+    $recurring          = wpinv_subscription_recurring_payment_desc($recurring_amount, $period, $interval, $bill_times, $trial_period, $trial_interval);
         
-    if ( $initial_total != $recurring_total ) {
-        $initial        = wpinv_subscription_initial_payment_desc( $initial_amount, $period, $interval, $trial_period, $trial_interval );
+    if ($initial_total != $recurring_total) {
+        $initial        = wpinv_subscription_initial_payment_desc($initial_amount, $period, $interval, $trial_period, $trial_interval);
         
-        $description    = wp_sprintf( __( '%s Then %s', 'invoicing' ), $initial, $recurring );
+        $description    = wp_sprintf(__('%s Then %s', 'invoicing'), $initial, $recurring);
     } else {
         $description    = $recurring;
     }
     
-    return apply_filters( 'wpinv_get_billing_cycle', $description, $initial, $recurring, $period, $interval, $bill_times, $trial_period, $trial_interval, $currency );
+    return apply_filters('wpinv_get_billing_cycle', $description, $initial, $recurring, $period, $interval, $bill_times, $trial_period, $trial_interval, $currency);
 }
 
-function wpinv_recurring_send_payment_failed( $invoice ) {
-    if ( !empty( $invoice->ID ) ) {
-        wpinv_failed_invoice_notification( $invoice->ID );
+function wpinv_recurring_send_payment_failed($invoice) {
+    if (!empty($invoice->ID)) {
+        wpinv_failed_invoice_notification($invoice->ID);
     }
 }
-add_action( 'wpinv_recurring_payment_failed', 'wpinv_recurring_send_payment_failed', 10, 1 );
\ No newline at end of file
+add_action('wpinv_recurring_payment_failed', 'wpinv_recurring_send_payment_failed', 10, 1);
\ No newline at end of file

includes/wpinv-post-types.php

Indentation +8 added lines, -8 removed lines

@@ -140,8 +140,8 @@ 
 
 function wpinv_get_default_labels() {
     $defaults = array(
-       'singular' => __( 'Invoice', 'invoicing' ),
-       'plural'   => __( 'Invoices', 'invoicing' )
+        'singular' => __( 'Invoice', 'invoicing' ),
+        'plural'   => __( 'Invoices', 'invoicing' )
     );
     
     return apply_filters( 'wpinv_default_invoices_name', $defaults );
@@ -160,20 +160,20 @@ 
 }
 
 function wpinv_change_default_title( $title ) {
-     if ( !is_admin() ) {
+        if ( !is_admin() ) {
         $label = wpinv_get_label_singular();
         $title = sprintf( __( 'Enter %s name here', 'invoicing' ), $label );
         return $title;
-     }
+        }
 
-     $screen = get_current_screen();
+        $screen = get_current_screen();
 
-     if ( 'wpi_invoice' == $screen->post_type ) {
+        if ( 'wpi_invoice' == $screen->post_type ) {
         $label = wpinv_get_label_singular();
         $title = sprintf( __( 'Enter %s name here', 'invoicing' ), $label );
-     }
+        }
 
-     return $title;
+        return $title;
 }
 add_filter( 'enter_title_here', 'wpinv_change_default_title' );
 

Spacing +96 added lines, -96 removed lines

@@ -7,36 +7,36 @@ 
  */
  
 // 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__));
 }
 
-add_action( 'init', 'wpinv_register_post_types', 1 );
+add_action('init', 'wpinv_register_post_types', 1);
 function wpinv_register_post_types() {    
     $labels = array(
-        'name'               => _x( 'Invoices', 'post type general name', 'invoicing' ),
-        'singular_name'      => _x( 'Invoice', 'post type singular name', 'invoicing' ),
-        'menu_name'          => _x( 'Invoices', 'admin menu', 'invoicing' ),
-        'name_admin_bar'     => _x( 'Invoice', 'add new on admin bar', 'invoicing' ),
-        'add_new'            => _x( 'Add New', 'book', 'invoicing' ),
-        'add_new_item'       => __( 'Add New Invoice', 'invoicing' ),
-        'new_item'           => __( 'New Invoice', 'invoicing' ),
-        'edit_item'          => __( 'Edit Invoice', 'invoicing' ),
-        'view_item'          => __( 'View Invoice', 'invoicing' ),
-        'all_items'          => __( 'Invoices', 'invoicing' ),
-        'search_items'       => __( 'Search Invoices', 'invoicing' ),
-        'parent_item_colon'  => __( 'Parent Invoices:', 'invoicing' ),
-        'not_found'          => __( 'No invoices found.', 'invoicing' ),
-        'not_found_in_trash' => __( 'No invoices found in trash.', 'invoicing' )
+        'name'               => _x('Invoices', 'post type general name', 'invoicing'),
+        'singular_name'      => _x('Invoice', 'post type singular name', 'invoicing'),
+        'menu_name'          => _x('Invoices', 'admin menu', 'invoicing'),
+        'name_admin_bar'     => _x('Invoice', 'add new on admin bar', 'invoicing'),
+        'add_new'            => _x('Add New', 'book', 'invoicing'),
+        'add_new_item'       => __('Add New Invoice', 'invoicing'),
+        'new_item'           => __('New Invoice', 'invoicing'),
+        'edit_item'          => __('Edit Invoice', 'invoicing'),
+        'view_item'          => __('View Invoice', 'invoicing'),
+        'all_items'          => __('Invoices', 'invoicing'),
+        'search_items'       => __('Search Invoices', 'invoicing'),
+        'parent_item_colon'  => __('Parent Invoices:', 'invoicing'),
+        'not_found'          => __('No invoices found.', 'invoicing'),
+        'not_found_in_trash' => __('No invoices found in trash.', 'invoicing')
     );
-    $labels = apply_filters( 'wpinv_labels', $labels );
+    $labels = apply_filters('wpinv_labels', $labels);
     
     $menu_icon = WPINV_PLUGIN_URL . '/assets/images/favicon.ico';
-    $menu_icon = apply_filters( 'wpinv_menu_icon_invoice', $menu_icon );
+    $menu_icon = apply_filters('wpinv_menu_icon_invoice', $menu_icon);
 
     $args = array(
         'labels'             => $labels,
-        'description'        => __( 'This is where invoices are stored.', 'invoicing' ),
+        'description'        => __('This is where invoices are stored.', 'invoicing'),
         'public'             => true,
         'can_export'         => true,
         '_builtin'           => false,
@@ -50,68 +50,68 @@ 
         'has_archive'        => false,
         'hierarchical'       => false,
         'menu_position'      => null,
-        'supports'           => array( 'title', 'author' ),
+        'supports'           => array('title', 'author'),
         'menu_icon'          => $menu_icon,
     );
             
-    $args = apply_filters( 'wpinv_register_post_type_invoice', $args );
+    $args = apply_filters('wpinv_register_post_type_invoice', $args);
     
-    register_post_type( 'wpi_invoice', $args );
+    register_post_type('wpi_invoice', $args);
     
     $items_labels = array(
-        'name'               => _x( 'Items', 'post type general name', 'invoicing' ),
-        'singular_name'      => _x( 'Item', 'post type singular name', 'invoicing' ),
-        'menu_name'          => _x( 'Items', 'admin menu', 'invoicing' ),
-        'add_new'            => _x( 'Add New', 'wpi_item', 'invoicing' ),
-        'add_new_item'       => __( 'Add New Item', 'invoicing' ),
-        'new_item'           => __( 'New Item', 'invoicing' ),
-        'edit_item'          => __( 'Edit Item', 'invoicing' ),
-        'view_item'          => __( 'View Item', 'invoicing' ),
-        'all_items'          => __( 'Items', 'invoicing' ),
-        'search_items'       => __( 'Search Items', 'invoicing' ),
+        'name'               => _x('Items', 'post type general name', 'invoicing'),
+        'singular_name'      => _x('Item', 'post type singular name', 'invoicing'),
+        'menu_name'          => _x('Items', 'admin menu', 'invoicing'),
+        'add_new'            => _x('Add New', 'wpi_item', 'invoicing'),
+        'add_new_item'       => __('Add New Item', 'invoicing'),
+        'new_item'           => __('New Item', 'invoicing'),
+        'edit_item'          => __('Edit Item', 'invoicing'),
+        'view_item'          => __('View Item', 'invoicing'),
+        'all_items'          => __('Items', 'invoicing'),
+        'search_items'       => __('Search Items', 'invoicing'),
         'parent_item_colon'  => '',
-        'not_found'          => __( 'No items found.', 'invoicing' ),
-        'not_found_in_trash' => __( 'No items found in trash.', 'invoicing' )
+        'not_found'          => __('No items found.', 'invoicing'),
+        'not_found_in_trash' => __('No items found in trash.', 'invoicing')
     );
-    $items_labels = apply_filters( 'wpinv_items_labels', $items_labels );
+    $items_labels = apply_filters('wpinv_items_labels', $items_labels);
     
     $invoice_item_args = array(
         'labels'                => $items_labels,
         'public'                => false,
         'show_ui'               => true,
         'show_in_menu'          => 'wpinv',
-        'supports'              => array( 'title', 'excerpt' ),
+        'supports'              => array('title', 'excerpt'),
         'register_meta_box_cb'  => 'wpinv_register_item_meta_boxes',
         'rewrite'               => false,
         'query_var'             => false,
         'map_meta_cap'          => true,
         'can_export'            => true,
     );
-    $invoice_item_args = apply_filters( 'wpinv_register_post_type_invoice_item', $invoice_item_args );
+    $invoice_item_args = apply_filters('wpinv_register_post_type_invoice_item', $invoice_item_args);
 
-    register_post_type( 'wpi_item', $invoice_item_args );
+    register_post_type('wpi_item', $invoice_item_args);
     
     $labels = array(
-        'name'               => _x( 'Discounts', 'post type general name', 'invoicing' ),
-        'singular_name'      => _x( 'Discount', 'post type singular name', 'invoicing' ),
-        'menu_name'          => _x( 'Discounts', 'admin menu', 'invoicing' ),
-        'name_admin_bar'     => _x( 'Discount', 'add new on admin bar', 'invoicing' ),
-        'add_new'            => _x( 'Add New', 'book', 'invoicing' ),
-        'add_new_item'       => __( 'Add New Discount', 'invoicing' ),
-        'new_item'           => __( 'New Discount', 'invoicing' ),
-        'edit_item'          => __( 'Edit Discount', 'invoicing' ),
-        'view_item'          => __( 'View Discount', 'invoicing' ),
-        'all_items'          => __( 'Discounts', 'invoicing' ),
-        'search_items'       => __( 'Search Discounts', 'invoicing' ),
-        'parent_item_colon'  => __( 'Parent Discounts:', 'invoicing' ),
-        'not_found'          => __( 'No discounts found.', 'invoicing' ),
-        'not_found_in_trash' => __( 'No discounts found in trash.', 'invoicing' )
+        'name'               => _x('Discounts', 'post type general name', 'invoicing'),
+        'singular_name'      => _x('Discount', 'post type singular name', 'invoicing'),
+        'menu_name'          => _x('Discounts', 'admin menu', 'invoicing'),
+        'name_admin_bar'     => _x('Discount', 'add new on admin bar', 'invoicing'),
+        'add_new'            => _x('Add New', 'book', 'invoicing'),
+        'add_new_item'       => __('Add New Discount', 'invoicing'),
+        'new_item'           => __('New Discount', 'invoicing'),
+        'edit_item'          => __('Edit Discount', 'invoicing'),
+        'view_item'          => __('View Discount', 'invoicing'),
+        'all_items'          => __('Discounts', 'invoicing'),
+        'search_items'       => __('Search Discounts', 'invoicing'),
+        'parent_item_colon'  => __('Parent Discounts:', 'invoicing'),
+        'not_found'          => __('No discounts found.', 'invoicing'),
+        'not_found_in_trash' => __('No discounts found in trash.', 'invoicing')
     );
-    $labels = apply_filters( 'wpinv_discounts_labels', $labels );
+    $labels = apply_filters('wpinv_discounts_labels', $labels);
     
     $args = array(
         'labels'             => $labels,
-        'description'        => __( 'This is where you can add new discounts that users can use in invoices.', 'invoicing' ),
+        'description'        => __('This is where you can add new discounts that users can use in invoices.', 'invoicing'),
         'public'             => false,
         'can_export'         => true,
         '_builtin'           => false,
@@ -125,7 +125,7 @@ 
         'map_meta_cap'       => true,
         'has_archive'        => false,
         'hierarchical'       => false,
-        'supports'           => array( 'title', 'excerpt' ),
+        'supports'           => array('title', 'excerpt'),
         'register_meta_box_cb'  => 'wpinv_register_discount_meta_boxes',
         'show_in_nav_menus'  => false,
         'show_in_admin_bar'  => true,
@@ -133,99 +133,99 @@ 
         'menu_position'      => null,
     );
             
-    $args = apply_filters( 'wpinv_register_post_type_discount', $args );
+    $args = apply_filters('wpinv_register_post_type_discount', $args);
     
-    register_post_type( 'wpi_discount', $args );
+    register_post_type('wpi_discount', $args);
 }
 
 function wpinv_get_default_labels() {
     $defaults = array(
-       'singular' => __( 'Invoice', 'invoicing' ),
-       'plural'   => __( 'Invoices', 'invoicing' )
+       'singular' => __('Invoice', 'invoicing'),
+       'plural'   => __('Invoices', 'invoicing')
     );
     
-    return apply_filters( 'wpinv_default_invoices_name', $defaults );
+    return apply_filters('wpinv_default_invoices_name', $defaults);
 }
 
-function wpinv_get_label_singular( $lowercase = false ) {
+function wpinv_get_label_singular($lowercase = false) {
     $defaults = wpinv_get_default_labels();
     
-    return ($lowercase) ? strtolower( $defaults['singular'] ) : $defaults['singular'];
+    return ($lowercase) ? strtolower($defaults['singular']) : $defaults['singular'];
 }
 
-function wpinv_get_label_plural( $lowercase = false ) {
+function wpinv_get_label_plural($lowercase = false) {
     $defaults = wpinv_get_default_labels();
     
-    return ( $lowercase ) ? strtolower( $defaults['plural'] ) : $defaults['plural'];
+    return ($lowercase) ? strtolower($defaults['plural']) : $defaults['plural'];
 }
 
-function wpinv_change_default_title( $title ) {
-     if ( !is_admin() ) {
+function wpinv_change_default_title($title) {
+     if (!is_admin()) {
         $label = wpinv_get_label_singular();
-        $title = sprintf( __( 'Enter %s name here', 'invoicing' ), $label );
+        $title = sprintf(__('Enter %s name here', 'invoicing'), $label);
         return $title;
      }
 
      $screen = get_current_screen();
 
-     if ( 'wpi_invoice' == $screen->post_type ) {
+     if ('wpi_invoice' == $screen->post_type) {
         $label = wpinv_get_label_singular();
-        $title = sprintf( __( 'Enter %s name here', 'invoicing' ), $label );
+        $title = sprintf(__('Enter %s name here', 'invoicing'), $label);
      }
 
      return $title;
 }
-add_filter( 'enter_title_here', 'wpinv_change_default_title' );
+add_filter('enter_title_here', 'wpinv_change_default_title');
 
 function wpinv_register_post_status() {
-    register_post_status( 'processing', array(
-        'label'                     => _x( 'Processing', 'Invoice status', 'invoicing' ),
+    register_post_status('processing', array(
+        'label'                     => _x('Processing', 'Invoice status', 'invoicing'),
         'public'                    => true,
         'exclude_from_search'       => true,
         'show_in_admin_all_list'    => true,
         'show_in_admin_status_list' => true,
-        'label_count'               => _n_noop( 'Processing <span class="count">(%s)</span>', 'Processing <span class="count">(%s)</span>', 'invoicing' )
-    ) );
-    register_post_status( 'onhold', array(
-        'label'                     => _x( 'On Hold', 'Invoice status', 'invoicing' ),
+        'label_count'               => _n_noop('Processing <span class="count">(%s)</span>', 'Processing <span class="count">(%s)</span>', 'invoicing')
+    ));
+    register_post_status('onhold', array(
+        'label'                     => _x('On Hold', 'Invoice status', 'invoicing'),
         'public'                    => true,
         'exclude_from_search'       => true,
         'show_in_admin_all_list'    => true,
         'show_in_admin_status_list' => true,
-        'label_count'               => _n_noop( 'On Hold <span class="count">(%s)</span>', 'On Hold <span class="count">(%s)</span>', 'invoicing' )
-    ) );
-    register_post_status( 'cancelled', array(
-        'label'                     => _x( 'Cancelled', 'Invoice status', 'invoicing' ),
+        'label_count'               => _n_noop('On Hold <span class="count">(%s)</span>', 'On Hold <span class="count">(%s)</span>', 'invoicing')
+    ));
+    register_post_status('cancelled', array(
+        'label'                     => _x('Cancelled', 'Invoice status', 'invoicing'),
         'public'                    => true,
         'exclude_from_search'       => true,
         'show_in_admin_all_list'    => true,
         'show_in_admin_status_list' => true,
-        'label_count'               => _n_noop( 'Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'invoicing' )
-    ) );
-    register_post_status( 'refunded', array(
-        'label'                     => _x( 'Refunded', 'Invoice status', 'invoicing' ),
+        'label_count'               => _n_noop('Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'invoicing')
+    ));
+    register_post_status('refunded', array(
+        'label'                     => _x('Refunded', 'Invoice status', 'invoicing'),
         'public'                    => true,
         'exclude_from_search'       => true,
         'show_in_admin_all_list'    => true,
         'show_in_admin_status_list' => true,
-        'label_count'               => _n_noop( 'Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'invoicing' )
-    ) );
-    register_post_status( 'failed', array(
-        'label'                     => _x( 'Failed', 'Invoice status', 'invoicing' ),
+        'label_count'               => _n_noop('Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'invoicing')
+    ));
+    register_post_status('failed', array(
+        'label'                     => _x('Failed', 'Invoice status', 'invoicing'),
         'public'                    => true,
         'exclude_from_search'       => true,
         'show_in_admin_all_list'    => true,
         'show_in_admin_status_list' => true,
-        'label_count'               => _n_noop( 'Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'invoicing' )
-    ) );
-    register_post_status( 'renewal', array(
-        'label'                     => _x( 'Renewal', 'Invoice status', 'invoicing' ),
+        'label_count'               => _n_noop('Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'invoicing')
+    ));
+    register_post_status('renewal', array(
+        'label'                     => _x('Renewal', 'Invoice status', 'invoicing'),
         'public'                    => true,
         'exclude_from_search'       => true,
         'show_in_admin_all_list'    => true,
         'show_in_admin_status_list' => true,
-        'label_count'               => _n_noop( 'Renewal <span class="count">(%s)</span>', 'Renewal <span class="count">(%s)</span>', 'invoicing' )
-    ) );
+        'label_count'               => _n_noop('Renewal <span class="count">(%s)</span>', 'Renewal <span class="count">(%s)</span>', 'invoicing')
+    ));
 }
-add_action( 'init', 'wpinv_register_post_status', 10 );
+add_action('init', 'wpinv_register_post_status', 10);
 

includes/class-wpinv-notes.php

Spacing +21 added lines, -21 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly
 }
 
@@ -14,65 +14,65 @@ 
     }
     
     public function init() {
-        do_action( 'wpinv_class_notes_init', $this );
+        do_action('wpinv_class_notes_init', $this);
     }
     
     public function includes() {
-        do_action( 'wpinv_class_notes_includes', $this );
+        do_action('wpinv_class_notes_includes', $this);
     }
     
     public function actions() {
         // Secure inovice notes
-        add_action( 'pre_get_comments', array( $this, 'set_invoice_note_type' ), 11, 1 );
+        add_action('pre_get_comments', array($this, 'set_invoice_note_type'), 11, 1);
         
-        do_action( 'wpinv_class_notes_actions', $this );
+        do_action('wpinv_class_notes_actions', $this);
     }
         
-    public function set_invoice_note_type( $query ) {
-        $post_ID        = !empty( $query->query_vars['post_ID'] ) ? $query->query_vars['post_ID'] : $query->query_vars['post_id'];
+    public function set_invoice_note_type($query) {
+        $post_ID = !empty($query->query_vars['post_ID']) ? $query->query_vars['post_ID'] : $query->query_vars['post_id'];
         
-        if ( $post_ID && get_post_type( $post_ID ) == $this->invoice_post_type ) {
+        if ($post_ID && get_post_type($post_ID) == $this->invoice_post_type) {
             $query->query_vars['type__in']      = $this->comment_type;
             $query->query_vars['type__not_in']  = '';
         } else {        
-            if ( isset( $query->query_vars['type__in'] ) && $type_in = $query->query_vars['type__in'] ) {
-                if ( is_array( $type_in ) && in_array( $this->comment_type, $type_in ) ) {
-                    $key = array_search( $this->comment_type, $type_in );
-                    unset( $query->query_vars['type__in'][$key] );
-                } else if ( !is_array( $type_in ) && $type_in == $this->comment_type ) {
+            if (isset($query->query_vars['type__in']) && $type_in = $query->query_vars['type__in']) {
+                if (is_array($type_in) && in_array($this->comment_type, $type_in)) {
+                    $key = array_search($this->comment_type, $type_in);
+                    unset($query->query_vars['type__in'][$key]);
+                } else if (!is_array($type_in) && $type_in == $this->comment_type) {
                     $query->query_vars['type__in'] = '';
                 }
             }
             
-            if ( isset( $query->query_vars['type__not_in'] ) && $type_not_in = $query->query_vars['type__not_in'] ) {
-                if ( is_array( $type_not_in ) && !in_array( $this->comment_type, $type_not_in ) ) {
+            if (isset($query->query_vars['type__not_in']) && $type_not_in = $query->query_vars['type__not_in']) {
+                if (is_array($type_not_in) && !in_array($this->comment_type, $type_not_in)) {
                     $query->query_vars['type__not_in'][] = $this->comment_type;
-                } else if ( !is_array( $type_not_in ) && $type_not_in != $this->comment_type ) {
+                } else if (!is_array($type_not_in) && $type_not_in != $this->comment_type) {
                     $query->query_vars['type__not_in'] = (array)$query->query_vars['type__not_in'];
                     $query->query_vars['type__not_in'][] = $this->comment_type;
                 }
             } else {
-                $query->query_vars['type__not_in']  = $this->comment_type;
+                $query->query_vars['type__not_in'] = $this->comment_type;
             }
         }
         
         return $query;
     }
     
-    public function get_invoice_notes( $invoice_id = 0, $type = '' ) {
+    public function get_invoice_notes($invoice_id = 0, $type = '') {
         $args = array( 
             'post_id'   => $invoice_id,
             'order'     => 'comment_date_gmt',
             'order'     => 'DESC',
         );
         
-        if ( $type == 'customer' ) {
+        if ($type == 'customer') {
             $args['meta_key']   = '_wpi_customer_note';
             $args['meta_value'] = 1;
         }
         
-        $args   = apply_filters( 'wpinv_invoice_notes_args', $args, $this, $invoice_id, $type );
+        $args = apply_filters('wpinv_invoice_notes_args', $args, $this, $invoice_id, $type);
         
-        return get_comments( $args );
+        return get_comments($args);
     }
 }

includes/class-wpinv-reports.php

Indentation +5 added lines, -5 removed lines

@@ -166,13 +166,13 @@
             $is_writeable   = $is_dir && is_writeable( $this->export_dir );
             
             if ( $is_dir && $is_writeable ) {
-               return true;
+                return true;
             } else if ( $is_dir && !$is_writeable ) {
-               if ( !$this->wp_filesystem->chmod( $this->export_dir, FS_CHMOD_DIR ) ) {
-                   return wp_sprintf( __( 'Filesystem ERROR: Export location %s is not writable, check your file permissions.', 'invoicing' ), $this->export_dir );
-               }
+                if ( !$this->wp_filesystem->chmod( $this->export_dir, FS_CHMOD_DIR ) ) {
+                    return wp_sprintf( __( 'Filesystem ERROR: Export location %s is not writable, check your file permissions.', 'invoicing' ), $this->export_dir );
+                }
                
-               return true;
+                return true;
             } else {
                 if ( !$this->wp_filesystem->mkdir( $this->export_dir, FS_CHMOD_DIR ) ) {
                     return wp_sprintf( __( 'Filesystem ERROR: Could not create directory %s. This is usually due to inconsistent file permissions.', 'invoicing' ), $this->export_dir );

Spacing +169 added lines, -169 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly
 }
 
@@ -21,68 +21,68 @@ 
     public function init() {
         global $wp_filesystem;
 
-        if ( empty( $wp_filesystem ) ) {
-            require_once( ABSPATH . '/wp-admin/includes/file.php' );
+        if (empty($wp_filesystem)) {
+            require_once(ABSPATH . '/wp-admin/includes/file.php');
             WP_Filesystem();
             global $wp_filesystem;
         }
         $this->wp_filesystem    = $wp_filesystem;
         
         $this->export_dir       = $this->export_location();
-        $this->export_url       = $this->export_location( true );
+        $this->export_url       = $this->export_location(true);
         $this->export           = 'invoicing';
         $this->filetype         = 'csv';
         $this->per_page         = 20;
         
-        do_action( 'wpinv_class_reports_init', $this );
+        do_action('wpinv_class_reports_init', $this);
     }
     
     public function includes() {
-        do_action( 'wpinv_class_reports_includes', $this );
+        do_action('wpinv_class_reports_includes', $this);
     }
     
     public function actions() {
-        if ( is_admin() ) {
-            add_action( 'admin_menu', array( $this, 'add_submenu' ), 10 );
-            add_action( 'wpinv_reports_tab_export', array( $this, 'export' ) );
-            add_action( 'wp_ajax_wpinv_ajax_export', array( $this, 'ajax_export' ) );
+        if (is_admin()) {
+            add_action('admin_menu', array($this, 'add_submenu'), 10);
+            add_action('wpinv_reports_tab_export', array($this, 'export'));
+            add_action('wp_ajax_wpinv_ajax_export', array($this, 'ajax_export'));
             
             // Export Invoices.
-            add_action( 'wpinv_export_set_params_invoices', array( $this, 'set_invoices_export' ) );
-            add_filter( 'wpinv_export_get_columns_invoices', array( $this, 'get_invoices_columns' ) );
-            add_filter( 'wpinv_export_get_data_invoices', array( $this, 'get_invoices_data' ) );
-            add_filter( 'wpinv_get_export_status_invoices', array( $this, 'invoices_export_status' ) );
+            add_action('wpinv_export_set_params_invoices', array($this, 'set_invoices_export'));
+            add_filter('wpinv_export_get_columns_invoices', array($this, 'get_invoices_columns'));
+            add_filter('wpinv_export_get_data_invoices', array($this, 'get_invoices_data'));
+            add_filter('wpinv_get_export_status_invoices', array($this, 'invoices_export_status'));
         }
-        do_action( 'wpinv_class_reports_actions', $this );
+        do_action('wpinv_class_reports_actions', $this);
     }
     
     public function add_submenu() {
         global $wpi_reports_page;
-        $wpi_reports_page = add_submenu_page( 'wpinv', __( 'Reports', 'invoicing' ), __( 'Reports', 'invoicing' ), 'manage_options', 'wpinv-reports', array( $this, 'reports_page' ) );
+        $wpi_reports_page = add_submenu_page('wpinv', __('Reports', 'invoicing'), __('Reports', 'invoicing'), 'manage_options', 'wpinv-reports', array($this, 'reports_page'));
     }
     
     public function reports_page() {
-        if ( !wp_script_is( 'postbox', 'enqueued' ) ) {
-            wp_enqueue_script( 'postbox' );
+        if (!wp_script_is('postbox', 'enqueued')) {
+            wp_enqueue_script('postbox');
         }
-        if ( !wp_script_is( 'jquery-ui-datepicker', 'enqueued' ) ) {
-            wp_enqueue_script( 'jquery-ui-datepicker' );
+        if (!wp_script_is('jquery-ui-datepicker', 'enqueued')) {
+            wp_enqueue_script('jquery-ui-datepicker');
         }
         
-        $current_page = admin_url( 'admin.php?page=wpinv-reports' );
-        $active_tab = isset( $_GET['tab'] ) ? $_GET['tab'] : 'export';
+        $current_page = admin_url('admin.php?page=wpinv-reports');
+        $active_tab = isset($_GET['tab']) ? $_GET['tab'] : 'export';
         ?>
         <div class="wrap wpi-reports-wrap">
-            <h1><?php echo esc_html( __( 'Reports', 'invoicing' ) ); ?></h1>
+            <h1><?php echo esc_html(__('Reports', 'invoicing')); ?></h1>
             <h2 class="nav-tab-wrapper wp-clearfix">
-                <a href="<?php echo add_query_arg( array( 'tab' => 'export', 'settings-updated' => false ), $current_page ); ?>" class="nav-tab <?php echo $active_tab == 'export' ? 'nav-tab-active' : ''; ?>"><?php _e( 'Export', 'invoicing' ); ?></a>
-                <?php do_action( 'wpinv_reports_page_tabs' ); ;?>
+                <a href="<?php echo add_query_arg(array('tab' => 'export', 'settings-updated' => false), $current_page); ?>" class="nav-tab <?php echo $active_tab == 'export' ? 'nav-tab-active' : ''; ?>"><?php _e('Export', 'invoicing'); ?></a>
+                <?php do_action('wpinv_reports_page_tabs'); ;?>
             </h2>
             <div class="wpi-reports-content wpi-reports-<?php echo $active_tab; ?>">
             <?php
-                do_action( 'wpinv_reports_page_top' );
-                do_action( 'wpinv_reports_tab_' . $active_tab );
-                do_action( 'wpinv_reports_page_bottom' );
+                do_action('wpinv_reports_page_top');
+                do_action('wpinv_reports_tab_' . $active_tab);
+                do_action('wpinv_reports_page_bottom');
             ?>
         </div>
         <?php
@@ -90,97 +90,97 @@ 
     
     public function export() {
         $statuses = wpinv_get_invoice_statuses();
-        $statuses = array_merge( array( 'any' => __( 'All Statuses', 'invoicing' ) ), $statuses );
+        $statuses = array_merge(array('any' => __('All Statuses', 'invoicing')), $statuses);
         ?>
         <div class="metabox-holder">
             <div id="post-body">
                 <div id="post-body-content">
-                    <?php do_action( 'wpinv_reports_tab_export_content_top' ); ?>
+                    <?php do_action('wpinv_reports_tab_export_content_top'); ?>
                     
                     <div class="postbox wpi-export-invoices">
-                        <h2 class="hndle ui-sortabled-handle"><span><?php _e( 'Invoices','invoicing' ); ?></span></h2>
+                        <h2 class="hndle ui-sortabled-handle"><span><?php _e('Invoices', 'invoicing'); ?></span></h2>
                         <div class="inside">
-                            <p><?php _e( 'Download a CSV of all payment invoices.', 'invoicing' ); ?></p>
+                            <p><?php _e('Download a CSV of all payment invoices.', 'invoicing'); ?></p>
                             <form id="wpi-export-invoices" class="wpi-export-form" method="post">
-                                <?php echo wpinv_html_date_field( array( 
+                                <?php echo wpinv_html_date_field(array( 
                                     'id' => 'wpi_export_from_date', 
                                     'name' => 'from_date',
                                     'data' => array(
                                         'dateFormat' => 'yy-mm-dd'
                                     ),
-                                    'placeholder' => __( 'From date', 'invoicing' ) )
+                                    'placeholder' => __('From date', 'invoicing') )
                                 ); ?>
-                                <?php echo wpinv_html_date_field( array( 
+                                <?php echo wpinv_html_date_field(array( 
                                     'id' => 'wpi_export_to_date',
                                     'name' => 'to_date',
                                     'data' => array(
                                         'dateFormat' => 'yy-mm-dd'
                                     ),
-                                    'placeholder' => __( 'To date', 'invoicing' ) )
+                                    'placeholder' => __('To date', 'invoicing') )
                                 ); ?>
                                 <span id="wpinv-status-wrap">
-                                <?php echo wpinv_html_select( array(
+                                <?php echo wpinv_html_select(array(
                                     'options'          => $statuses,
                                     'name'             => 'status',
                                     'id'               => 'wpi_export_status',
                                     'show_option_all'  => false,
                                     'show_option_none' => false,
                                     'class'            => '',
-                                ) ); ?>
-                                <?php wp_nonce_field( 'wpi_ajax_export', 'wpi_ajax_export' ); ?>
+                                )); ?>
+                                <?php wp_nonce_field('wpi_ajax_export', 'wpi_ajax_export'); ?>
                                 </span>
                                 <span id="wpinv-submit-wrap">
                                     <input type="hidden" value="invoices" name="export" />
-                                    <input type="submit" value="<?php _e( 'Generate CSV', 'invoicing' ); ?>" class="button-primary" />
+                                    <input type="submit" value="<?php _e('Generate CSV', 'invoicing'); ?>" class="button-primary" />
                                 </span>
                             </form>
                         </div>
                     </div>
                     
-                    <?php do_action( 'wpinv_reports_tab_export_content_bottom' ); ?>
+                    <?php do_action('wpinv_reports_tab_export_content_bottom'); ?>
                 </div>
             </div>
         </div>
         <?php
     }
     
-    public function export_location( $relative = false ) {
+    public function export_location($relative = false) {
         $upload_dir         = wp_upload_dir();
-        $export_location    = $relative ? trailingslashit( $upload_dir['baseurl'] ) . 'cache' : trailingslashit( $upload_dir['basedir'] ) . 'cache';
-        $export_location    = apply_filters( 'wpinv_export_location', $export_location, $relative );
+        $export_location    = $relative ? trailingslashit($upload_dir['baseurl']) . 'cache' : trailingslashit($upload_dir['basedir']) . 'cache';
+        $export_location    = apply_filters('wpinv_export_location', $export_location, $relative);
         
-        return trailingslashit( $export_location );
+        return trailingslashit($export_location);
     }
     
     public function check_export_location() {
         try {
-            if ( empty( $this->wp_filesystem ) ) {
-                return __( 'Filesystem ERROR: Could not access filesystem.', 'invoicing' );
+            if (empty($this->wp_filesystem)) {
+                return __('Filesystem ERROR: Could not access filesystem.', 'invoicing');
             }
 
-            if ( is_wp_error( $this->wp_filesystem ) ) {
-                return __( 'Filesystem ERROR: ' . $this->wp_filesystem->get_error_message(), 'invoicing' );
+            if (is_wp_error($this->wp_filesystem)) {
+                return __('Filesystem ERROR: ' . $this->wp_filesystem->get_error_message(), 'invoicing');
             }
         
-            $is_dir         = $this->wp_filesystem->is_dir( $this->export_dir );
-            $is_writeable   = $is_dir && is_writeable( $this->export_dir );
+            $is_dir         = $this->wp_filesystem->is_dir($this->export_dir);
+            $is_writeable   = $is_dir && is_writeable($this->export_dir);
             
-            if ( $is_dir && $is_writeable ) {
+            if ($is_dir && $is_writeable) {
                return true;
-            } else if ( $is_dir && !$is_writeable ) {
-               if ( !$this->wp_filesystem->chmod( $this->export_dir, FS_CHMOD_DIR ) ) {
-                   return wp_sprintf( __( 'Filesystem ERROR: Export location %s is not writable, check your file permissions.', 'invoicing' ), $this->export_dir );
+            } else if ($is_dir && !$is_writeable) {
+               if (!$this->wp_filesystem->chmod($this->export_dir, FS_CHMOD_DIR)) {
+                   return wp_sprintf(__('Filesystem ERROR: Export location %s is not writable, check your file permissions.', 'invoicing'), $this->export_dir);
                }
                
                return true;
             } else {
-                if ( !$this->wp_filesystem->mkdir( $this->export_dir, FS_CHMOD_DIR ) ) {
-                    return wp_sprintf( __( 'Filesystem ERROR: Could not create directory %s. This is usually due to inconsistent file permissions.', 'invoicing' ), $this->export_dir );
+                if (!$this->wp_filesystem->mkdir($this->export_dir, FS_CHMOD_DIR)) {
+                    return wp_sprintf(__('Filesystem ERROR: Could not create directory %s. This is usually due to inconsistent file permissions.', 'invoicing'), $this->export_dir);
                 }
                 
                 return true;
             }
-        } catch ( Exception $e ) {
+        } catch (Exception $e) {
             return $e->getMessage();
         }
     }
@@ -188,130 +188,130 @@ 
     public function ajax_export() {
         $response               = array();
         $response['success']    = false;
-        $response['msg']        = __( 'Invalid export request found.', 'invoicing' );
+        $response['msg']        = __('Invalid export request found.', 'invoicing');
         
-        if ( empty( $_POST['data'] ) || !current_user_can( 'manage_options' ) ) {
-            wp_send_json( $response );
+        if (empty($_POST['data']) || !current_user_can('manage_options')) {
+            wp_send_json($response);
         }
 
-        parse_str( $_POST['data'], $data );
+        parse_str($_POST['data'], $data);
         
-        $data['step']   = !empty( $_POST['step'] ) ? absint( $_POST['step'] ) : 1;
+        $data['step'] = !empty($_POST['step']) ? absint($_POST['step']) : 1;
 
         $_REQUEST = (array)$data;
-        if ( !( !empty( $_REQUEST['wpi_ajax_export'] ) && wp_verify_nonce( $_REQUEST['wpi_ajax_export'], 'wpi_ajax_export' ) ) ) {
-            $response['msg']    = __( 'Security check failed.', 'invoicing' );
-            wp_send_json( $response );
+        if (!(!empty($_REQUEST['wpi_ajax_export']) && wp_verify_nonce($_REQUEST['wpi_ajax_export'], 'wpi_ajax_export'))) {
+            $response['msg'] = __('Security check failed.', 'invoicing');
+            wp_send_json($response);
         }
         
-        if ( ( $error = $this->check_export_location( true ) ) !== true ) {
-            $response['msg'] = __( 'Filesystem ERROR: ' . $error, 'invoicing' );
-            wp_send_json( $response );
+        if (($error = $this->check_export_location(true)) !== true) {
+            $response['msg'] = __('Filesystem ERROR: ' . $error, 'invoicing');
+            wp_send_json($response);
         }
                         
-        $this->set_export_params( $_REQUEST );
+        $this->set_export_params($_REQUEST);
         
         $return = $this->process_export_step();
         $done   = $this->get_export_status();
         
-        if ( $return ) {
+        if ($return) {
             $this->step += 1;
             
             $response['success']    = true;
             $response['msg']        = '';
             
-            if ( $done >= 100 ) {
+            if ($done >= 100) {
                 $this->step     = 'done';
-                $new_filename   = 'wpi-' . $this->export . '-' . date( 'y-m-d-H-i' ) . '.' . $this->filetype;
+                $new_filename   = 'wpi-' . $this->export . '-' . date('y-m-d-H-i') . '.' . $this->filetype;
                 $new_file       = $this->export_dir . $new_filename;
                 
-                if ( file_exists( $this->file ) ) {
-                    $this->wp_filesystem->move( $this->file, $new_file, true );
+                if (file_exists($this->file)) {
+                    $this->wp_filesystem->move($this->file, $new_file, true);
                 }
                 
-                if ( file_exists( $new_file ) ) {
-                    $response['data']['file'] = array( 'u' => $this->export_url . $new_filename, 's' => size_format( filesize( $new_file ), 2 ) );
+                if (file_exists($new_file)) {
+                    $response['data']['file'] = array('u' => $this->export_url . $new_filename, 's' => size_format(filesize($new_file), 2));
                 }
             }
             
             $response['data']['step']   = $this->step;
             $response['data']['done']   = $done;
         } else {
-            $response['msg']    = __( 'No data found for export.', 'invoicing' );
+            $response['msg'] = __('No data found for export.', 'invoicing');
         }
 
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
-    public function set_export_params( $request ) {
+    public function set_export_params($request) {
         $this->empty    = false;
-        $this->step     = !empty( $request['step'] ) ? absint( $request['step'] ) : 1;
-        $this->export   = !empty( $request['export'] ) ? $request['export'] : $this->export;
+        $this->step     = !empty($request['step']) ? absint($request['step']) : 1;
+        $this->export   = !empty($request['export']) ? $request['export'] : $this->export;
         $this->filename = 'wpi-' . $this->export . '-' . $request['wpi_ajax_export'] . '.' . $this->filetype;
         $this->file     = $this->export_dir . $this->filename;
         
-        do_action( 'wpinv_export_set_params_' . $this->export, $request );
+        do_action('wpinv_export_set_params_' . $this->export, $request);
     }
     
     public function get_columns() {
         $columns = array(
-            'id'   => __( 'ID',   'invoicing' ),
-            'date' => __( 'Date', 'invoicing' )
+            'id'   => __('ID', 'invoicing'),
+            'date' => __('Date', 'invoicing')
         );
         
-        return apply_filters( 'wpinv_export_get_columns_' . $this->export, $columns );
+        return apply_filters('wpinv_export_get_columns_' . $this->export, $columns);
     }
     
     protected function get_export_file() {
         $file = '';
 
-        if ( $this->wp_filesystem->exists( $this->file ) ) {
-            $file = $this->wp_filesystem->get_contents( $this->file );
+        if ($this->wp_filesystem->exists($this->file)) {
+            $file = $this->wp_filesystem->get_contents($this->file);
         } else {
-            $this->wp_filesystem->put_contents( $this->file, '' );
+            $this->wp_filesystem->put_contents($this->file, '');
         }
 
         return $file;
     }
     
-    protected function attach_export_data( $data = '' ) {
-        $filedata   = $this->get_export_file();
-        $filedata   .= $data;
+    protected function attach_export_data($data = '') {
+        $filedata = $this->get_export_file();
+        $filedata .= $data;
         
-        $this->wp_filesystem->put_contents( $this->file, $filedata );
+        $this->wp_filesystem->put_contents($this->file, $filedata);
 
-        $rows       = file( $this->file, FILE_SKIP_EMPTY_LINES );
+        $rows       = file($this->file, FILE_SKIP_EMPTY_LINES);
         $columns    = $this->get_columns();
-        $columns    = empty( $columns ) ? 0 : 1;
+        $columns    = empty($columns) ? 0 : 1;
 
-        $this->empty = count( $rows ) == $columns ? true : false;
+        $this->empty = count($rows) == $columns ? true : false;
     }
     
     public function print_columns() {
         $column_data    = '';
         $columns        = $this->get_columns();
         $i              = 1;
-        foreach( $columns as $key => $column ) {
-            $column_data .= '"' . addslashes( $column ) . '"';
-            $column_data .= $i == count( $columns ) ? '' : ',';
+        foreach ($columns as $key => $column) {
+            $column_data .= '"' . addslashes($column) . '"';
+            $column_data .= $i == count($columns) ? '' : ',';
             $i++;
         }
         $column_data .= "\r\n";
 
-        $this->attach_export_data( $column_data );
+        $this->attach_export_data($column_data);
 
         return $column_data;
     }
     
     public function process_export_step() {
-        if ( $this->step < 2 ) {
-            @unlink( $this->file );
+        if ($this->step < 2) {
+            @unlink($this->file);
             $this->print_columns();
         }
         
         $return = $this->print_rows();
         
-        if ( $return ) {
+        if ($return) {
             return true;
         } else {
             return false;
@@ -320,23 +320,23 @@ 
     
     public function get_export_status() {
         $status = 100;
-        return apply_filters( 'wpinv_get_export_status_' . $this->export, $status );
+        return apply_filters('wpinv_get_export_status_' . $this->export, $status);
     }
     
     public function get_export_data() {
         $data = array(
             0 => array(
                 'id'   => '',
-                'data' => date( 'F j, Y' )
+                'data' => date('F j, Y')
             ),
             1 => array(
                 'id'   => '',
-                'data' => date( 'F j, Y' )
+                'data' => date('F j, Y')
             )
         );
 
-        $data = apply_filters( 'wpinv_export_get_data', $data );
-        $data = apply_filters( 'wpinv_export_get_data_' . $this->export, $data );
+        $data = apply_filters('wpinv_export_get_data', $data);
+        $data = apply_filters('wpinv_export_get_data_' . $this->export, $data);
 
         return $data;
     }
@@ -346,20 +346,20 @@ 
         $data       = $this->get_export_data();
         $columns    = $this->get_columns();
 
-        if ( $data ) {
-            foreach ( $data as $row ) {
+        if ($data) {
+            foreach ($data as $row) {
                 $i = 1;
-                foreach ( $row as $key => $column ) {
-                    if ( array_key_exists( $key, $columns ) ) {
-                        $row_data .= '"' . addslashes( preg_replace( "/\"/","'", $column ) ) . '"';
-                        $row_data .= $i == count( $columns ) ? '' : ',';
+                foreach ($row as $key => $column) {
+                    if (array_key_exists($key, $columns)) {
+                        $row_data .= '"' . addslashes(preg_replace("/\"/", "'", $column)) . '"';
+                        $row_data .= $i == count($columns) ? '' : ',';
                         $i++;
                     }
                 }
                 $row_data .= "\r\n";
             }
 
-            $this->attach_export_data( $row_data );
+            $this->attach_export_data($row_data);
 
             return $row_data;
         }
@@ -368,46 +368,46 @@ 
     }
     
     // Export Invoices.
-    public function set_invoices_export( $request ) {
-        $this->from_date    = isset( $request['from_date'] ) ? sanitize_text_field( $request['from_date'] ) : '';
-        $this->to_date      = isset( $request['to_date'] ) ? sanitize_text_field( $request['to_date'] ) : '';
-        $this->status       = isset( $request['status'] ) ? sanitize_text_field( $request['status'] ) : 'publich';
+    public function set_invoices_export($request) {
+        $this->from_date    = isset($request['from_date']) ? sanitize_text_field($request['from_date']) : '';
+        $this->to_date      = isset($request['to_date']) ? sanitize_text_field($request['to_date']) : '';
+        $this->status       = isset($request['status']) ? sanitize_text_field($request['status']) : 'publich';
     }
     
-    public function get_invoices_columns( $columns = array() ) {
+    public function get_invoices_columns($columns = array()) {
         $columns = array(
-            'id'            => __( 'ID',   'invoicing' ),
-            'number'        => __( 'Number',   'invoicing' ),
-            'date'          => __( 'Date', 'invoicing' ),
-            'amount'        => __( 'Amount', 'invoicing' ),
-            'status_nicename'  => __( 'Status Nicename', 'invoicing' ),
-            'status'        => __( 'Status', 'invoicing' ),
-            'tax'           => __( 'Tax', 'invoicing' ),
-            'discount'      => __( 'Discount', 'invoicing' ),
-            'user_id'       => __( 'User ID', 'invoicing' ),
-            'email'         => __( 'Email', 'invoicing' ),
-            'first_name'    => __( 'First Name', 'invoicing' ),
-            'last_name'     => __( 'Last Name', 'invoicing' ),
-            'address'       => __( 'Address', 'invoicing' ),
-            'city'          => __( 'City', 'invoicing' ),
-            'state'         => __( 'State', 'invoicing' ),
-            'country'       => __( 'Country', 'invoicing' ),
-            'zip'           => __( 'Zipcode', 'invoicing' ),
-            'phone'         => __( 'Phone', 'invoicing' ),
-            'company'       => __( 'Company', 'invoicing' ),
-            'vat_number'    => __( 'Vat Number', 'invoicing' ),
-            'ip'            => __( 'IP', 'invoicing' ),
-            'gateway'       => __( 'Gateway', 'invoicing' ),
-            'gateway_nicename'       => __( 'Gateway Nicename', 'invoicing' ),
-            'transaction_id'=> __( 'Transaction ID', 'invoicing' ),
-            'currency'      => __( 'Currency', 'invoicing' ),
-            'due_date'      => __( 'Due Date', 'invoicing' ),
+            'id'            => __('ID', 'invoicing'),
+            'number'        => __('Number', 'invoicing'),
+            'date'          => __('Date', 'invoicing'),
+            'amount'        => __('Amount', 'invoicing'),
+            'status_nicename'  => __('Status Nicename', 'invoicing'),
+            'status'        => __('Status', 'invoicing'),
+            'tax'           => __('Tax', 'invoicing'),
+            'discount'      => __('Discount', 'invoicing'),
+            'user_id'       => __('User ID', 'invoicing'),
+            'email'         => __('Email', 'invoicing'),
+            'first_name'    => __('First Name', 'invoicing'),
+            'last_name'     => __('Last Name', 'invoicing'),
+            'address'       => __('Address', 'invoicing'),
+            'city'          => __('City', 'invoicing'),
+            'state'         => __('State', 'invoicing'),
+            'country'       => __('Country', 'invoicing'),
+            'zip'           => __('Zipcode', 'invoicing'),
+            'phone'         => __('Phone', 'invoicing'),
+            'company'       => __('Company', 'invoicing'),
+            'vat_number'    => __('Vat Number', 'invoicing'),
+            'ip'            => __('IP', 'invoicing'),
+            'gateway'       => __('Gateway', 'invoicing'),
+            'gateway_nicename'       => __('Gateway Nicename', 'invoicing'),
+            'transaction_id'=> __('Transaction ID', 'invoicing'),
+            'currency'      => __('Currency', 'invoicing'),
+            'due_date'      => __('Due Date', 'invoicing'),
         );
 
         return $columns;
     }
         
-    public function get_invoices_data( $response = array() ) {
+    public function get_invoices_data($response = array()) {
         $args = array(
             'limit'    => $this->per_page,
             'page'     => $this->step,
@@ -415,35 +415,35 @@ 
             'orderby'  => 'date',
         );
         
-        if ( $this->status != 'any' ) {
+        if ($this->status != 'any') {
             $args['status'] = $this->status;
         }
 
-        if ( !empty( $this->from_date ) || !empty( $this->to_date ) ) {
+        if (!empty($this->from_date) || !empty($this->to_date)) {
             $args['date_query'] = array(
                 array(
-                    'after'     => date( 'Y-n-d 00:00:00', strtotime( $this->from_date ) ),
-                    'before'    => date( 'Y-n-d 23:59:59', strtotime( $this->to_date ) ),
+                    'after'     => date('Y-n-d 00:00:00', strtotime($this->from_date)),
+                    'before'    => date('Y-n-d 23:59:59', strtotime($this->to_date)),
                     'inclusive' => true
                 )
             );
         }
 
-        $invoices = wpinv_get_invoices( $args );
+        $invoices = wpinv_get_invoices($args);
         
         $data = array();
         
-        if ( !empty( $invoices ) ) {
-            foreach ( $invoices as $invoice ) {
+        if (!empty($invoices)) {
+            foreach ($invoices as $invoice) {
                 $row = array(
                     'id'            => $invoice->ID,
                     'number'        => $invoice->get_number(),
-                    'date'          => $invoice->get_invoice_date( false ),
-                    'amount'        => wpinv_format_amount( $invoice->get_total(), NULL, true ),
-                    'status_nicename' => $invoice->get_status( true ),
+                    'date'          => $invoice->get_invoice_date(false),
+                    'amount'        => wpinv_format_amount($invoice->get_total(), NULL, true),
+                    'status_nicename' => $invoice->get_status(true),
                     'status'        => $invoice->get_status(),
-                    'tax'           => $invoice->get_tax() > 0 ? wpinv_format_amount( $invoice->get_tax(), NULL, true ) : '',
-                    'discount'      => $invoice->get_discount() > 0 ? wpinv_format_amount( $invoice->get_discount(), NULL, true ) : '',
+                    'tax'           => $invoice->get_tax() > 0 ? wpinv_format_amount($invoice->get_tax(), NULL, true) : '',
+                    'discount'      => $invoice->get_discount() > 0 ? wpinv_format_amount($invoice->get_discount(), NULL, true) : '',
                     'user_id'       => $invoice->get_user_id(),
                     'email'         => $invoice->get_email(),
                     'first_name'    => $invoice->get_first_name(),
@@ -464,7 +464,7 @@ 
                     'due_date'      => $invoice->needs_payment() ? $invoice->get_due_date() : '',
                 );
                 
-                $data[] = apply_filters( 'wpinv_export_invoice_row', $row, $invoice );
+                $data[] = apply_filters('wpinv_export_invoice_row', $row, $invoice);
             }
 
             return $data;
@@ -480,29 +480,29 @@ 
             'return'   => 'ids',
         );
         
-        if ( $this->status != 'any' ) {
+        if ($this->status != 'any') {
             $args['status'] = $this->status;
         }
 
-        if ( !empty( $this->from_date ) || !empty( $this->to_date ) ) {
+        if (!empty($this->from_date) || !empty($this->to_date)) {
             $args['date_query'] = array(
                 array(
-                    'after'     => date( 'Y-n-d 00:00:00', strtotime( $this->from_date ) ),
-                    'before'    => date( 'Y-n-d 23:59:59', strtotime( $this->to_date ) ),
+                    'after'     => date('Y-n-d 00:00:00', strtotime($this->from_date)),
+                    'before'    => date('Y-n-d 23:59:59', strtotime($this->to_date)),
                     'inclusive' => true
                 )
             );
         }
 
-        $invoices   = wpinv_get_invoices( $args );
-        $total      = !empty( $invoices ) ? count( $invoices ) : 0;
+        $invoices   = wpinv_get_invoices($args);
+        $total      = !empty($invoices) ? count($invoices) : 0;
         $status     = 100;
 
-        if ( $total > 0 ) {
-            $status = ( ( $this->per_page * $this->step ) / $total ) * 100;
+        if ($total > 0) {
+            $status = (($this->per_page * $this->step) / $total) * 100;
         }
 
-        if ( $status > 100 ) {
+        if ($status > 100) {
             $status = 100;
         }
 

includes/libraries/GeoIp2/Model/City.php

Spacing +1 added lines, -2 removed lines

@@ -130,7 +130,6 @@
     private function mostSpecificSubdivision()
     {
         return empty($this->subdivisions) ?
-            new \GeoIp2\Record\Subdivision(array(), $this->locales) :
-            end($this->subdivisions);
+            new \GeoIp2\Record\Subdivision(array(), $this->locales) : end($this->subdivisions);
     }
 }

includes/libraries/GeoIp2/Compat/JsonSerializable.php

Indentation +6 added lines, -6 removed lines

@@ -5,12 +5,12 @@
 // @codingStandardsIgnoreFile
 
 /**
-  * This interface exists to provide backwards compatibility with PHP 5.3
-  *
-  * This should _not_ be used by any third-party code.
-  *
-  * @ignore
-  */
+ * This interface exists to provide backwards compatibility with PHP 5.3
+ *
+ * This should _not_ be used by any third-party code.
+ *
+ * @ignore
+ */
 if (interface_exists('JsonSerializable')) {
     interface JsonSerializable extends \JsonSerializable
     {

includes/libraries/class-emogrifier.php

Indentation +776 added lines, -776 removed lines

@@ -9,780 +9,780 @@
  * @author Roman Ožana <ozana@omdesign.cz>
  */
 class Emogrifier {
-	/**
-	 * @var string
-	 */
-	const ENCODING = 'UTF-8';
-
-	/**
-	 * @var integer
-	 */
-	const CACHE_KEY_CSS = 0;
-
-	/**
-	 * @var integer
-	 */
-	const CACHE_KEY_SELECTOR = 1;
-
-	/**
-	 * @var integer
-	 */
-	const CACHE_KEY_XPATH = 2;
-
-	/**
-	 * @var integer
-	 */
-	const CACHE_KEY_CSS_DECLARATION_BLOCK = 3;
-
-	/**
-	 * for calculating nth-of-type and nth-child selectors.
-	 *
-	 * @var integer
-	 */
-	const INDEX = 0;
-
-	/**
-	 * for calculating nth-of-type and nth-child selectors.
-	 *
-	 * @var integer
-	 */
-	const MULTIPLIER = 1;
-
-	/**
-	 * @var string
-	 */
-	const ID_ATTRIBUTE_MATCHER = '/(\\w+)?\\#([\\w\\-]+)/';
-
-	/**
-	 * @var string
-	 */
-	const CLASS_ATTRIBUTE_MATCHER = '/(\\w+|[\\*\\]])?((\\.[\\w\\-]+)+)/';
-
-	/**
-	 * @var string
-	 */
-	private $html = '';
-
-	/**
-	 * @var string
-	 */
-	private $css = '';
-
-	/**
-	 * @var array<string>
-	 */
-	private $unprocessableHtmlTags = array('wbr');
-
-	/**
-	 * @var array<array>
-	 */
-	private $caches = array(
-		self::CACHE_KEY_CSS => array(),
-		self::CACHE_KEY_SELECTOR => array(),
-		self::CACHE_KEY_XPATH => array(),
-		self::CACHE_KEY_CSS_DECLARATION_BLOCK => array(),
-	);
-
-	/**
-	 * the visited nodes with the XPath paths as array keys.
-	 *
-	 * @var array<\DOMNode>
-	 */
-	private $visitedNodes = array();
-
-	/**
-	 * the styles to apply to the nodes with the XPath paths as array keys for the outer array and the attribute names/values.
-	 * as key/value pairs for the inner array.
-	 *
-	 * @var array<array><string>
-	 */
-	private $styleAttributesForNodes = array();
-
-	/**
-	 * This attribute applies to the case where you want to preserve your original text encoding.
-	 *
-	 * By default, emogrifier translates your text into HTML entities for two reasons:
-	 *
-	 * 1. Because of client incompatibilities, it is better practice to send out HTML entities rather than unicode over email.
-	 *
-	 * 2. It translates any illegal XML characters that DOMDocument cannot work with.
-	 *
-	 * If you would like to preserve your original encoding, set this attribute to TRUE.
-	 *
-	 * @var boolean
-	 */
-	public $preserveEncoding = false;
-
-	public static $_media = '';
-
-	/**
-	 * The constructor.
-	 *
-	 * @param string $html the HTML to emogrify, must be UTF-8-encoded
-	 * @param string $css the CSS to merge, must be UTF-8-encoded
-	 */
-	public function __construct($html = '', $css = '') {
-		$this->setHtml($html);
-		$this->setCss($css);
-	}
-
-	/**
-	 * The destructor.
-	 */
-	public function __destruct() {
-		$this->purgeVisitedNodes();
-	}
-
-	/**
-	 * Sets the HTML to emogrify.
-	 *
-	 * @param string $html the HTML to emogrify, must be UTF-8-encoded
-	 */
-	public function setHtml($html = '') {
-		$this->html = $html;
-	}
-
-	/**
-	 * Sets the CSS to merge with the HTML.
-	 *
-	 * @param string $css the CSS to merge, must be UTF-8-encoded
-	 */
-	public function setCss($css = '') {
-		$this->css = $css;
-	}
-
-	/**
-	 * Clears all caches.
-	 */
-	private function clearAllCaches() {
-		$this->clearCache(self::CACHE_KEY_CSS);
-		$this->clearCache(self::CACHE_KEY_SELECTOR);
-		$this->clearCache(self::CACHE_KEY_XPATH);
-		$this->clearCache(self::CACHE_KEY_CSS_DECLARATION_BLOCK);
-	}
-
-	/**
-	 * Clears a single cache by key.
-	 *
-	 * @param integer $key the cache key, must be CACHE_KEY_CSS, CACHE_KEY_SELECTOR, CACHE_KEY_XPATH or CACHE_KEY_CSS_DECLARATION_BLOCK
-	 *
-	 * @throws InvalidArgumentException
-	 */
-	private function clearCache($key) {
-		$allowedCacheKeys = array(self::CACHE_KEY_CSS, self::CACHE_KEY_SELECTOR, self::CACHE_KEY_XPATH, self::CACHE_KEY_CSS_DECLARATION_BLOCK);
-		if (!in_array($key, $allowedCacheKeys, true)) {
-			throw new InvalidArgumentException('Invalid cache key: ' . $key, 1391822035);
-		}
-
-		$this->caches[$key] = array();
-	}
-
-	/**
-	 * Purges the visited nodes.
-	 */
-	private function purgeVisitedNodes() {
-		$this->visitedNodes = array();
-		$this->styleAttributesForNodes = array();
-	}
-
-	/**
-	 * Marks a tag for removal.
-	 *
-	 * There are some HTML tags that DOMDocument cannot process, and it will throw an error if it encounters them.
-	 * In particular, DOMDocument will complain if you try to use HTML5 tags in an XHTML document.
-	 *
-	 * Note: The tags will not be removed if they have any content.
-	 *
-	 * @param string $tagName the tag name, e.g., "p"
-	 */
-	public function addUnprocessableHtmlTag($tagName) {
-		$this->unprocessableHtmlTags[] = $tagName;
-	}
-
-	/**
-	 * Drops a tag from the removal list.
-	 *
-	 * @param string $tagName the tag name, e.g., "p"
-	 */
-	public function removeUnprocessableHtmlTag($tagName) {
-		$key = array_search($tagName, $this->unprocessableHtmlTags, true);
-		if ($key !== false) {
-			unset($this->unprocessableHtmlTags[$key]);
-		}
-	}
-
-	/**
-	 * Applies the CSS you submit to the HTML you submit.
-	 *
-	 * This method places the CSS inline.
-	 *
-	 * @return string
-	 *
-	 * @throws BadMethodCallException
-	 */
-	public function emogrify() {
-		if ($this->html === '') {
-			throw new BadMethodCallException('Please set some HTML first before calling emogrify.', 1390393096);
-		}
-
-		$xmlDocument = $this->createXmlDocument();
-		$xpath = new DOMXPath($xmlDocument);
-		$this->clearAllCaches();
-
-		// before be begin processing the CSS file, parse the document and normalize all existing CSS attributes (changes 'DISPLAY: none' to 'display: none');
-		// we wouldn't have to do this if DOMXPath supported XPath 2.0.
-		// also store a reference of nodes with existing inline styles so we don't overwrite them
-		$this->purgeVisitedNodes();
-
-		$nodesWithStyleAttributes = $xpath->query('//*[@style]');
-		if ($nodesWithStyleAttributes !== false) {
-			/** @var $nodeWithStyleAttribute DOMNode */
-			foreach ($nodesWithStyleAttributes as $node) {
-				$normalizedOriginalStyle = preg_replace_callback( '/[A-z\\-]+(?=\\:)/S', array( $this, 'strtolower' ), $node->getAttribute('style') );
-
-				// in order to not overwrite existing style attributes in the HTML, we have to save the original HTML styles
-				$nodePath = $node->getNodePath();
-				if (!isset($this->styleAttributesForNodes[$nodePath])) {
-					$this->styleAttributesForNodes[$nodePath] = $this->parseCssDeclarationBlock($normalizedOriginalStyle);
-					$this->visitedNodes[$nodePath] = $node;
-				}
-
-				$node->setAttribute('style', $normalizedOriginalStyle);
-			}
-		}
-
-		// grab any existing style blocks from the html and append them to the existing CSS
-		// (these blocks should be appended so as to have precedence over conflicting styles in the existing CSS)
-		$allCss = $this->css;
-
-		$allCss .= $this->getCssFromAllStyleNodes($xpath);
-
-		$cssParts = $this->splitCssAndMediaQuery($allCss);
-		self::$_media = ''; // reset
-
-		$cssKey = md5($cssParts['css']);
-		if (!isset($this->caches[self::CACHE_KEY_CSS][$cssKey])) {
-			// process the CSS file for selectors and definitions
-			preg_match_all('/(?:^|[\\s^{}]*)([^{]+){([^}]*)}/mis', $cssParts['css'], $matches, PREG_SET_ORDER);
-
-			$allSelectors = array();
-			foreach ($matches as $key => $selectorString) {
-				// if there is a blank definition, skip
-				if (!strlen(trim($selectorString[2]))) {
-					continue;
-				}
-
-				// else split by commas and duplicate attributes so we can sort by selector precedence
-				$selectors = explode(',', $selectorString[1]);
-				foreach ($selectors as $selector) {
-					// don't process pseudo-elements and behavioral (dynamic) pseudo-classes; ONLY allow structural pseudo-classes
-					if (strpos($selector, ':') !== false && !preg_match('/:\\S+\\-(child|type)\\(/i', $selector)) {
-						continue;
-					}
-
-					$allSelectors[] = array('selector' => trim($selector),
-											 'attributes' => trim($selectorString[2]),
-											 // keep track of where it appears in the file, since order is important
-											 'line' => $key,
-					);
-				}
-			}
-
-			// now sort the selectors by precedence
-			usort($allSelectors, array($this,'sortBySelectorPrecedence'));
-
-			$this->caches[self::CACHE_KEY_CSS][$cssKey] = $allSelectors;
-		}
-
-		foreach ($this->caches[self::CACHE_KEY_CSS][$cssKey] as $value) {
-			// query the body for the xpath selector
-			$nodesMatchingCssSelectors = $xpath->query($this->translateCssToXpath($value['selector']));
-
-			/** @var $node \DOMNode */
-			foreach ($nodesMatchingCssSelectors as $node) {
-				// if it has a style attribute, get it, process it, and append (overwrite) new stuff
-				if ($node->hasAttribute('style')) {
-					// break it up into an associative array
-					$oldStyleDeclarations = $this->parseCssDeclarationBlock($node->getAttribute('style'));
-				} else {
-					$oldStyleDeclarations = array();
-				}
-				$newStyleDeclarations = $this->parseCssDeclarationBlock($value['attributes']);
-				$node->setAttribute('style', $this->generateStyleStringFromDeclarationsArrays($oldStyleDeclarations, $newStyleDeclarations));
-			}
-		}
-
-		// now iterate through the nodes that contained inline styles in the original HTML
-		foreach ($this->styleAttributesForNodes as $nodePath => $styleAttributesForNode) {
-			$node = $this->visitedNodes[$nodePath];
-			$currentStyleAttributes = $this->parseCssDeclarationBlock($node->getAttribute('style'));
-			$node->setAttribute('style', $this->generateStyleStringFromDeclarationsArrays($currentStyleAttributes, $styleAttributesForNode));
-		}
-
-		// This removes styles from your email that contain display:none.
-		// We need to look for display:none, but we need to do a case-insensitive search. Since DOMDocument only supports XPath 1.0,
-		// lower-case() isn't available to us. We've thus far only set attributes to lowercase, not attribute values. Consequently, we need
-		// to translate() the letters that would be in 'NONE' ("NOE") to lowercase.
-		$nodesWithStyleDisplayNone = $xpath->query('//*[contains(translate(translate(@style," ",""),"NOE","noe"),"display:none")]');
-		// The checks on parentNode and is_callable below ensure that if we've deleted the parent node,
-		// we don't try to call removeChild on a nonexistent child node
-		if ($nodesWithStyleDisplayNone->length > 0) {
-			/** @var $node \DOMNode */
-			foreach ($nodesWithStyleDisplayNone as $node) {
-				if ($node->parentNode && is_callable(array($node->parentNode,'removeChild'))) {
-					$node->parentNode->removeChild($node);
-				}
-			}
-		}
-
-		$this->copyCssWithMediaToStyleNode($cssParts, $xmlDocument);
-
-		if ($this->preserveEncoding) {
-			if ( function_exists( 'mb_convert_encoding' ) ) {
-				return mb_convert_encoding( $xmlDocument->saveHTML(), self::ENCODING, 'HTML-ENTITIES' );
-			} else {
-				return htmlspecialchars_decode( utf8_encode( html_entity_decode( $xmlDocument->saveHTML(), ENT_COMPAT, self::ENCODING ) ) );
-			}
-		} else {
-			return $xmlDocument->saveHTML();
-		}
-	}
-
-	public function strtolower(array $m) {
-		return strtolower($m[0]);
-	}
-
-
-	/**
-	 * This method merges old or existing name/value array with new name/value array.
-	 * and then generates a string of the combined style suitable for placing inline.
-	 * This becomes the single point for CSS string generation allowing for consistent.
-	 * CSS output no matter where the CSS originally came from.
-	 * @param array $oldStyles
-	 * @param array $newStyles
-	 * @return string
-	 */
-	private function generateStyleStringFromDeclarationsArrays(array $oldStyles, array $newStyles) {
-		$combinedStyles = array_merge($oldStyles, $newStyles);
-		$style = '';
-		foreach ($combinedStyles as $attributeName => $attributeValue) {
-			$style .= (strtolower(trim($attributeName)) . ': ' . trim($attributeValue) . '; ');
-		}
-		return trim($style);
-	}
-
-
-	/**
-	 * Copies the media part from CSS array parts to $xmlDocument.
-	 *
-	 * @param array $cssParts
-	 * @param DOMDocument $xmlDocument
-	 */
-	public function copyCssWithMediaToStyleNode(array $cssParts, DOMDocument $xmlDocument) {
-		if (isset($cssParts['media']) && $cssParts['media'] !== '') {
-			$this->addStyleElementToDocument($xmlDocument, $cssParts['media']);
-		}
-	}
-
-	/**
-	 * Returns CSS content.
-	 *
-	 * @param DOMXPath $xpath
-	 * @return string
-	 */
-	private function getCssFromAllStyleNodes(DOMXPath $xpath) {
-		$styleNodes = $xpath->query('//style');
-
-		if ($styleNodes === false) {
-			return '';
-		}
-
-		$css = '';
-		/** @var $styleNode DOMNode */
-		foreach ($styleNodes as $styleNode) {
-			$css .= "\n\n" . $styleNode->nodeValue;
-			$styleNode->parentNode->removeChild($styleNode);
-		}
-
-		return $css;
-	}
-
-	/**
-	 * Adds a style element with $css to $document.
-	 *
-	 * @param DOMDocument $document
-	 * @param string $css
-	 */
-	private function addStyleElementToDocument(DOMDocument $document, $css) {
-		$styleElement = $document->createElement('style', $css);
-		$styleAttribute = $document->createAttribute('type');
-		$styleAttribute->value = 'text/css';
-		$styleElement->appendChild($styleAttribute);
-
-		$head = $this->getOrCreateHeadElement($document);
-		$head->appendChild($styleElement);
-	}
-
-	/**
-	 * Returns the existing or creates a new head element in $document.
-	 *
-	 * @param DOMDocument $document
-	 * @return DOMNode the head element
-	 */
-	private function getOrCreateHeadElement(DOMDocument $document) {
-		$head = $document->getElementsByTagName('head')->item(0);
-
-		if ($head === null) {
-			$head = $document->createElement('head');
-			$html = $document->getElementsByTagName('html')->item(0);
-			$html->insertBefore($head, $document->getElementsByTagName('body')->item(0));
-		}
-
-		return $head;
-	}
-
-	/**
-	 * Splits input CSS code to an array where:
-	 *
-	 * - key "css" will be contains clean CSS code.
-	 * - key "media" will be contains all valuable media queries.
-	 *
-	 * Example:
-	 *
-	 * The CSS code.
-	 *
-	 *   "@import "file.css"; h1 { color:red; } @media { h1 {}} @media tv { h1 {}}"
-	 *
-	 * will be parsed into the following array:
-	 *
-	 *   "css" => "h1 { color:red; }"
-	 *   "media" => "@media { h1 {}}"
-	 *
-	 * @param string $css
-	 * @return array
-	 */
-	private function splitCssAndMediaQuery($css) {
-		$css = preg_replace_callback( '#@media\\s+(?:only\\s)?(?:[\\s{\(]|screen|all)\\s?[^{]+{.*}\\s*}\\s*#misU', array( $this, '_media_concat' ), $css );
-
-		// filter the CSS
-		$search = array(
-			// get rid of css comment code
-			'/\\/\\*.*\\*\\//sU',
-			// strip out any import directives
-			'/^\\s*@import\\s[^;]+;/misU',
-			// strip remains media enclosures
-			'/^\\s*@media\\s[^{]+{(.*)}\\s*}\\s/misU',
-		);
-
-		$replace = array(
-			'',
-			'',
-			'',
-		);
-
-		// clean CSS before output
-		$css = preg_replace($search, $replace, $css);
-
-		return array('css' => $css, 'media' => self::$_media);
-	}
-
-	private function _media_concat( $matches ) {
-		self::$_media .= $matches[0];
-	}
-
-	/**
-	 * Creates a DOMDocument instance with the current HTML.
-	 *
-	 * @return DOMDocument
-	 */
-	private function createXmlDocument() {
-		$xmlDocument = new DOMDocument;
-		$xmlDocument->encoding = self::ENCODING;
-		$xmlDocument->strictErrorChecking = false;
-		$xmlDocument->formatOutput = true;
-		$libXmlState = libxml_use_internal_errors(true);
-		$xmlDocument->loadHTML($this->getUnifiedHtml());
-		libxml_clear_errors();
-		libxml_use_internal_errors($libXmlState);
-		$xmlDocument->normalizeDocument();
-
-		return $xmlDocument;
-	}
-
-	/**
-	 * Returns the HTML with the non-ASCII characters converts into HTML entities and the unprocessable HTML tags removed.
-	 *
-	 * @return string the unified HTML
-	 *
-	 * @throws BadMethodCallException
-	 */
-	private function getUnifiedHtml() {
-		if (!empty($this->unprocessableHtmlTags)) {
-			$unprocessableHtmlTags = implode('|', $this->unprocessableHtmlTags);
-			$bodyWithoutUnprocessableTags = preg_replace('/<\\/?(' . $unprocessableHtmlTags . ')[^>]*>/i', '', $this->html);
-		} else {
-			$bodyWithoutUnprocessableTags = $this->html;
-		}
-
-		if ( function_exists( 'mb_convert_encoding' ) ) {
-			return mb_convert_encoding( $bodyWithoutUnprocessableTags, 'HTML-ENTITIES', self::ENCODING );
-		} else {
-			return htmlspecialchars_decode( utf8_decode( htmlentities( $bodyWithoutUnprocessableTags, ENT_COMPAT, self::ENCODING, false ) ) );
-		}
-	}
-
-	/**
-	 * @param array $a
-	 * @param array $b
-	 *
-	 * @return integer
-	 */
-	private function sortBySelectorPrecedence(array $a, array $b) {
-		$precedenceA = $this->getCssSelectorPrecedence($a['selector']);
-		$precedenceB = $this->getCssSelectorPrecedence($b['selector']);
-
-		// We want these sorted in ascending order so selectors with lesser precedence get processed first and
-		// selectors with greater precedence get sorted last.
-		// The parenthesis around the -1 are necessary to avoid a PHP_CodeSniffer warning about missing spaces around
-		// arithmetic operators.
-		// @see http://forge.typo3.org/issues/55605
-		$precedenceForEquals = ($a['line'] < $b['line'] ? (-1) : 1);
-		$precedenceForNotEquals = ($precedenceA < $precedenceB ? (-1) : 1);
-		return ($precedenceA === $precedenceB) ? $precedenceForEquals : $precedenceForNotEquals;
-	}
-
-	/**
-	 * @param string $selector
-	 *
-	 * @return integer
-	 */
-	private function getCssSelectorPrecedence($selector) {
-		$selectorKey = md5($selector);
-		if (!isset($this->caches[self::CACHE_KEY_SELECTOR][$selectorKey])) {
-			$precedence = 0;
-			$value = 100;
-			// ids: worth 100, classes: worth 10, elements: worth 1
-			$search = array('\\#','\\.','');
-
-			foreach ($search as $s) {
-				if (trim($selector == '')) {
-					break;
-				}
-				$number = 0;
-				$selector = preg_replace('/' . $s . '\\w+/', '', $selector, -1, $number);
-				$precedence += ($value * $number);
-				$value /= 10;
-			}
-			$this->caches[self::CACHE_KEY_SELECTOR][$selectorKey] = $precedence;
-		}
-
-		return $this->caches[self::CACHE_KEY_SELECTOR][$selectorKey];
-	}
-
-	/**
-	 * Right now, we support all CSS 1 selectors and most CSS2/3 selectors.
-	 *
-	 * @see http://plasmasturm.org/log/444/
-	 *
-	 * @param string $paramCssSelector
-	 *
-	 * @return string
-	 */
-	private function translateCssToXpath($paramCssSelector) {
-		$cssSelector = ' ' . $paramCssSelector . ' ';
-		$cssSelector = preg_replace_callback( '/\s+\w+\s+/', array( $this, 'strtolower' ), $cssSelector );
-		$cssSelector = trim($cssSelector);
-		$xpathKey = md5($cssSelector);
-		if (!isset($this->caches[self::CACHE_KEY_XPATH][$xpathKey])) {
-			// returns an Xpath selector
-			$search = array(
-				// Matches any element that is a child of parent.
-				'/\\s+>\\s+/',
-				// Matches any element that is an adjacent sibling.
-				'/\\s+\\+\\s+/',
-				// Matches any element that is a descendant of an parent element element.
-				'/\\s+/',
-				// first-child pseudo-selector
-				'/([^\\/]+):first-child/i',
-				// last-child pseudo-selector
-				'/([^\\/]+):last-child/i',
-				// Matches attribute only selector
-				'/^\\[(\\w+)\\]/',
-				// Matches element with attribute
-				'/(\\w)\\[(\\w+)\\]/',
-				// Matches element with EXACT attribute
-				'/(\\w)\\[(\\w+)\\=[\'"]?(\\w+)[\'"]?\\]/',
-			);
-			$replace = array(
-				'/',
-				'/following-sibling::*[1]/self::',
-				'//',
-				'*[1]/self::\\1',
-				'*[last()]/self::\\1',
-				'*[@\\1]',
-				'\\1[@\\2]',
-				'\\1[@\\2="\\3"]',
-			);
-
-			$cssSelector = '//' . preg_replace($search, $replace, $cssSelector);
-
-			$cssSelector = preg_replace_callback(self::ID_ATTRIBUTE_MATCHER, array($this, 'matchIdAttributes'), $cssSelector);
-			$cssSelector = preg_replace_callback(self::CLASS_ATTRIBUTE_MATCHER, array($this, 'matchClassAttributes'), $cssSelector);
-
-			// Advanced selectors are going to require a bit more advanced emogrification.
-			// When we required PHP 5.3, we could do this with closures.
-			$cssSelector = preg_replace_callback(
-				'/([^\\/]+):nth-child\\(\s*(odd|even|[+\-]?\\d|[+\\-]?\\d?n(\\s*[+\\-]\\s*\\d)?)\\s*\\)/i',
-				array($this, 'translateNthChild'), $cssSelector
-			);
-			$cssSelector = preg_replace_callback(
-				'/([^\\/]+):nth-of-type\\(\s*(odd|even|[+\-]?\\d|[+\\-]?\\d?n(\\s*[+\\-]\\s*\\d)?)\\s*\\)/i',
-				array($this, 'translateNthOfType'), $cssSelector
-			);
-
-			$this->caches[self::CACHE_KEY_SELECTOR][$xpathKey] = $cssSelector;
-		}
-		return $this->caches[self::CACHE_KEY_SELECTOR][$xpathKey];
-	}
-
-	/**
-	 * @param array $match
-	 *
-	 * @return string
-	 */
-	private function matchIdAttributes(array $match) {
-		return (strlen($match[1]) ? $match[1] : '*') . '[@id="' . $match[2] . '"]';
-	}
-
-	/**
-	 * @param array $match
-	 *
-	 * @return string
-	 */
-	private function matchClassAttributes(array $match) {
-		return (strlen($match[1]) ? $match[1] : '*') . '[contains(concat(" ",@class," "),concat(" ","' .
-			implode(
-				'"," "))][contains(concat(" ",@class," "),concat(" ","',
-				explode('.', substr($match[2], 1))
-			) . '"," "))]';
-	}
-
-	/**
-	 * @param array $match
-	 *
-	 * @return string
-	 */
-	private function translateNthChild(array $match) {
-		$result = $this->parseNth($match);
-
-		if (isset($result[self::MULTIPLIER])) {
-			if ($result[self::MULTIPLIER] < 0) {
-				$result[self::MULTIPLIER] = abs($result[self::MULTIPLIER]);
-				return sprintf('*[(last() - position()) mod %u = %u]/self::%s', $result[self::MULTIPLIER], $result[self::INDEX], $match[1]);
-			} else {
-				return sprintf('*[position() mod %u = %u]/self::%s', $result[self::MULTIPLIER], $result[self::INDEX], $match[1]);
-			}
-		} else {
-			return sprintf('*[%u]/self::%s', $result[self::INDEX], $match[1]);
-		}
-	}
-
-	/**
-	 * @param array $match
-	 *
-	 * @return string
-	 */
-	private function translateNthOfType(array $match) {
-		$result = $this->parseNth($match);
-
-		if (isset($result[self::MULTIPLIER])) {
-			if ($result[self::MULTIPLIER] < 0) {
-				$result[self::MULTIPLIER] = abs($result[self::MULTIPLIER]);
-				return sprintf('%s[(last() - position()) mod %u = %u]', $match[1], $result[self::MULTIPLIER], $result[self::INDEX]);
-			} else {
-				return sprintf('%s[position() mod %u = %u]', $match[1], $result[self::MULTIPLIER], $result[self::INDEX]);
-			}
-		} else {
-			return sprintf('%s[%u]', $match[1], $result[self::INDEX]);
-		}
-	}
-
-	/**
-	 * @param array $match
-	 *
-	 * @return array
-	 */
-	private function parseNth(array $match) {
-		if (in_array(strtolower($match[2]), array('even','odd'))) {
-			$index = strtolower($match[2]) == 'even' ? 0 : 1;
-			return array(self::MULTIPLIER => 2, self::INDEX => $index);
-		} elseif (stripos($match[2], 'n') === false) {
-			// if there is a multiplier
-			$index = intval(str_replace(' ', '', $match[2]));
-			return array(self::INDEX => $index);
-		} else {
-			if (isset($match[3])) {
-				$multipleTerm = str_replace($match[3], '', $match[2]);
-				$index = intval(str_replace(' ', '', $match[3]));
-			} else {
-				$multipleTerm = $match[2];
-				$index = 0;
-			}
-
-			$multiplier = str_ireplace('n', '', $multipleTerm);
-
-			if (!strlen($multiplier)) {
-				$multiplier = 1;
-			} elseif ($multiplier == 0) {
-				return array(self::INDEX => $index);
-			} else {
-				$multiplier = intval($multiplier);
-			}
-
-			while ($index < 0) {
-				$index += abs($multiplier);
-			}
-
-			return array(self::MULTIPLIER => $multiplier, self::INDEX => $index);
-		}
-	}
-
-	/**
-	 * Parses a CSS declaration block into property name/value pairs.
-	 *
-	 * Example:
-	 *
-	 * The declaration block.
-	 *
-	 *   "color: #000; font-weight: bold;".
-	 *
-	 * will be parsed into the following array:
-	 *
-	 *   "color" => "#000"
-	 *   "font-weight" => "bold"
-	 *
-	 * @param string $cssDeclarationBlock the CSS declaration block without the curly braces, may be empty
-	 *
-	 * @return array the CSS declarations with the property names as array keys and the property values as array values
-	 */
-	private function parseCssDeclarationBlock($cssDeclarationBlock) {
-		if (isset($this->caches[self::CACHE_KEY_CSS_DECLARATION_BLOCK][$cssDeclarationBlock])) {
-			return $this->caches[self::CACHE_KEY_CSS_DECLARATION_BLOCK][$cssDeclarationBlock];
-		}
-
-		$properties = array();
-		$declarations = explode(';', $cssDeclarationBlock);
-		foreach ($declarations as $declaration) {
-			$matches = array();
-			if (!preg_match('/ *([A-Za-z\\-]+) *: *([^;]+) */', $declaration, $matches)) {
-				continue;
-			}
-			$propertyName = strtolower($matches[1]);
-			$propertyValue = $matches[2];
-			$properties[$propertyName] = $propertyValue;
-		}
-		$this->caches[self::CACHE_KEY_CSS_DECLARATION_BLOCK][$cssDeclarationBlock] = $properties;
-
-		return $properties;
-	}
+    /**
+     * @var string
+     */
+    const ENCODING = 'UTF-8';
+
+    /**
+     * @var integer
+     */
+    const CACHE_KEY_CSS = 0;
+
+    /**
+     * @var integer
+     */
+    const CACHE_KEY_SELECTOR = 1;
+
+    /**
+     * @var integer
+     */
+    const CACHE_KEY_XPATH = 2;
+
+    /**
+     * @var integer
+     */
+    const CACHE_KEY_CSS_DECLARATION_BLOCK = 3;
+
+    /**
+     * for calculating nth-of-type and nth-child selectors.
+     *
+     * @var integer
+     */
+    const INDEX = 0;
+
+    /**
+     * for calculating nth-of-type and nth-child selectors.
+     *
+     * @var integer
+     */
+    const MULTIPLIER = 1;
+
+    /**
+     * @var string
+     */
+    const ID_ATTRIBUTE_MATCHER = '/(\\w+)?\\#([\\w\\-]+)/';
+
+    /**
+     * @var string
+     */
+    const CLASS_ATTRIBUTE_MATCHER = '/(\\w+|[\\*\\]])?((\\.[\\w\\-]+)+)/';
+
+    /**
+     * @var string
+     */
+    private $html = '';
+
+    /**
+     * @var string
+     */
+    private $css = '';
+
+    /**
+     * @var array<string>
+     */
+    private $unprocessableHtmlTags = array('wbr');
+
+    /**
+     * @var array<array>
+     */
+    private $caches = array(
+        self::CACHE_KEY_CSS => array(),
+        self::CACHE_KEY_SELECTOR => array(),
+        self::CACHE_KEY_XPATH => array(),
+        self::CACHE_KEY_CSS_DECLARATION_BLOCK => array(),
+    );
+
+    /**
+     * the visited nodes with the XPath paths as array keys.
+     *
+     * @var array<\DOMNode>
+     */
+    private $visitedNodes = array();
+
+    /**
+     * the styles to apply to the nodes with the XPath paths as array keys for the outer array and the attribute names/values.
+     * as key/value pairs for the inner array.
+     *
+     * @var array<array><string>
+     */
+    private $styleAttributesForNodes = array();
+
+    /**
+     * This attribute applies to the case where you want to preserve your original text encoding.
+     *
+     * By default, emogrifier translates your text into HTML entities for two reasons:
+     *
+     * 1. Because of client incompatibilities, it is better practice to send out HTML entities rather than unicode over email.
+     *
+     * 2. It translates any illegal XML characters that DOMDocument cannot work with.
+     *
+     * If you would like to preserve your original encoding, set this attribute to TRUE.
+     *
+     * @var boolean
+     */
+    public $preserveEncoding = false;
+
+    public static $_media = '';
+
+    /**
+     * The constructor.
+     *
+     * @param string $html the HTML to emogrify, must be UTF-8-encoded
+     * @param string $css the CSS to merge, must be UTF-8-encoded
+     */
+    public function __construct($html = '', $css = '') {
+        $this->setHtml($html);
+        $this->setCss($css);
+    }
+
+    /**
+     * The destructor.
+     */
+    public function __destruct() {
+        $this->purgeVisitedNodes();
+    }
+
+    /**
+     * Sets the HTML to emogrify.
+     *
+     * @param string $html the HTML to emogrify, must be UTF-8-encoded
+     */
+    public function setHtml($html = '') {
+        $this->html = $html;
+    }
+
+    /**
+     * Sets the CSS to merge with the HTML.
+     *
+     * @param string $css the CSS to merge, must be UTF-8-encoded
+     */
+    public function setCss($css = '') {
+        $this->css = $css;
+    }
+
+    /**
+     * Clears all caches.
+     */
+    private function clearAllCaches() {
+        $this->clearCache(self::CACHE_KEY_CSS);
+        $this->clearCache(self::CACHE_KEY_SELECTOR);
+        $this->clearCache(self::CACHE_KEY_XPATH);
+        $this->clearCache(self::CACHE_KEY_CSS_DECLARATION_BLOCK);
+    }
+
+    /**
+     * Clears a single cache by key.
+     *
+     * @param integer $key the cache key, must be CACHE_KEY_CSS, CACHE_KEY_SELECTOR, CACHE_KEY_XPATH or CACHE_KEY_CSS_DECLARATION_BLOCK
+     *
+     * @throws InvalidArgumentException
+     */
+    private function clearCache($key) {
+        $allowedCacheKeys = array(self::CACHE_KEY_CSS, self::CACHE_KEY_SELECTOR, self::CACHE_KEY_XPATH, self::CACHE_KEY_CSS_DECLARATION_BLOCK);
+        if (!in_array($key, $allowedCacheKeys, true)) {
+            throw new InvalidArgumentException('Invalid cache key: ' . $key, 1391822035);
+        }
+
+        $this->caches[$key] = array();
+    }
+
+    /**
+     * Purges the visited nodes.
+     */
+    private function purgeVisitedNodes() {
+        $this->visitedNodes = array();
+        $this->styleAttributesForNodes = array();
+    }
+
+    /**
+     * Marks a tag for removal.
+     *
+     * There are some HTML tags that DOMDocument cannot process, and it will throw an error if it encounters them.
+     * In particular, DOMDocument will complain if you try to use HTML5 tags in an XHTML document.
+     *
+     * Note: The tags will not be removed if they have any content.
+     *
+     * @param string $tagName the tag name, e.g., "p"
+     */
+    public function addUnprocessableHtmlTag($tagName) {
+        $this->unprocessableHtmlTags[] = $tagName;
+    }
+
+    /**
+     * Drops a tag from the removal list.
+     *
+     * @param string $tagName the tag name, e.g., "p"
+     */
+    public function removeUnprocessableHtmlTag($tagName) {
+        $key = array_search($tagName, $this->unprocessableHtmlTags, true);
+        if ($key !== false) {
+            unset($this->unprocessableHtmlTags[$key]);
+        }
+    }
+
+    /**
+     * Applies the CSS you submit to the HTML you submit.
+     *
+     * This method places the CSS inline.
+     *
+     * @return string
+     *
+     * @throws BadMethodCallException
+     */
+    public function emogrify() {
+        if ($this->html === '') {
+            throw new BadMethodCallException('Please set some HTML first before calling emogrify.', 1390393096);
+        }
+
+        $xmlDocument = $this->createXmlDocument();
+        $xpath = new DOMXPath($xmlDocument);
+        $this->clearAllCaches();
+
+        // before be begin processing the CSS file, parse the document and normalize all existing CSS attributes (changes 'DISPLAY: none' to 'display: none');
+        // we wouldn't have to do this if DOMXPath supported XPath 2.0.
+        // also store a reference of nodes with existing inline styles so we don't overwrite them
+        $this->purgeVisitedNodes();
+
+        $nodesWithStyleAttributes = $xpath->query('//*[@style]');
+        if ($nodesWithStyleAttributes !== false) {
+            /** @var $nodeWithStyleAttribute DOMNode */
+            foreach ($nodesWithStyleAttributes as $node) {
+                $normalizedOriginalStyle = preg_replace_callback( '/[A-z\\-]+(?=\\:)/S', array( $this, 'strtolower' ), $node->getAttribute('style') );
+
+                // in order to not overwrite existing style attributes in the HTML, we have to save the original HTML styles
+                $nodePath = $node->getNodePath();
+                if (!isset($this->styleAttributesForNodes[$nodePath])) {
+                    $this->styleAttributesForNodes[$nodePath] = $this->parseCssDeclarationBlock($normalizedOriginalStyle);
+                    $this->visitedNodes[$nodePath] = $node;
+                }
+
+                $node->setAttribute('style', $normalizedOriginalStyle);
+            }
+        }
+
+        // grab any existing style blocks from the html and append them to the existing CSS
+        // (these blocks should be appended so as to have precedence over conflicting styles in the existing CSS)
+        $allCss = $this->css;
+
+        $allCss .= $this->getCssFromAllStyleNodes($xpath);
+
+        $cssParts = $this->splitCssAndMediaQuery($allCss);
+        self::$_media = ''; // reset
+
+        $cssKey = md5($cssParts['css']);
+        if (!isset($this->caches[self::CACHE_KEY_CSS][$cssKey])) {
+            // process the CSS file for selectors and definitions
+            preg_match_all('/(?:^|[\\s^{}]*)([^{]+){([^}]*)}/mis', $cssParts['css'], $matches, PREG_SET_ORDER);
+
+            $allSelectors = array();
+            foreach ($matches as $key => $selectorString) {
+                // if there is a blank definition, skip
+                if (!strlen(trim($selectorString[2]))) {
+                    continue;
+                }
+
+                // else split by commas and duplicate attributes so we can sort by selector precedence
+                $selectors = explode(',', $selectorString[1]);
+                foreach ($selectors as $selector) {
+                    // don't process pseudo-elements and behavioral (dynamic) pseudo-classes; ONLY allow structural pseudo-classes
+                    if (strpos($selector, ':') !== false && !preg_match('/:\\S+\\-(child|type)\\(/i', $selector)) {
+                        continue;
+                    }
+
+                    $allSelectors[] = array('selector' => trim($selector),
+                                                'attributes' => trim($selectorString[2]),
+                                                // keep track of where it appears in the file, since order is important
+                                                'line' => $key,
+                    );
+                }
+            }
+
+            // now sort the selectors by precedence
+            usort($allSelectors, array($this,'sortBySelectorPrecedence'));
+
+            $this->caches[self::CACHE_KEY_CSS][$cssKey] = $allSelectors;
+        }
+
+        foreach ($this->caches[self::CACHE_KEY_CSS][$cssKey] as $value) {
+            // query the body for the xpath selector
+            $nodesMatchingCssSelectors = $xpath->query($this->translateCssToXpath($value['selector']));
+
+            /** @var $node \DOMNode */
+            foreach ($nodesMatchingCssSelectors as $node) {
+                // if it has a style attribute, get it, process it, and append (overwrite) new stuff
+                if ($node->hasAttribute('style')) {
+                    // break it up into an associative array
+                    $oldStyleDeclarations = $this->parseCssDeclarationBlock($node->getAttribute('style'));
+                } else {
+                    $oldStyleDeclarations = array();
+                }
+                $newStyleDeclarations = $this->parseCssDeclarationBlock($value['attributes']);
+                $node->setAttribute('style', $this->generateStyleStringFromDeclarationsArrays($oldStyleDeclarations, $newStyleDeclarations));
+            }
+        }
+
+        // now iterate through the nodes that contained inline styles in the original HTML
+        foreach ($this->styleAttributesForNodes as $nodePath => $styleAttributesForNode) {
+            $node = $this->visitedNodes[$nodePath];
+            $currentStyleAttributes = $this->parseCssDeclarationBlock($node->getAttribute('style'));
+            $node->setAttribute('style', $this->generateStyleStringFromDeclarationsArrays($currentStyleAttributes, $styleAttributesForNode));
+        }
+
+        // This removes styles from your email that contain display:none.
+        // We need to look for display:none, but we need to do a case-insensitive search. Since DOMDocument only supports XPath 1.0,
+        // lower-case() isn't available to us. We've thus far only set attributes to lowercase, not attribute values. Consequently, we need
+        // to translate() the letters that would be in 'NONE' ("NOE") to lowercase.
+        $nodesWithStyleDisplayNone = $xpath->query('//*[contains(translate(translate(@style," ",""),"NOE","noe"),"display:none")]');
+        // The checks on parentNode and is_callable below ensure that if we've deleted the parent node,
+        // we don't try to call removeChild on a nonexistent child node
+        if ($nodesWithStyleDisplayNone->length > 0) {
+            /** @var $node \DOMNode */
+            foreach ($nodesWithStyleDisplayNone as $node) {
+                if ($node->parentNode && is_callable(array($node->parentNode,'removeChild'))) {
+                    $node->parentNode->removeChild($node);
+                }
+            }
+        }
+
+        $this->copyCssWithMediaToStyleNode($cssParts, $xmlDocument);
+
+        if ($this->preserveEncoding) {
+            if ( function_exists( 'mb_convert_encoding' ) ) {
+                return mb_convert_encoding( $xmlDocument->saveHTML(), self::ENCODING, 'HTML-ENTITIES' );
+            } else {
+                return htmlspecialchars_decode( utf8_encode( html_entity_decode( $xmlDocument->saveHTML(), ENT_COMPAT, self::ENCODING ) ) );
+            }
+        } else {
+            return $xmlDocument->saveHTML();
+        }
+    }
+
+    public function strtolower(array $m) {
+        return strtolower($m[0]);
+    }
+
+
+    /**
+     * This method merges old or existing name/value array with new name/value array.
+     * and then generates a string of the combined style suitable for placing inline.
+     * This becomes the single point for CSS string generation allowing for consistent.
+     * CSS output no matter where the CSS originally came from.
+     * @param array $oldStyles
+     * @param array $newStyles
+     * @return string
+     */
+    private function generateStyleStringFromDeclarationsArrays(array $oldStyles, array $newStyles) {
+        $combinedStyles = array_merge($oldStyles, $newStyles);
+        $style = '';
+        foreach ($combinedStyles as $attributeName => $attributeValue) {
+            $style .= (strtolower(trim($attributeName)) . ': ' . trim($attributeValue) . '; ');
+        }
+        return trim($style);
+    }
+
+
+    /**
+     * Copies the media part from CSS array parts to $xmlDocument.
+     *
+     * @param array $cssParts
+     * @param DOMDocument $xmlDocument
+     */
+    public function copyCssWithMediaToStyleNode(array $cssParts, DOMDocument $xmlDocument) {
+        if (isset($cssParts['media']) && $cssParts['media'] !== '') {
+            $this->addStyleElementToDocument($xmlDocument, $cssParts['media']);
+        }
+    }
+
+    /**
+     * Returns CSS content.
+     *
+     * @param DOMXPath $xpath
+     * @return string
+     */
+    private function getCssFromAllStyleNodes(DOMXPath $xpath) {
+        $styleNodes = $xpath->query('//style');
+
+        if ($styleNodes === false) {
+            return '';
+        }
+
+        $css = '';
+        /** @var $styleNode DOMNode */
+        foreach ($styleNodes as $styleNode) {
+            $css .= "\n\n" . $styleNode->nodeValue;
+            $styleNode->parentNode->removeChild($styleNode);
+        }
+
+        return $css;
+    }
+
+    /**
+     * Adds a style element with $css to $document.
+     *
+     * @param DOMDocument $document
+     * @param string $css
+     */
+    private function addStyleElementToDocument(DOMDocument $document, $css) {
+        $styleElement = $document->createElement('style', $css);
+        $styleAttribute = $document->createAttribute('type');
+        $styleAttribute->value = 'text/css';
+        $styleElement->appendChild($styleAttribute);
+
+        $head = $this->getOrCreateHeadElement($document);
+        $head->appendChild($styleElement);
+    }
+
+    /**
+     * Returns the existing or creates a new head element in $document.
+     *
+     * @param DOMDocument $document
+     * @return DOMNode the head element
+     */
+    private function getOrCreateHeadElement(DOMDocument $document) {
+        $head = $document->getElementsByTagName('head')->item(0);
+
+        if ($head === null) {
+            $head = $document->createElement('head');
+            $html = $document->getElementsByTagName('html')->item(0);
+            $html->insertBefore($head, $document->getElementsByTagName('body')->item(0));
+        }
+
+        return $head;
+    }
+
+    /**
+     * Splits input CSS code to an array where:
+     *
+     * - key "css" will be contains clean CSS code.
+     * - key "media" will be contains all valuable media queries.
+     *
+     * Example:
+     *
+     * The CSS code.
+     *
+     *   "@import "file.css"; h1 { color:red; } @media { h1 {}} @media tv { h1 {}}"
+     *
+     * will be parsed into the following array:
+     *
+     *   "css" => "h1 { color:red; }"
+     *   "media" => "@media { h1 {}}"
+     *
+     * @param string $css
+     * @return array
+     */
+    private function splitCssAndMediaQuery($css) {
+        $css = preg_replace_callback( '#@media\\s+(?:only\\s)?(?:[\\s{\(]|screen|all)\\s?[^{]+{.*}\\s*}\\s*#misU', array( $this, '_media_concat' ), $css );
+
+        // filter the CSS
+        $search = array(
+            // get rid of css comment code
+            '/\\/\\*.*\\*\\//sU',
+            // strip out any import directives
+            '/^\\s*@import\\s[^;]+;/misU',
+            // strip remains media enclosures
+            '/^\\s*@media\\s[^{]+{(.*)}\\s*}\\s/misU',
+        );
+
+        $replace = array(
+            '',
+            '',
+            '',
+        );
+
+        // clean CSS before output
+        $css = preg_replace($search, $replace, $css);
+
+        return array('css' => $css, 'media' => self::$_media);
+    }
+
+    private function _media_concat( $matches ) {
+        self::$_media .= $matches[0];
+    }
+
+    /**
+     * Creates a DOMDocument instance with the current HTML.
+     *
+     * @return DOMDocument
+     */
+    private function createXmlDocument() {
+        $xmlDocument = new DOMDocument;
+        $xmlDocument->encoding = self::ENCODING;
+        $xmlDocument->strictErrorChecking = false;
+        $xmlDocument->formatOutput = true;
+        $libXmlState = libxml_use_internal_errors(true);
+        $xmlDocument->loadHTML($this->getUnifiedHtml());
+        libxml_clear_errors();
+        libxml_use_internal_errors($libXmlState);
+        $xmlDocument->normalizeDocument();
+
+        return $xmlDocument;
+    }
+
+    /**
+     * Returns the HTML with the non-ASCII characters converts into HTML entities and the unprocessable HTML tags removed.
+     *
+     * @return string the unified HTML
+     *
+     * @throws BadMethodCallException
+     */
+    private function getUnifiedHtml() {
+        if (!empty($this->unprocessableHtmlTags)) {
+            $unprocessableHtmlTags = implode('|', $this->unprocessableHtmlTags);
+            $bodyWithoutUnprocessableTags = preg_replace('/<\\/?(' . $unprocessableHtmlTags . ')[^>]*>/i', '', $this->html);
+        } else {
+            $bodyWithoutUnprocessableTags = $this->html;
+        }
+
+        if ( function_exists( 'mb_convert_encoding' ) ) {
+            return mb_convert_encoding( $bodyWithoutUnprocessableTags, 'HTML-ENTITIES', self::ENCODING );
+        } else {
+            return htmlspecialchars_decode( utf8_decode( htmlentities( $bodyWithoutUnprocessableTags, ENT_COMPAT, self::ENCODING, false ) ) );
+        }
+    }
+
+    /**
+     * @param array $a
+     * @param array $b
+     *
+     * @return integer
+     */
+    private function sortBySelectorPrecedence(array $a, array $b) {
+        $precedenceA = $this->getCssSelectorPrecedence($a['selector']);
+        $precedenceB = $this->getCssSelectorPrecedence($b['selector']);
+
+        // We want these sorted in ascending order so selectors with lesser precedence get processed first and
+        // selectors with greater precedence get sorted last.
+        // The parenthesis around the -1 are necessary to avoid a PHP_CodeSniffer warning about missing spaces around
+        // arithmetic operators.
+        // @see http://forge.typo3.org/issues/55605
+        $precedenceForEquals = ($a['line'] < $b['line'] ? (-1) : 1);
+        $precedenceForNotEquals = ($precedenceA < $precedenceB ? (-1) : 1);
+        return ($precedenceA === $precedenceB) ? $precedenceForEquals : $precedenceForNotEquals;
+    }
+
+    /**
+     * @param string $selector
+     *
+     * @return integer
+     */
+    private function getCssSelectorPrecedence($selector) {
+        $selectorKey = md5($selector);
+        if (!isset($this->caches[self::CACHE_KEY_SELECTOR][$selectorKey])) {
+            $precedence = 0;
+            $value = 100;
+            // ids: worth 100, classes: worth 10, elements: worth 1
+            $search = array('\\#','\\.','');
+
+            foreach ($search as $s) {
+                if (trim($selector == '')) {
+                    break;
+                }
+                $number = 0;
+                $selector = preg_replace('/' . $s . '\\w+/', '', $selector, -1, $number);
+                $precedence += ($value * $number);
+                $value /= 10;
+            }
+            $this->caches[self::CACHE_KEY_SELECTOR][$selectorKey] = $precedence;
+        }
+
+        return $this->caches[self::CACHE_KEY_SELECTOR][$selectorKey];
+    }
+
+    /**
+     * Right now, we support all CSS 1 selectors and most CSS2/3 selectors.
+     *
+     * @see http://plasmasturm.org/log/444/
+     *
+     * @param string $paramCssSelector
+     *
+     * @return string
+     */
+    private function translateCssToXpath($paramCssSelector) {
+        $cssSelector = ' ' . $paramCssSelector . ' ';
+        $cssSelector = preg_replace_callback( '/\s+\w+\s+/', array( $this, 'strtolower' ), $cssSelector );
+        $cssSelector = trim($cssSelector);
+        $xpathKey = md5($cssSelector);
+        if (!isset($this->caches[self::CACHE_KEY_XPATH][$xpathKey])) {
+            // returns an Xpath selector
+            $search = array(
+                // Matches any element that is a child of parent.
+                '/\\s+>\\s+/',
+                // Matches any element that is an adjacent sibling.
+                '/\\s+\\+\\s+/',
+                // Matches any element that is a descendant of an parent element element.
+                '/\\s+/',
+                // first-child pseudo-selector
+                '/([^\\/]+):first-child/i',
+                // last-child pseudo-selector
+                '/([^\\/]+):last-child/i',
+                // Matches attribute only selector
+                '/^\\[(\\w+)\\]/',
+                // Matches element with attribute
+                '/(\\w)\\[(\\w+)\\]/',
+                // Matches element with EXACT attribute
+                '/(\\w)\\[(\\w+)\\=[\'"]?(\\w+)[\'"]?\\]/',
+            );
+            $replace = array(
+                '/',
+                '/following-sibling::*[1]/self::',
+                '//',
+                '*[1]/self::\\1',
+                '*[last()]/self::\\1',
+                '*[@\\1]',
+                '\\1[@\\2]',
+                '\\1[@\\2="\\3"]',
+            );
+
+            $cssSelector = '//' . preg_replace($search, $replace, $cssSelector);
+
+            $cssSelector = preg_replace_callback(self::ID_ATTRIBUTE_MATCHER, array($this, 'matchIdAttributes'), $cssSelector);
+            $cssSelector = preg_replace_callback(self::CLASS_ATTRIBUTE_MATCHER, array($this, 'matchClassAttributes'), $cssSelector);
+
+            // Advanced selectors are going to require a bit more advanced emogrification.
+            // When we required PHP 5.3, we could do this with closures.
+            $cssSelector = preg_replace_callback(
+                '/([^\\/]+):nth-child\\(\s*(odd|even|[+\-]?\\d|[+\\-]?\\d?n(\\s*[+\\-]\\s*\\d)?)\\s*\\)/i',
+                array($this, 'translateNthChild'), $cssSelector
+            );
+            $cssSelector = preg_replace_callback(
+                '/([^\\/]+):nth-of-type\\(\s*(odd|even|[+\-]?\\d|[+\\-]?\\d?n(\\s*[+\\-]\\s*\\d)?)\\s*\\)/i',
+                array($this, 'translateNthOfType'), $cssSelector
+            );
+
+            $this->caches[self::CACHE_KEY_SELECTOR][$xpathKey] = $cssSelector;
+        }
+        return $this->caches[self::CACHE_KEY_SELECTOR][$xpathKey];
+    }
+
+    /**
+     * @param array $match
+     *
+     * @return string
+     */
+    private function matchIdAttributes(array $match) {
+        return (strlen($match[1]) ? $match[1] : '*') . '[@id="' . $match[2] . '"]';
+    }
+
+    /**
+     * @param array $match
+     *
+     * @return string
+     */
+    private function matchClassAttributes(array $match) {
+        return (strlen($match[1]) ? $match[1] : '*') . '[contains(concat(" ",@class," "),concat(" ","' .
+            implode(
+                '"," "))][contains(concat(" ",@class," "),concat(" ","',
+                explode('.', substr($match[2], 1))
+            ) . '"," "))]';
+    }
+
+    /**
+     * @param array $match
+     *
+     * @return string
+     */
+    private function translateNthChild(array $match) {
+        $result = $this->parseNth($match);
+
+        if (isset($result[self::MULTIPLIER])) {
+            if ($result[self::MULTIPLIER] < 0) {
+                $result[self::MULTIPLIER] = abs($result[self::MULTIPLIER]);
+                return sprintf('*[(last() - position()) mod %u = %u]/self::%s', $result[self::MULTIPLIER], $result[self::INDEX], $match[1]);
+            } else {
+                return sprintf('*[position() mod %u = %u]/self::%s', $result[self::MULTIPLIER], $result[self::INDEX], $match[1]);
+            }
+        } else {
+            return sprintf('*[%u]/self::%s', $result[self::INDEX], $match[1]);
+        }
+    }
+
+    /**
+     * @param array $match
+     *
+     * @return string
+     */
+    private function translateNthOfType(array $match) {
+        $result = $this->parseNth($match);
+
+        if (isset($result[self::MULTIPLIER])) {
+            if ($result[self::MULTIPLIER] < 0) {
+                $result[self::MULTIPLIER] = abs($result[self::MULTIPLIER]);
+                return sprintf('%s[(last() - position()) mod %u = %u]', $match[1], $result[self::MULTIPLIER], $result[self::INDEX]);
+            } else {
+                return sprintf('%s[position() mod %u = %u]', $match[1], $result[self::MULTIPLIER], $result[self::INDEX]);
+            }
+        } else {
+            return sprintf('%s[%u]', $match[1], $result[self::INDEX]);
+        }
+    }
+
+    /**
+     * @param array $match
+     *
+     * @return array
+     */
+    private function parseNth(array $match) {
+        if (in_array(strtolower($match[2]), array('even','odd'))) {
+            $index = strtolower($match[2]) == 'even' ? 0 : 1;
+            return array(self::MULTIPLIER => 2, self::INDEX => $index);
+        } elseif (stripos($match[2], 'n') === false) {
+            // if there is a multiplier
+            $index = intval(str_replace(' ', '', $match[2]));
+            return array(self::INDEX => $index);
+        } else {
+            if (isset($match[3])) {
+                $multipleTerm = str_replace($match[3], '', $match[2]);
+                $index = intval(str_replace(' ', '', $match[3]));
+            } else {
+                $multipleTerm = $match[2];
+                $index = 0;
+            }
+
+            $multiplier = str_ireplace('n', '', $multipleTerm);
+
+            if (!strlen($multiplier)) {
+                $multiplier = 1;
+            } elseif ($multiplier == 0) {
+                return array(self::INDEX => $index);
+            } else {
+                $multiplier = intval($multiplier);
+            }
+
+            while ($index < 0) {
+                $index += abs($multiplier);
+            }
+
+            return array(self::MULTIPLIER => $multiplier, self::INDEX => $index);
+        }
+    }
+
+    /**
+     * Parses a CSS declaration block into property name/value pairs.
+     *
+     * Example:
+     *
+     * The declaration block.
+     *
+     *   "color: #000; font-weight: bold;".
+     *
+     * will be parsed into the following array:
+     *
+     *   "color" => "#000"
+     *   "font-weight" => "bold"
+     *
+     * @param string $cssDeclarationBlock the CSS declaration block without the curly braces, may be empty
+     *
+     * @return array the CSS declarations with the property names as array keys and the property values as array values
+     */
+    private function parseCssDeclarationBlock($cssDeclarationBlock) {
+        if (isset($this->caches[self::CACHE_KEY_CSS_DECLARATION_BLOCK][$cssDeclarationBlock])) {
+            return $this->caches[self::CACHE_KEY_CSS_DECLARATION_BLOCK][$cssDeclarationBlock];
+        }
+
+        $properties = array();
+        $declarations = explode(';', $cssDeclarationBlock);
+        foreach ($declarations as $declaration) {
+            $matches = array();
+            if (!preg_match('/ *([A-Za-z\\-]+) *: *([^;]+) */', $declaration, $matches)) {
+                continue;
+            }
+            $propertyName = strtolower($matches[1]);
+            $propertyValue = $matches[2];
+            $properties[$propertyName] = $propertyValue;
+        }
+        $this->caches[self::CACHE_KEY_CSS_DECLARATION_BLOCK][$cssDeclarationBlock] = $properties;
+
+        return $properties;
+    }
 }

Spacing +14 added lines, -14 removed lines

@@ -238,7 +238,7 @@ 
 		if ($nodesWithStyleAttributes !== false) {
 			/** @var $nodeWithStyleAttribute DOMNode */
 			foreach ($nodesWithStyleAttributes as $node) {
-				$normalizedOriginalStyle = preg_replace_callback( '/[A-z\\-]+(?=\\:)/S', array( $this, 'strtolower' ), $node->getAttribute('style') );
+				$normalizedOriginalStyle = preg_replace_callback('/[A-z\\-]+(?=\\:)/S', array($this, 'strtolower'), $node->getAttribute('style'));
 
 				// in order to not overwrite existing style attributes in the HTML, we have to save the original HTML styles
 				$nodePath = $node->getNodePath();
@@ -289,7 +289,7 @@ 
 			}
 
 			// now sort the selectors by precedence
-			usort($allSelectors, array($this,'sortBySelectorPrecedence'));
+			usort($allSelectors, array($this, 'sortBySelectorPrecedence'));
 
 			$this->caches[self::CACHE_KEY_CSS][$cssKey] = $allSelectors;
 		}
@@ -329,7 +329,7 @@ 
 		if ($nodesWithStyleDisplayNone->length > 0) {
 			/** @var $node \DOMNode */
 			foreach ($nodesWithStyleDisplayNone as $node) {
-				if ($node->parentNode && is_callable(array($node->parentNode,'removeChild'))) {
+				if ($node->parentNode && is_callable(array($node->parentNode, 'removeChild'))) {
 					$node->parentNode->removeChild($node);
 				}
 			}
@@ -338,10 +338,10 @@ 
 		$this->copyCssWithMediaToStyleNode($cssParts, $xmlDocument);
 
 		if ($this->preserveEncoding) {
-			if ( function_exists( 'mb_convert_encoding' ) ) {
-				return mb_convert_encoding( $xmlDocument->saveHTML(), self::ENCODING, 'HTML-ENTITIES' );
+			if (function_exists('mb_convert_encoding')) {
+				return mb_convert_encoding($xmlDocument->saveHTML(), self::ENCODING, 'HTML-ENTITIES');
 			} else {
-				return htmlspecialchars_decode( utf8_encode( html_entity_decode( $xmlDocument->saveHTML(), ENT_COMPAT, self::ENCODING ) ) );
+				return htmlspecialchars_decode(utf8_encode(html_entity_decode($xmlDocument->saveHTML(), ENT_COMPAT, self::ENCODING)));
 			}
 		} else {
 			return $xmlDocument->saveHTML();
@@ -462,7 +462,7 @@ 
 	 * @return array
 	 */
 	private function splitCssAndMediaQuery($css) {
-		$css = preg_replace_callback( '#@media\\s+(?:only\\s)?(?:[\\s{\(]|screen|all)\\s?[^{]+{.*}\\s*}\\s*#misU', array( $this, '_media_concat' ), $css );
+		$css = preg_replace_callback('#@media\\s+(?:only\\s)?(?:[\\s{\(]|screen|all)\\s?[^{]+{.*}\\s*}\\s*#misU', array($this, '_media_concat'), $css);
 
 		// filter the CSS
 		$search = array(
@@ -486,7 +486,7 @@ 
 		return array('css' => $css, 'media' => self::$_media);
 	}
 
-	private function _media_concat( $matches ) {
+	private function _media_concat($matches) {
 		self::$_media .= $matches[0];
 	}
 
@@ -524,10 +524,10 @@ 
 			$bodyWithoutUnprocessableTags = $this->html;
 		}
 
-		if ( function_exists( 'mb_convert_encoding' ) ) {
-			return mb_convert_encoding( $bodyWithoutUnprocessableTags, 'HTML-ENTITIES', self::ENCODING );
+		if (function_exists('mb_convert_encoding')) {
+			return mb_convert_encoding($bodyWithoutUnprocessableTags, 'HTML-ENTITIES', self::ENCODING);
 		} else {
-			return htmlspecialchars_decode( utf8_decode( htmlentities( $bodyWithoutUnprocessableTags, ENT_COMPAT, self::ENCODING, false ) ) );
+			return htmlspecialchars_decode(utf8_decode(htmlentities($bodyWithoutUnprocessableTags, ENT_COMPAT, self::ENCODING, false)));
 		}
 	}
 
@@ -562,7 +562,7 @@ 
 			$precedence = 0;
 			$value = 100;
 			// ids: worth 100, classes: worth 10, elements: worth 1
-			$search = array('\\#','\\.','');
+			$search = array('\\#', '\\.', '');
 
 			foreach ($search as $s) {
 				if (trim($selector == '')) {
@@ -590,7 +590,7 @@ 
 	 */
 	private function translateCssToXpath($paramCssSelector) {
 		$cssSelector = ' ' . $paramCssSelector . ' ';
-		$cssSelector = preg_replace_callback( '/\s+\w+\s+/', array( $this, 'strtolower' ), $cssSelector );
+		$cssSelector = preg_replace_callback('/\s+\w+\s+/', array($this, 'strtolower'), $cssSelector);
 		$cssSelector = trim($cssSelector);
 		$xpathKey = md5($cssSelector);
 		if (!isset($this->caches[self::CACHE_KEY_XPATH][$xpathKey])) {
@@ -713,7 +713,7 @@ 
 	 * @return array
 	 */
 	private function parseNth(array $match) {
-		if (in_array(strtolower($match[2]), array('even','odd'))) {
+		if (in_array(strtolower($match[2]), array('even', 'odd'))) {
 			$index = strtolower($match[2]) == 'even' ? 0 : 1;
 			return array(self::MULTIPLIER => 2, self::INDEX => $index);
 		} elseif (stripos($match[2], 'n') === false) {

includes/libraries/wp-session/wp-cli.php

Indentation +145 added lines, -145 removed lines

@@ -8,151 +8,151 @@
  */
 class WP_Session_Command extends \WP_CLI_Command {
 
-	/**
-	 * Count the total number of sessions stored in the database.
-	 *
-	 *
-	 * ## EXAMPLES
-	 *
-	 *      wp session count
-	 *
-	 * @global wpdb $wpdb
-	 *
-	 * @param array $args
-	 * @param array $assoc_args
-	 */
-	public function count( $args, $assoc_args ) {
-		$sessions = WP_Session_Utils::count_sessions();
-
-		\WP_CLI::line( sprintf( '%d sessions currently exist.', absint( $sessions ) ) );
-	}
-
-	/**
-	 * Delete sessions from the database.
-	 *
-	 * ## OPTIONS
-	 *
-	 * [--all]
-	 * : Flag whether or not to purge all sessions from the database.
-	 *
-	 * [--batch=<batch>]
-	 * : Set the batch size for deleting old sessions
-	 *
-	 * [--limit=<limit>]
-	 * : Delete just this number of old sessions
-	 *
-	 * ## EXAMPLES
-	 *
-	 *      wp session delete
-	 *      wp session delete [--batch=<batch>]
-	 *      wp session delete [--limit=<limit>]
-	 *      wp session delete [--all]
-	 *
-	 * @synopsis [--all] [--batch=<batch>] [--limit=<limit>]
-	 *
-	 * @param array $args
-	 * @param array $assoc_args
-	 */
-	public function delete( $args, $assoc_args ) {
-		if ( isset( $assoc_args['limit'] ) ) {
-			$limit = absint( $assoc_args['limit'] );
-
-			$count = WP_Session_Utils::delete_old_sessions( $limit );
-
-			if ( $count > 0 ) {
-				\WP_CLI::line( sprintf( 'Deleted %d sessions.', $count ) );
-			}
-
-			// Clear memory
-			self::free_up_memory();
-			return;
-		}
-
-		// Determine if we're deleting all sessions or just a subset.
-		$all = isset( $assoc_args['all'] );
-
-		/**
-		 * Determine the size of each batch for deletion.
-		 *
-		 * @param int
-		 */
-		$batch = isset( $assoc_args['batch'] ) ? absint( $assoc_args['batch'] ) : apply_filters( 'wp_session_delete_batch_size', 1000 );
-
-		switch ( $all ) {
-			case true:
-				$count = WP_Session_Utils::delete_all_sessions();
-
-				\WP_CLI::line( sprintf( 'Deleted all %d sessions.', $count ) );
-				break;
-			case false:
-				do {
-					$count = WP_Session_Utils::delete_old_sessions( $batch );
-
-					if ( $count > 0 ) {
-						\WP_CLI::line( sprintf( 'Deleted %d sessions.', $count ) );
-					}
-
-					// Clear memory
-					self::free_up_memory();
-				} while ( $count > 0 );
-				break;
-		}
-	}
-
-	/**
-	 * Generate a number of dummy sessions for testing purposes.
-	 *
-	 * ## OPTIONS
-	 *
-	 * <count>
-	 * : Number of sessions to create.
-	 *
-	 * [--expires=<date>]
-	 * : Optional expiration time tagged for each session. Will use WordPress' local time.
-	 *
-	 * ## EXAMPLES
-	 *
-	 *      wp session generate 5000
-	 *      wp session generate 5000 --expires="2014-11-09T08:00"
-	 *
-	 * @synopsis <count> [--expires=<date>]
-	 *
-	 * @param array $args
-	 * @param array $assoc_args
-	 */
-	public function generate( $args, $assoc_args ) {
-		$count = absint( $args[0] );
-		$date  = isset( $assoc_args['expires'] ) ? $assoc_args['expires'] : null;
-
-		$notify = \WP_CLI\Utils\make_progress_bar( 'Generating sessions', $count );
-
-		for ( $i = 0; $i < $count; $i ++ ) {
-			WP_Session_Utils::create_dummy_session( $date );
-			$notify->tick();
-		}
-
-		$notify->finish();
-	}
-
-	/**
-	 * Free up memory
-	 *
-	 * @global WP_Object_Cache $wp_object_cache
-	 * @global wpdb            $wpdb
-	 */
-	private function free_up_memory() {
-		global $wp_object_cache, $wpdb;
-		$wpdb->queries = array();
-
-		if ( ! is_object( $wp_object_cache ) ) {
-			return;
-		}
-
-		$wp_object_cache->group_ops      = array();
-		$wp_object_cache->stats          = array();
-		$wp_object_cache->memcache_debug = array();
-		$wp_object_cache->cache          = array();
-	}
+    /**
+     * Count the total number of sessions stored in the database.
+     *
+     *
+     * ## EXAMPLES
+     *
+     *      wp session count
+     *
+     * @global wpdb $wpdb
+     *
+     * @param array $args
+     * @param array $assoc_args
+     */
+    public function count( $args, $assoc_args ) {
+        $sessions = WP_Session_Utils::count_sessions();
+
+        \WP_CLI::line( sprintf( '%d sessions currently exist.', absint( $sessions ) ) );
+    }
+
+    /**
+     * Delete sessions from the database.
+     *
+     * ## OPTIONS
+     *
+     * [--all]
+     * : Flag whether or not to purge all sessions from the database.
+     *
+     * [--batch=<batch>]
+     * : Set the batch size for deleting old sessions
+     *
+     * [--limit=<limit>]
+     * : Delete just this number of old sessions
+     *
+     * ## EXAMPLES
+     *
+     *      wp session delete
+     *      wp session delete [--batch=<batch>]
+     *      wp session delete [--limit=<limit>]
+     *      wp session delete [--all]
+     *
+     * @synopsis [--all] [--batch=<batch>] [--limit=<limit>]
+     *
+     * @param array $args
+     * @param array $assoc_args
+     */
+    public function delete( $args, $assoc_args ) {
+        if ( isset( $assoc_args['limit'] ) ) {
+            $limit = absint( $assoc_args['limit'] );
+
+            $count = WP_Session_Utils::delete_old_sessions( $limit );
+
+            if ( $count > 0 ) {
+                \WP_CLI::line( sprintf( 'Deleted %d sessions.', $count ) );
+            }
+
+            // Clear memory
+            self::free_up_memory();
+            return;
+        }
+
+        // Determine if we're deleting all sessions or just a subset.
+        $all = isset( $assoc_args['all'] );
+
+        /**
+         * Determine the size of each batch for deletion.
+         *
+         * @param int
+         */
+        $batch = isset( $assoc_args['batch'] ) ? absint( $assoc_args['batch'] ) : apply_filters( 'wp_session_delete_batch_size', 1000 );
+
+        switch ( $all ) {
+            case true:
+                $count = WP_Session_Utils::delete_all_sessions();
+
+                \WP_CLI::line( sprintf( 'Deleted all %d sessions.', $count ) );
+                break;
+            case false:
+                do {
+                    $count = WP_Session_Utils::delete_old_sessions( $batch );
+
+                    if ( $count > 0 ) {
+                        \WP_CLI::line( sprintf( 'Deleted %d sessions.', $count ) );
+                    }
+
+                    // Clear memory
+                    self::free_up_memory();
+                } while ( $count > 0 );
+                break;
+        }
+    }
+
+    /**
+     * Generate a number of dummy sessions for testing purposes.
+     *
+     * ## OPTIONS
+     *
+     * <count>
+     * : Number of sessions to create.
+     *
+     * [--expires=<date>]
+     * : Optional expiration time tagged for each session. Will use WordPress' local time.
+     *
+     * ## EXAMPLES
+     *
+     *      wp session generate 5000
+     *      wp session generate 5000 --expires="2014-11-09T08:00"
+     *
+     * @synopsis <count> [--expires=<date>]
+     *
+     * @param array $args
+     * @param array $assoc_args
+     */
+    public function generate( $args, $assoc_args ) {
+        $count = absint( $args[0] );
+        $date  = isset( $assoc_args['expires'] ) ? $assoc_args['expires'] : null;
+
+        $notify = \WP_CLI\Utils\make_progress_bar( 'Generating sessions', $count );
+
+        for ( $i = 0; $i < $count; $i ++ ) {
+            WP_Session_Utils::create_dummy_session( $date );
+            $notify->tick();
+        }
+
+        $notify->finish();
+    }
+
+    /**
+     * Free up memory
+     *
+     * @global WP_Object_Cache $wp_object_cache
+     * @global wpdb            $wpdb
+     */
+    private function free_up_memory() {
+        global $wp_object_cache, $wpdb;
+        $wpdb->queries = array();
+
+        if ( ! is_object( $wp_object_cache ) ) {
+            return;
+        }
+
+        $wp_object_cache->group_ops      = array();
+        $wp_object_cache->stats          = array();
+        $wp_object_cache->memcache_debug = array();
+        $wp_object_cache->cache          = array();
+    }
 }
 
 \WP_CLI::add_command( 'session', 'WP_Session_Command' );
\ No newline at end of file

Spacing +24 added lines, -24 removed lines

@@ -21,10 +21,10 @@ 
 	 * @param array $args
 	 * @param array $assoc_args
 	 */
-	public function count( $args, $assoc_args ) {
+	public function count($args, $assoc_args) {
 		$sessions = WP_Session_Utils::count_sessions();
 
-		\WP_CLI::line( sprintf( '%d sessions currently exist.', absint( $sessions ) ) );
+		\WP_CLI::line(sprintf('%d sessions currently exist.', absint($sessions)));
 	}
 
 	/**
@@ -53,14 +53,14 @@ 
 	 * @param array $args
 	 * @param array $assoc_args
 	 */
-	public function delete( $args, $assoc_args ) {
-		if ( isset( $assoc_args['limit'] ) ) {
-			$limit = absint( $assoc_args['limit'] );
+	public function delete($args, $assoc_args) {
+		if (isset($assoc_args['limit'])) {
+			$limit = absint($assoc_args['limit']);
 
-			$count = WP_Session_Utils::delete_old_sessions( $limit );
+			$count = WP_Session_Utils::delete_old_sessions($limit);
 
-			if ( $count > 0 ) {
-				\WP_CLI::line( sprintf( 'Deleted %d sessions.', $count ) );
+			if ($count > 0) {
+				\WP_CLI::line(sprintf('Deleted %d sessions.', $count));
 			}
 
 			// Clear memory
@@ -69,32 +69,32 @@ 
 		}
 
 		// Determine if we're deleting all sessions or just a subset.
-		$all = isset( $assoc_args['all'] );
+		$all = isset($assoc_args['all']);
 
 		/**
 		 * Determine the size of each batch for deletion.
 		 *
 		 * @param int
 		 */
-		$batch = isset( $assoc_args['batch'] ) ? absint( $assoc_args['batch'] ) : apply_filters( 'wp_session_delete_batch_size', 1000 );
+		$batch = isset($assoc_args['batch']) ? absint($assoc_args['batch']) : apply_filters('wp_session_delete_batch_size', 1000);
 
-		switch ( $all ) {
+		switch ($all) {
 			case true:
 				$count = WP_Session_Utils::delete_all_sessions();
 
-				\WP_CLI::line( sprintf( 'Deleted all %d sessions.', $count ) );
+				\WP_CLI::line(sprintf('Deleted all %d sessions.', $count));
 				break;
 			case false:
 				do {
-					$count = WP_Session_Utils::delete_old_sessions( $batch );
+					$count = WP_Session_Utils::delete_old_sessions($batch);
 
-					if ( $count > 0 ) {
-						\WP_CLI::line( sprintf( 'Deleted %d sessions.', $count ) );
+					if ($count > 0) {
+						\WP_CLI::line(sprintf('Deleted %d sessions.', $count));
 					}
 
 					// Clear memory
 					self::free_up_memory();
-				} while ( $count > 0 );
+				} while ($count > 0);
 				break;
 		}
 	}
@@ -120,14 +120,14 @@ 
 	 * @param array $args
 	 * @param array $assoc_args
 	 */
-	public function generate( $args, $assoc_args ) {
-		$count = absint( $args[0] );
-		$date  = isset( $assoc_args['expires'] ) ? $assoc_args['expires'] : null;
+	public function generate($args, $assoc_args) {
+		$count = absint($args[0]);
+		$date  = isset($assoc_args['expires']) ? $assoc_args['expires'] : null;
 
-		$notify = \WP_CLI\Utils\make_progress_bar( 'Generating sessions', $count );
+		$notify = \WP_CLI\Utils\make_progress_bar('Generating sessions', $count);
 
-		for ( $i = 0; $i < $count; $i ++ ) {
-			WP_Session_Utils::create_dummy_session( $date );
+		for ($i = 0; $i < $count; $i++) {
+			WP_Session_Utils::create_dummy_session($date);
 			$notify->tick();
 		}
 
@@ -144,7 +144,7 @@ 
 		global $wp_object_cache, $wpdb;
 		$wpdb->queries = array();
 
-		if ( ! is_object( $wp_object_cache ) ) {
+		if (!is_object($wp_object_cache)) {
 			return;
 		}
 
@@ -155,4 +155,4 @@ 
 	}
 }
 
-\WP_CLI::add_command( 'session', 'WP_Session_Command' );
\ No newline at end of file
+\WP_CLI::add_command('session', 'WP_Session_Command');
\ No newline at end of file

includes/libraries/wp-session/wp-session.php

Indentation +46 added lines, -46 removed lines

@@ -16,16 +16,16 @@ 
  * @return int
  */
 function wp_session_cache_expire() {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	return $wp_session->cache_expiration();
+    return $wp_session->cache_expiration();
 }
 
 /**
  * Alias of wp_session_write_close()
  */
 function wp_session_commit() {
-	wp_session_write_close();
+    wp_session_write_close();
 }
 
 /**
@@ -34,9 +34,9 @@ 
  * @param string $data
  */
 function wp_session_decode( $data ) {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	return $wp_session->json_in( $data );
+    return $wp_session->json_in( $data );
 }
 
 /**
@@ -45,9 +45,9 @@ 
  * @return string
  */
 function wp_session_encode() {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	return $wp_session->json_out();
+    return $wp_session->json_out();
 }
 
 /**
@@ -58,11 +58,11 @@ 
  * @return bool
  */
 function wp_session_regenerate_id( $delete_old_session = false ) {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	$wp_session->regenerate_id( $delete_old_session );
+    $wp_session->regenerate_id( $delete_old_session );
 
-	return true;
+    return true;
 }
 
 /**
@@ -73,13 +73,13 @@ 
  * @return bool
  */
 function wp_session_start() {
-	$wp_session = WP_Session::get_instance();
-	do_action( 'wp_session_start' );
+    $wp_session = WP_Session::get_instance();
+    do_action( 'wp_session_start' );
 
-	return $wp_session->session_started();
+    return $wp_session->session_started();
 }
 if ( ! defined( 'WP_CLI' ) || false === WP_CLI ) {
-	add_action( 'plugins_loaded', 'wp_session_start' );
+    add_action( 'plugins_loaded', 'wp_session_start' );
 }
 
 /**
@@ -88,35 +88,35 @@ 
  * @return int
  */
 function wp_session_status() {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	if ( $wp_session->session_started() ) {
-		return PHP_SESSION_ACTIVE;
-	}
+    if ( $wp_session->session_started() ) {
+        return PHP_SESSION_ACTIVE;
+    }
 
-	return PHP_SESSION_NONE;
+    return PHP_SESSION_NONE;
 }
 
 /**
  * Unset all session variables.
  */
 function wp_session_unset() {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	$wp_session->reset();
+    $wp_session->reset();
 }
 
 /**
  * Write session data and end session
  */
 function wp_session_write_close() {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	$wp_session->write_data();
-	do_action( 'wp_session_commit' );
+    $wp_session->write_data();
+    do_action( 'wp_session_commit' );
 }
 if ( ! defined( 'WP_CLI' ) || false === WP_CLI ) {
-	add_action( 'shutdown', 'wp_session_write_close' );
+    add_action( 'shutdown', 'wp_session_write_close' );
 }
 
 /**
@@ -127,24 +127,24 @@ 
  * of a scheduled task or cron job.
  */
 function wp_session_cleanup() {
-	if ( defined( 'WP_SETUP_CONFIG' ) ) {
-		return;
-	}
-
-	if ( ! defined( 'WP_INSTALLING' ) ) {
-		/**
-		 * Determine the size of each batch for deletion.
-		 *
-		 * @param int
-		 */
-		$batch_size = apply_filters( 'wp_session_delete_batch_size', 1000 );
-
-		// Delete a batch of old sessions
-		WP_Session_Utils::delete_old_sessions( $batch_size );
-	}
-
-	// Allow other plugins to hook in to the garbage collection process.
-	do_action( 'wp_session_cleanup' );
+    if ( defined( 'WP_SETUP_CONFIG' ) ) {
+        return;
+    }
+
+    if ( ! defined( 'WP_INSTALLING' ) ) {
+        /**
+         * Determine the size of each batch for deletion.
+         *
+         * @param int
+         */
+        $batch_size = apply_filters( 'wp_session_delete_batch_size', 1000 );
+
+        // Delete a batch of old sessions
+        WP_Session_Utils::delete_old_sessions( $batch_size );
+    }
+
+    // Allow other plugins to hook in to the garbage collection process.
+    do_action( 'wp_session_cleanup' );
 }
 add_action( 'wp_session_garbage_collection', 'wp_session_cleanup' );
 
@@ -152,8 +152,8 @@ 
  * Register the garbage collector as a twice daily event.
  */
 function wp_session_register_garbage_collection() {
-	if ( ! wp_next_scheduled( 'wp_session_garbage_collection' ) ) {
-		wp_schedule_event( time(), 'hourly', 'wp_session_garbage_collection' );
-	}
+    if ( ! wp_next_scheduled( 'wp_session_garbage_collection' ) ) {
+        wp_schedule_event( time(), 'hourly', 'wp_session_garbage_collection' );
+    }
 }
 add_action( 'wp', 'wp_session_register_garbage_collection' );

Spacing +20 added lines, -20 removed lines

@@ -33,10 +33,10 @@ 
  *
  * @param string $data
  */
-function wp_session_decode( $data ) {
+function wp_session_decode($data) {
 	$wp_session = WP_Session::get_instance();
 
-	return $wp_session->json_in( $data );
+	return $wp_session->json_in($data);
 }
 
 /**
@@ -57,10 +57,10 @@ 
  *
  * @return bool
  */
-function wp_session_regenerate_id( $delete_old_session = false ) {
+function wp_session_regenerate_id($delete_old_session = false) {
 	$wp_session = WP_Session::get_instance();
 
-	$wp_session->regenerate_id( $delete_old_session );
+	$wp_session->regenerate_id($delete_old_session);
 
 	return true;
 }
@@ -74,12 +74,12 @@ 
  */
 function wp_session_start() {
 	$wp_session = WP_Session::get_instance();
-	do_action( 'wp_session_start' );
+	do_action('wp_session_start');
 
 	return $wp_session->session_started();
 }
-if ( ! defined( 'WP_CLI' ) || false === WP_CLI ) {
-	add_action( 'plugins_loaded', 'wp_session_start' );
+if (!defined('WP_CLI') || false === WP_CLI) {
+	add_action('plugins_loaded', 'wp_session_start');
 }
 
 /**
@@ -90,7 +90,7 @@ 
 function wp_session_status() {
 	$wp_session = WP_Session::get_instance();
 
-	if ( $wp_session->session_started() ) {
+	if ($wp_session->session_started()) {
 		return PHP_SESSION_ACTIVE;
 	}
 
@@ -113,10 +113,10 @@ 
 	$wp_session = WP_Session::get_instance();
 
 	$wp_session->write_data();
-	do_action( 'wp_session_commit' );
+	do_action('wp_session_commit');
 }
-if ( ! defined( 'WP_CLI' ) || false === WP_CLI ) {
-	add_action( 'shutdown', 'wp_session_write_close' );
+if (!defined('WP_CLI') || false === WP_CLI) {
+	add_action('shutdown', 'wp_session_write_close');
 }
 
 /**
@@ -127,33 +127,33 @@ 
  * of a scheduled task or cron job.
  */
 function wp_session_cleanup() {
-	if ( defined( 'WP_SETUP_CONFIG' ) ) {
+	if (defined('WP_SETUP_CONFIG')) {
 		return;
 	}
 
-	if ( ! defined( 'WP_INSTALLING' ) ) {
+	if (!defined('WP_INSTALLING')) {
 		/**
 		 * Determine the size of each batch for deletion.
 		 *
 		 * @param int
 		 */
-		$batch_size = apply_filters( 'wp_session_delete_batch_size', 1000 );
+		$batch_size = apply_filters('wp_session_delete_batch_size', 1000);
 
 		// Delete a batch of old sessions
-		WP_Session_Utils::delete_old_sessions( $batch_size );
+		WP_Session_Utils::delete_old_sessions($batch_size);
 	}
 
 	// Allow other plugins to hook in to the garbage collection process.
-	do_action( 'wp_session_cleanup' );
+	do_action('wp_session_cleanup');
 }
-add_action( 'wp_session_garbage_collection', 'wp_session_cleanup' );
+add_action('wp_session_garbage_collection', 'wp_session_cleanup');
 
 /**
  * Register the garbage collector as a twice daily event.
  */
 function wp_session_register_garbage_collection() {
-	if ( ! wp_next_scheduled( 'wp_session_garbage_collection' ) ) {
-		wp_schedule_event( time(), 'hourly', 'wp_session_garbage_collection' );
+	if (!wp_next_scheduled('wp_session_garbage_collection')) {
+		wp_schedule_event(time(), 'hourly', 'wp_session_garbage_collection');
 	}
 }
-add_action( 'wp', 'wp_session_register_garbage_collection' );
+add_action('wp', 'wp_session_register_garbage_collection');