AyeCode / invoicing

includes/wpinv-item-functions.php

Spacing +305 added lines, -305 removed lines

@@ -1,23 +1,23 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
-function wpinv_get_item_by_id( $id ) {
-    return wpinv_get_item_by( 'id', $id );
+function wpinv_get_item_by_id($id) {
+    return wpinv_get_item_by('id', $id);
 }
 
-function wpinv_get_item_by( $field = '', $value = '', $type = '' ) {
-    if( empty( $field ) || empty( $value ) ) {
+function wpinv_get_item_by($field = '', $value = '', $type = '') {
+    if (empty($field) || empty($value)) {
         return false;
     }
     
     $posts = array();
 
-    switch( strtolower( $field ) ) {
+    switch (strtolower($field)) {
         case 'id':
-            $item = new WPInv_Item( $value );
+            $item = new WPInv_Item($value);
 
-            if ( !empty( $item ) && $item->post_type == 'wpi_item' ) {
+            if (!empty($item) && $item->post_type == 'wpi_item') {
                 return $item;
             }
             return false;
@@ -26,16 +26,16 @@ 
 
         case 'slug':
         case 'name':
-            $posts = get_posts( array(
+            $posts = get_posts(array(
                 'post_type'      => 'wpi_item',
                 'name'           => $value,
                 'posts_per_page' => 1,
                 'post_status'    => 'any'
-            ) );
+            ));
 
             break;
         case 'custom_id':
-            if ( empty( $value ) || empty( $type ) ) {
+            if (empty($value) || empty($type)) {
                 return false;
             }
             
@@ -55,10 +55,10 @@ 
                 'post_status'    => 'any',
                 'orderby'        => 'ID',
                 'order'          => 'ASC',
-                'meta_query'     => array( $meta_query )
+                'meta_query'     => array($meta_query)
             );
             
-            $posts = get_posts( $args );
+            $posts = get_posts($args);
 
             break;
 
@@ -66,10 +66,10 @@ 
             return false;
     }
     
-    if ( !empty( $posts[0] ) ) {
-        $item = new WPInv_Item( $posts[0]->ID );
+    if (!empty($posts[0])) {
+        $item = new WPInv_Item($posts[0]->ID);
 
-        if ( !empty( $item ) && $item->post_type == 'wpi_item' ) {
+        if (!empty($item) && $item->post_type == 'wpi_item') {
             return $item;
         }
     }
@@ -77,10 +77,10 @@ 
     return false;
 }
 
-function wpinv_get_item( $item = 0 ) {
-    if ( is_numeric( $item ) ) {
-        $item = get_post( $item );
-        if ( ! $item || 'wpi_item' !== $item->post_type )
+function wpinv_get_item($item = 0) {
+    if (is_numeric($item)) {
+        $item = get_post($item);
+        if (!$item || 'wpi_item' !== $item->post_type)
             return null;
         return $item;
     }
@@ -93,18 +93,18 @@ 
 
     $item = get_posts($args);
 
-    if ( $item ) {
+    if ($item) {
         return $item[0];
     }
 
     return null;
 }
 
-function wpinv_get_all_items( $args = array() ) {
+function wpinv_get_all_items($args = array()) {
 
-    $args = wp_parse_args( $args, array(
-        'status'         => array( 'publish' ),
-        'limit'          => get_option( 'posts_per_page' ),
+    $args = wp_parse_args($args, array(
+        'status'         => array('publish'),
+        'limit'          => get_option('posts_per_page'),
         'page'           => 1,
         'exclude'        => array(),
         'orderby'        => 'date',
@@ -113,7 +113,7 @@ 
         'meta_query'     => array(),
         'return'         => 'objects',
         'paginate'       => false,
-    ) );
+    ));
 
     $wp_query_args = array(
         'post_type'      => 'wpi_item',
@@ -123,26 +123,26 @@ 
         'fields'         => 'ids',
         'orderby'        => $args['orderby'],
         'order'          => $args['order'],
-        'paged'          => absint( $args['page'] ),
+        'paged'          => absint($args['page']),
     );
 
-    if ( ! empty( $args['exclude'] ) ) {
-        $wp_query_args['post__not_in'] = array_map( 'absint', $args['exclude'] );
+    if (!empty($args['exclude'])) {
+        $wp_query_args['post__not_in'] = array_map('absint', $args['exclude']);
     }
 
-    if ( ! $args['paginate' ] ) {
+    if (!$args['paginate']) {
         $wp_query_args['no_found_rows'] = true;
     }
 
-    if ( ! empty( $args['search'] ) ) {
+    if (!empty($args['search'])) {
         $wp_query_args['s'] = $args['search'];
     }
 
-    if ( ! empty( $args['type'] ) && $args['type'] !== wpinv_item_types() ) {
-        $types = wpinv_parse_list( $args['type'] );
+    if (!empty($args['type']) && $args['type'] !== wpinv_item_types()) {
+        $types = wpinv_parse_list($args['type']);
         $wp_query_args['meta_query'][] = array(
             'key'     => '_wpinv_type',
-            'value'   => implode( ',', $types ),
+            'value'   => implode(',', $types),
             'compare' => 'IN',
         );
     }
@@ -150,17 +150,17 @@ 
     $wp_query_args = apply_filters('wpinv_get_items_args', $wp_query_args, $args);
 
     // Get results.
-    $items = new WP_Query( $wp_query_args );
+    $items = new WP_Query($wp_query_args);
 
-    if ( 'objects' === $args['return'] ) {
-        $return = array_map( 'wpinv_get_item_by_id', $items->posts );
-    } elseif ( 'self' === $args['return'] ) {
+    if ('objects' === $args['return']) {
+        $return = array_map('wpinv_get_item_by_id', $items->posts);
+    } elseif ('self' === $args['return']) {
         return $items;
     } else {
         $return = $items->posts;
     }
 
-    if ( $args['paginate' ] ) {
+    if ($args['paginate']) {
         return (object) array(
             'items'      => $return,
             'total'         => $items->found_posts,
@@ -172,143 +172,143 @@ 
 
 }
 
-function wpinv_is_free_item( $item_id = 0 ) {
-    if( empty( $item_id ) ) {
+function wpinv_is_free_item($item_id = 0) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
     
     return $item->is_free();
 }
 
-function wpinv_item_is_editable( $item = 0 ) {
-    if ( !empty( $item ) && is_a( $item, 'WP_Post' ) ) {
+function wpinv_item_is_editable($item = 0) {
+    if (!empty($item) && is_a($item, 'WP_Post')) {
         $item = $item->ID;
     }
         
-    if ( empty( $item ) ) {
+    if (empty($item)) {
         return true;
     }
 
-    $item = new WPInv_Item( $item );
+    $item = new WPInv_Item($item);
     
     return (bool) $item->is_editable();
 }
 
-function wpinv_get_item_price( $item_id = 0 ) {
-    if( empty( $item_id ) ) {
+function wpinv_get_item_price($item_id = 0) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
     
     return $item->get_price();
 }
 
-function wpinv_is_recurring_item( $item_id = 0 ) {
-    if( empty( $item_id ) ) {
+function wpinv_is_recurring_item($item_id = 0) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
     
     return $item->is_recurring();
 }
 
-function wpinv_item_price( $item_id = 0 ) {
-    if( empty( $item_id ) ) {
+function wpinv_item_price($item_id = 0) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $price = wpinv_get_item_price( $item_id );
-    $price = wpinv_price( wpinv_format_amount( $price ) );
+    $price = wpinv_get_item_price($item_id);
+    $price = wpinv_price(wpinv_format_amount($price));
     
-    return apply_filters( 'wpinv_item_price', $price, $item_id );
+    return apply_filters('wpinv_item_price', $price, $item_id);
 }
 
-function wpinv_item_show_price( $item_id = 0, $echo = true ) {
-    if ( empty( $item_id ) ) {
+function wpinv_item_show_price($item_id = 0, $echo = true) {
+    if (empty($item_id)) {
         $item_id = get_the_ID();
     }
 
-    $price = wpinv_item_price( $item_id );
+    $price = wpinv_item_price($item_id);
 
-    $price           = apply_filters( 'wpinv_item_price', wpinv_sanitize_amount( $price ), $item_id );
+    $price           = apply_filters('wpinv_item_price', wpinv_sanitize_amount($price), $item_id);
     $formatted_price = '<span class="wpinv_price" id="wpinv_item_' . $item_id . '">' . $price . '</span>';
-    $formatted_price = apply_filters( 'wpinv_item_price_after_html', $formatted_price, $item_id, $price );
+    $formatted_price = apply_filters('wpinv_item_price_after_html', $formatted_price, $item_id, $price);
 
-    if ( $echo ) {
+    if ($echo) {
         echo $formatted_price;
     } else {
         return $formatted_price;
     }
 }
 
-function wpinv_get_item_final_price( $item_id = 0, $amount_override = null ) {
-    if ( is_null( $amount_override ) ) {
-        $original_price = get_post_meta( $item_id, '_wpinv_price', true );
+function wpinv_get_item_final_price($item_id = 0, $amount_override = null) {
+    if (is_null($amount_override)) {
+        $original_price = get_post_meta($item_id, '_wpinv_price', true);
     } else {
         $original_price = $amount_override;
     }
     
     $price = $original_price;
 
-    return apply_filters( 'wpinv_get_item_final_price', $price, $item_id );
+    return apply_filters('wpinv_get_item_final_price', $price, $item_id);
 }
 
-function wpinv_item_custom_singular_name( $item_id ) {
-    if( empty( $item_id ) ) {
+function wpinv_item_custom_singular_name($item_id) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
     
     return $item->get_custom_singular_name();
 }
 
 function wpinv_get_item_types() {
     $item_types = array(
-            'custom'    => __( 'Standard', 'invoicing' ),
-            'fee'       => __( 'Fee', 'invoicing' ),
+            'custom'    => __('Standard', 'invoicing'),
+            'fee'       => __('Fee', 'invoicing'),
         );
-    return apply_filters( 'wpinv_get_item_types', $item_types );
+    return apply_filters('wpinv_get_item_types', $item_types);
 }
 
 function wpinv_item_types() {
     $item_types = wpinv_get_item_types();
     
-    return ( !empty( $item_types ) ? array_keys( $item_types ) : array() );
+    return (!empty($item_types) ? array_keys($item_types) : array());
 }
 
-function wpinv_get_item_type( $item_id ) {
-    if( empty( $item_id ) ) {
+function wpinv_get_item_type($item_id) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
     
     return $item->get_type();
 }
 
-function wpinv_item_type( $item_id ) {
+function wpinv_item_type($item_id) {
     $item_types = wpinv_get_item_types();
     
-    $item_type = wpinv_get_item_type( $item_id );
+    $item_type = wpinv_get_item_type($item_id);
     
-    if ( empty( $item_type ) ) {
+    if (empty($item_type)) {
         $item_type = '-';
     }
     
-    $item_type = isset( $item_types[$item_type] ) ? $item_types[$item_type] : __( $item_type, 'invoicing' );
+    $item_type = isset($item_types[$item_type]) ? $item_types[$item_type] : __($item_type, 'invoicing');
 
-    return apply_filters( 'wpinv_item_type', $item_type, $item_id );
+    return apply_filters('wpinv_item_type', $item_type, $item_id);
 }
 
-function wpinv_record_item_in_log( $item_id = 0, $file_id, $user_info, $ip, $invoice_id ) {
+function wpinv_record_item_in_log($item_id = 0, $file_id, $user_info, $ip, $invoice_id) {
     global $wpinv_logs;
     
-    if ( empty( $wpinv_logs ) ) {
+    if (empty($wpinv_logs)) {
         return false;
     }
 
@@ -317,278 +317,278 @@ 
         'log_type'		=> 'wpi_item'
     );
 
-    $user_id = isset( $user_info['user_id'] ) ? $user_info['user_id'] : (int) -1;
+    $user_id = isset($user_info['user_id']) ? $user_info['user_id'] : (int) -1;
 
     $log_meta = array(
         'user_info'	=> $user_info,
         'user_id'	=> $user_id,
-        'file_id'	=> (int)$file_id,
+        'file_id'	=> (int) $file_id,
         'ip'		=> $ip,
         'invoice_id'=> $invoice_id,
     );
 
-    $wpinv_logs->insert_log( $log_data, $log_meta );
+    $wpinv_logs->insert_log($log_data, $log_meta);
 }
 
-function wpinv_remove_item_logs_on_delete( $item_id = 0 ) {
-    if ( 'wpi_item' !== get_post_type( $item_id ) )
+function wpinv_remove_item_logs_on_delete($item_id = 0) {
+    if ('wpi_item' !== get_post_type($item_id))
         return;
 
     global $wpinv_logs;
     
-    if ( empty( $wpinv_logs ) ) {
+    if (empty($wpinv_logs)) {
         return false;
     }
 
     // Remove all log entries related to this item
-    $wpinv_logs->delete_logs( $item_id );
+    $wpinv_logs->delete_logs($item_id);
 }
-add_action( 'delete_post', 'wpinv_remove_item_logs_on_delete' );
+add_action('delete_post', 'wpinv_remove_item_logs_on_delete');
 
-function wpinv_get_random_item( $post_ids = true ) {
-    wpinv_get_random_items( 1, $post_ids );
+function wpinv_get_random_item($post_ids = true) {
+    wpinv_get_random_items(1, $post_ids);
 }
 
-function wpinv_get_random_items( $num = 3, $post_ids = true ) {
-    if ( $post_ids ) {
-        $args = array( 'post_type' => 'wpi_item', 'orderby' => 'rand', 'post_count' => $num, 'fields' => 'ids' );
+function wpinv_get_random_items($num = 3, $post_ids = true) {
+    if ($post_ids) {
+        $args = array('post_type' => 'wpi_item', 'orderby' => 'rand', 'post_count' => $num, 'fields' => 'ids');
     } else {
-        $args = array( 'post_type' => 'wpi_item', 'orderby' => 'rand', 'post_count' => $num );
+        $args = array('post_type' => 'wpi_item', 'orderby' => 'rand', 'post_count' => $num);
     }
     
-    $args  = apply_filters( 'wpinv_get_random_items', $args );
+    $args = apply_filters('wpinv_get_random_items', $args);
     
-    return get_posts( $args );
+    return get_posts($args);
 }
 
-function wpinv_get_item_token( $url = '' ) {
+function wpinv_get_item_token($url = '') {
     $args    = array();
-    $hash    = apply_filters( 'wpinv_get_url_token_algorithm', 'sha256' );
-    $secret  = apply_filters( 'wpinv_get_url_token_secret', hash( $hash, wp_salt() ) );
+    $hash    = apply_filters('wpinv_get_url_token_algorithm', 'sha256');
+    $secret  = apply_filters('wpinv_get_url_token_secret', hash($hash, wp_salt()));
 
-    $parts   = parse_url( $url );
+    $parts   = parse_url($url);
     $options = array();
 
-    if ( isset( $parts['query'] ) ) {
-        wp_parse_str( $parts['query'], $query_args );
+    if (isset($parts['query'])) {
+        wp_parse_str($parts['query'], $query_args);
 
-        if ( ! empty( $query_args['o'] ) ) {
-            $options = explode( ':', rawurldecode( $query_args['o'] ) );
+        if (!empty($query_args['o'])) {
+            $options = explode(':', rawurldecode($query_args['o']));
 
-            if ( in_array( 'ip', $options ) ) {
+            if (in_array('ip', $options)) {
                 $args['ip'] = wpinv_get_ip();
             }
 
-            if ( in_array( 'ua', $options ) ) {
+            if (in_array('ua', $options)) {
                 $ua = wpinv_get_user_agent();
-                $args['user_agent'] = rawurlencode( $ua );
+                $args['user_agent'] = rawurlencode($ua);
             }
         }
     }
 
-    $args = apply_filters( 'wpinv_get_url_token_args', $args, $url, $options );
+    $args = apply_filters('wpinv_get_url_token_args', $args, $url, $options);
 
     $args['secret'] = $secret;
     $args['token']  = false;
 
-    $url   = add_query_arg( $args, $url );
-    $parts = parse_url( $url );
+    $url   = add_query_arg($args, $url);
+    $parts = parse_url($url);
 
-    if ( ! isset( $parts['path'] ) ) {
+    if (!isset($parts['path'])) {
         $parts['path'] = '';
     }
 
-    $token = md5( $parts['path'] . '?' . $parts['query'] );
+    $token = md5($parts['path'] . '?' . $parts['query']);
 
     return $token;
 }
 
-function wpinv_validate_url_token( $url = '' ) {
+function wpinv_validate_url_token($url = '') {
     $ret   = false;
-    $parts = parse_url( $url );
+    $parts = parse_url($url);
 
-    if ( isset( $parts['query'] ) ) {
-        wp_parse_str( $parts['query'], $query_args );
+    if (isset($parts['query'])) {
+        wp_parse_str($parts['query'], $query_args);
 
-        $allowed = apply_filters( 'wpinv_url_token_allowed_params', array(
+        $allowed = apply_filters('wpinv_url_token_allowed_params', array(
             'item',
             'ttl',
             'token'
-        ) );
+        ));
 
         $remove = array();
 
-        foreach( $query_args as $key => $value ) {
-            if( false === in_array( $key, $allowed ) ) {
+        foreach ($query_args as $key => $value) {
+            if (false === in_array($key, $allowed)) {
                 $remove[] = $key;
             }
         }
 
-        if( ! empty( $remove ) ) {
-            $url = remove_query_arg( $remove, $url );
+        if (!empty($remove)) {
+            $url = remove_query_arg($remove, $url);
         }
 
-        if ( isset( $query_args['ttl'] ) && current_time( 'timestamp' ) > $query_args['ttl'] ) {
-            wp_die( apply_filters( 'wpinv_item_link_expired_text', __( 'Sorry but your item link has expired.', 'invoicing' ) ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+        if (isset($query_args['ttl']) && current_time('timestamp') > $query_args['ttl']) {
+            wp_die(apply_filters('wpinv_item_link_expired_text', __('Sorry but your item link has expired.', 'invoicing')), __('Error', 'invoicing'), array('response' => 403));
         }
 
-        if ( isset( $query_args['token'] ) && $query_args['token'] == wpinv_get_item_token( $url ) ) {
+        if (isset($query_args['token']) && $query_args['token'] == wpinv_get_item_token($url)) {
             $ret = true;
         }
 
     }
 
-    return apply_filters( 'wpinv_validate_url_token', $ret, $url, $query_args );
+    return apply_filters('wpinv_validate_url_token', $ret, $url, $query_args);
 }
 
-function wpinv_item_in_cart( $item_id = 0, $options = array() ) {
+function wpinv_item_in_cart($item_id = 0, $options = array()) {
     $cart_items = wpinv_get_cart_contents();
 
     $ret = false;
 
-    if ( is_array( $cart_items ) ) {
-        foreach ( $cart_items as $item ) {
-            if ( $item['id'] == $item_id ) {
+    if (is_array($cart_items)) {
+        foreach ($cart_items as $item) {
+            if ($item['id'] == $item_id) {
                 $ret = true;
                 break;
             }
         }
     }
 
-    return (bool) apply_filters( 'wpinv_item_in_cart', $ret, $item_id, $options );
+    return (bool) apply_filters('wpinv_item_in_cart', $ret, $item_id, $options);
 }
 
-function wpinv_get_cart_item_tax( $item_id = 0, $subtotal = '', $options = array() ) {
+function wpinv_get_cart_item_tax($item_id = 0, $subtotal = '', $options = array()) {
     $tax = 0;
-    if ( ! wpinv_item_is_tax_exclusive( $item_id ) ) {
-        $country = !empty( $_POST['country'] ) ? $_POST['country'] : false;
-        $state   = isset( $_POST['state'] ) ? $_POST['state'] : '';
+    if (!wpinv_item_is_tax_exclusive($item_id)) {
+        $country = !empty($_POST['country']) ? $_POST['country'] : false;
+        $state   = isset($_POST['state']) ? $_POST['state'] : '';
 
-        $tax = wpinv_calculate_tax( $subtotal, $country, $state, $item_id );
+        $tax = wpinv_calculate_tax($subtotal, $country, $state, $item_id);
     }
 
-    return apply_filters( 'wpinv_get_cart_item_tax', $tax, $item_id, $subtotal, $options );
+    return apply_filters('wpinv_get_cart_item_tax', $tax, $item_id, $subtotal, $options);
 }
 
-function wpinv_cart_item_price( $item, $currency = '' ) {
+function wpinv_cart_item_price($item, $currency = '') {
 
-    if( empty( $currency ) ) {
+    if (empty($currency)) {
         $currency = wpinv_get_currency();
     }
 
-    $item_id    = isset( $item['id'] ) ? $item['id'] : 0;
-    $price      = isset( $item['item_price'] ) ? wpinv_round_amount( $item['item_price'] ) : 0;
-    $tax        = wpinv_price( wpinv_format_amount( $item['tax'] ) );
+    $item_id    = isset($item['id']) ? $item['id'] : 0;
+    $price      = isset($item['item_price']) ? wpinv_round_amount($item['item_price']) : 0;
+    $tax        = wpinv_price(wpinv_format_amount($item['tax']));
     
-    if ( !wpinv_is_free_item( $item_id ) && !wpinv_item_is_tax_exclusive( $item_id ) ) {
-        if ( wpinv_prices_show_tax_on_checkout() && !wpinv_prices_include_tax() ) {
+    if (!wpinv_is_free_item($item_id) && !wpinv_item_is_tax_exclusive($item_id)) {
+        if (wpinv_prices_show_tax_on_checkout() && !wpinv_prices_include_tax()) {
             $price += $tax;
         }
         
-        if( !wpinv_prices_show_tax_on_checkout() && wpinv_prices_include_tax() ) {
+        if (!wpinv_prices_show_tax_on_checkout() && wpinv_prices_include_tax()) {
             $price -= $tax;
         }        
     }
 
-    $price = wpinv_price( wpinv_format_amount( $price ), $currency );
+    $price = wpinv_price(wpinv_format_amount($price), $currency);
 
-    return apply_filters( 'wpinv_cart_item_price_label', $price, $item );
+    return apply_filters('wpinv_cart_item_price_label', $price, $item);
 }
 
-function wpinv_cart_item_subtotal( $item, $currency = '' ) {
+function wpinv_cart_item_subtotal($item, $currency = '') {
 
-    if( empty( $currency ) ) {
+    if (empty($currency)) {
         $currency = wpinv_get_currency();
     }
 
-    $subtotal   = isset( $item['subtotal'] ) ? $item['subtotal'] : 0;
-    $subtotal   = wpinv_price( wpinv_format_amount( $subtotal ), $currency );
+    $subtotal   = isset($item['subtotal']) ? $item['subtotal'] : 0;
+    $subtotal   = wpinv_price(wpinv_format_amount($subtotal), $currency);
 
-    return apply_filters( 'wpinv_cart_item_subtotal_label', $subtotal, $item );
+    return apply_filters('wpinv_cart_item_subtotal_label', $subtotal, $item);
 }
 
-function wpinv_cart_item_tax( $item, $currency = '' ) {
+function wpinv_cart_item_tax($item, $currency = '') {
     $tax        = '';
     $tax_rate   = '';
 
-    if( empty( $currency ) ) {
+    if (empty($currency)) {
         $currency = wpinv_get_currency();
     }
     
-    if ( isset( $item['tax'] ) && $item['tax'] > 0 && $item['subtotal'] > 0 ) {
-        $tax      = wpinv_price( wpinv_format_amount( $item['tax'] ), $currency );
-        $tax_rate = !empty( $item['vat_rate'] ) ? $item['vat_rate'] : ( $item['tax'] / $item['subtotal'] ) * 100;
-        $tax_rate = $tax_rate > 0 ? (float)wpinv_round_amount( $tax_rate, 4 ) : '';
+    if (isset($item['tax']) && $item['tax'] > 0 && $item['subtotal'] > 0) {
+        $tax      = wpinv_price(wpinv_format_amount($item['tax']), $currency);
+        $tax_rate = !empty($item['vat_rate']) ? $item['vat_rate'] : ($item['tax'] / $item['subtotal']) * 100;
+        $tax_rate = $tax_rate > 0 ? (float) wpinv_round_amount($tax_rate, 4) : '';
         $tax_rate = $tax_rate != '' ? ' <small class="tax-rate normal small">(' . $tax_rate . '%)</small>' : '';
     }
     
-    $tax        = $tax . $tax_rate;
+    $tax = $tax . $tax_rate;
     
-    if ( $tax === '' ) {
+    if ($tax === '') {
         $tax = 0; // Zero tax
     }
 
-    return apply_filters( 'wpinv_cart_item_tax_label', $tax, $item );
+    return apply_filters('wpinv_cart_item_tax_label', $tax, $item);
 }
 
-function wpinv_get_cart_item_price( $item_id = 0, $cart_item = array(), $options = array(), $remove_tax_from_inclusive = false ) {
+function wpinv_get_cart_item_price($item_id = 0, $cart_item = array(), $options = array(), $remove_tax_from_inclusive = false) {
     $price = 0;
     
     // Set custom price
-    if ( isset( $cart_item['custom_price'] ) && $cart_item['custom_price'] !== '' ) {
+    if (isset($cart_item['custom_price']) && $cart_item['custom_price'] !== '') {
         $price = $cart_item['custom_price'];
     } else {
-        $variable_prices = wpinv_has_variable_prices( $item_id );
+        $variable_prices = wpinv_has_variable_prices($item_id);
 
-        if ( $variable_prices ) {
-            $prices = wpinv_get_variable_prices( $item_id );
+        if ($variable_prices) {
+            $prices = wpinv_get_variable_prices($item_id);
 
-            if ( $prices ) {
-                if( ! empty( $options ) ) {
-                    $price = isset( $prices[ $options['price_id'] ] ) ? $prices[ $options['price_id'] ]['amount'] : false;
+            if ($prices) {
+                if (!empty($options)) {
+                    $price = isset($prices[$options['price_id']]) ? $prices[$options['price_id']]['amount'] : false;
                 } else {
                     $price = false;
                 }
             }
         }
 
-        if( ! $variable_prices || false === $price ) {
-            if($cart_item['item_price'] > 0){
+        if (!$variable_prices || false === $price) {
+            if ($cart_item['item_price'] > 0) {
                 $price = $cart_item['item_price'];
             } else {
                 // Get the standard Item price if not using variable prices
-                $price = wpinv_get_item_price( $item_id );
+                $price = wpinv_get_item_price($item_id);
             }
         }
     }
 
-    if ( $remove_tax_from_inclusive && wpinv_prices_include_tax() ) {
-        $price -= wpinv_get_cart_item_tax( $item_id, $price, $options );
+    if ($remove_tax_from_inclusive && wpinv_prices_include_tax()) {
+        $price -= wpinv_get_cart_item_tax($item_id, $price, $options);
     }
 
-    return apply_filters( 'wpinv_cart_item_price', $price, $item_id, $cart_item, $options, $remove_tax_from_inclusive );
+    return apply_filters('wpinv_cart_item_price', $price, $item_id, $cart_item, $options, $remove_tax_from_inclusive);
 }
 
-function wpinv_get_cart_item_price_id( $item = array() ) {
-    if( isset( $item['item_number'] ) ) {
-        $price_id = isset( $item['item_number']['options']['price_id'] ) ? $item['item_number']['options']['price_id'] : null;
+function wpinv_get_cart_item_price_id($item = array()) {
+    if (isset($item['item_number'])) {
+        $price_id = isset($item['item_number']['options']['price_id']) ? $item['item_number']['options']['price_id'] : null;
     } else {
-        $price_id = isset( $item['options']['price_id'] ) ? $item['options']['price_id'] : null;
+        $price_id = isset($item['options']['price_id']) ? $item['options']['price_id'] : null;
     }
     return $price_id;
 }
 
-function wpinv_get_cart_item_price_name( $item = array() ) {
-    $price_id = (int)wpinv_get_cart_item_price_id( $item );
-    $prices   = wpinv_get_variable_prices( $item['id'] );
-    $name     = ! empty( $prices[ $price_id ] ) ? $prices[ $price_id ]['name'] : '';
-    return apply_filters( 'wpinv_get_cart_item_price_name', $name, $item['id'], $price_id, $item );
+function wpinv_get_cart_item_price_name($item = array()) {
+    $price_id = (int) wpinv_get_cart_item_price_id($item);
+    $prices   = wpinv_get_variable_prices($item['id']);
+    $name     = !empty($prices[$price_id]) ? $prices[$price_id]['name'] : '';
+    return apply_filters('wpinv_get_cart_item_price_name', $name, $item['id'], $price_id, $item);
 }
 
-function wpinv_get_cart_item_name( $item = array() ) {
-    $item_title = !empty( $item['name'] ) ? $item['name'] : get_the_title( $item['id'] );
+function wpinv_get_cart_item_name($item = array()) {
+    $item_title = !empty($item['name']) ? $item['name'] : get_the_title($item['id']);
 
-    if ( empty( $item_title ) ) {
+    if (empty($item_title)) {
         $item_title = $item['id'];
     }
 
@@ -598,23 +598,23 @@ 
     }
     */
 
-    return apply_filters( 'wpinv_get_cart_item_name', $item_title, $item['id'], $item );
+    return apply_filters('wpinv_get_cart_item_name', $item_title, $item['id'], $item);
 }
 
-function wpinv_has_variable_prices( $item_id = 0 ) {
+function wpinv_has_variable_prices($item_id = 0) {
     return false;
 }
 
-function wpinv_get_item_position_in_cart( $item_id = 0, $options = array() ) {
+function wpinv_get_item_position_in_cart($item_id = 0, $options = array()) {
     $cart_items = wpinv_get_cart_contents();
 
-    if ( !is_array( $cart_items ) ) {
+    if (!is_array($cart_items)) {
         return false; // Empty cart
     } else {
-        foreach ( $cart_items as $position => $item ) {
-            if ( $item['id'] == $item_id ) {
-                if ( isset( $options['price_id'] ) && isset( $item['options']['price_id'] ) ) {
-                    if ( (int) $options['price_id'] == (int) $item['options']['price_id'] ) {
+        foreach ($cart_items as $position => $item) {
+            if ($item['id'] == $item_id) {
+                if (isset($options['price_id']) && isset($item['options']['price_id'])) {
+                    if ((int) $options['price_id'] == (int) $item['options']['price_id']) {
                         return $position;
                     }
                 } else {
@@ -627,80 +627,80 @@ 
     return false; // Not found
 }
 
-function wpinv_get_cart_item_quantity( $item ) {
-    if ( wpinv_item_quantities_enabled() ) {
-        $quantity = !empty( $item['quantity'] ) && (int)$item['quantity'] > 0 ? absint( $item['quantity'] ) : 1;
+function wpinv_get_cart_item_quantity($item) {
+    if (wpinv_item_quantities_enabled()) {
+        $quantity = !empty($item['quantity']) && (int) $item['quantity'] > 0 ? absint($item['quantity']) : 1;
     } else {
         $quantity = 1;
     }
     
-    if ( $quantity < 1 ) {
+    if ($quantity < 1) {
         $quantity = 1;
     }
     
-    return apply_filters( 'wpinv_get_cart_item_quantity', $quantity, $item );
+    return apply_filters('wpinv_get_cart_item_quantity', $quantity, $item);
 }
 
-function wpinv_get_item_suffix( $item, $html = true ) {
-    if ( empty( $item ) ) {
+function wpinv_get_item_suffix($item, $html = true) {
+    if (empty($item)) {
         return NULL;
     }
     
-    if ( is_int( $item ) ) {
-        $item = new WPInv_Item( $item );
+    if (is_int($item)) {
+        $item = new WPInv_Item($item);
     }
     
-    if ( !( is_object( $item ) && is_a( $item, 'WPInv_Item' ) ) ) {
+    if (!(is_object($item) && is_a($item, 'WPInv_Item'))) {
         return NULL;
     }
     
-    $suffix = $item->is_recurring() ? ' <span class="wpi-suffix">' . __( '(r)', 'invoicing' ) . '</span>' : '';
+    $suffix = $item->is_recurring() ? ' <span class="wpi-suffix">' . __('(r)', 'invoicing') . '</span>' : '';
     
-    if ( !$html && $suffix ) {
-        $suffix = strip_tags( $suffix );
+    if (!$html && $suffix) {
+        $suffix = strip_tags($suffix);
     }
     
-    return apply_filters( 'wpinv_get_item_suffix', $suffix, $item, $html );
+    return apply_filters('wpinv_get_item_suffix', $suffix, $item, $html);
 }
 
-function wpinv_remove_item( $item = 0, $force_delete = false ) {
-    if ( empty( $item ) ) {
+function wpinv_remove_item($item = 0, $force_delete = false) {
+    if (empty($item)) {
         return NULL;
     }
     
-    if ( is_int( $item ) ) {
-        $item = new WPInv_Item( $item );
+    if (is_int($item)) {
+        $item = new WPInv_Item($item);
     }
     
-    if ( !( is_object( $item ) && is_a( $item, 'WPInv_Item' ) ) ) {
+    if (!(is_object($item) && is_a($item, 'WPInv_Item'))) {
         return NULL;
     }
     
-    do_action( 'wpinv_pre_delete_item', $item );
+    do_action('wpinv_pre_delete_item', $item);
 
-    wp_delete_post( $item->ID, $force_delete );
+    wp_delete_post($item->ID, $force_delete);
 
-    do_action( 'wpinv_post_delete_item', $item );
+    do_action('wpinv_post_delete_item', $item);
 }
 
-function wpinv_can_delete_item( $post_id ) {
+function wpinv_can_delete_item($post_id) {
     $return = wpinv_current_user_can_manage_invoicing() ? true : false;
     
-    if ( $return && wpinv_item_in_use( $post_id ) ) {
+    if ($return && wpinv_item_in_use($post_id)) {
         $return = false; // Don't delete item already use in invoices.
     }
     
-    return apply_filters( 'wpinv_can_delete_item', $return, $post_id );
+    return apply_filters('wpinv_can_delete_item', $return, $post_id);
 }
 
 function wpinv_admin_action_delete() {
     $screen = get_current_screen();
     
-    if ( !empty( $screen->post_type ) && $screen->post_type == 'wpi_item' && !empty( $_REQUEST['post'] ) && is_array( $_REQUEST['post'] ) ) {
+    if (!empty($screen->post_type) && $screen->post_type == 'wpi_item' && !empty($_REQUEST['post']) && is_array($_REQUEST['post'])) {
         $post_ids = array();
         
-        foreach ( $_REQUEST['post'] as $post_id ) {
-            if ( !wpinv_can_delete_item( $post_id ) ) {
+        foreach ($_REQUEST['post'] as $post_id) {
+            if (!wpinv_can_delete_item($post_id)) {
                 continue;
             }
             
@@ -710,88 +710,88 @@ 
         $_REQUEST['post'] = $post_ids;
     }
 }
-add_action( 'admin_action_trash', 'wpinv_admin_action_delete', -10 );
-add_action( 'admin_action_delete', 'wpinv_admin_action_delete', -10 );
+add_action('admin_action_trash', 'wpinv_admin_action_delete', -10);
+add_action('admin_action_delete', 'wpinv_admin_action_delete', -10);
 
-function wpinv_check_delete_item( $check, $post, $force_delete ) {
-    if ( $post->post_type == 'wpi_item' ) {
-        if ( $force_delete && !wpinv_can_delete_item( $post->ID ) ) {
+function wpinv_check_delete_item($check, $post, $force_delete) {
+    if ($post->post_type == 'wpi_item') {
+        if ($force_delete && !wpinv_can_delete_item($post->ID)) {
             return true;
         }
     }
     
     return $check;
 }
-add_filter( 'pre_delete_post', 'wpinv_check_delete_item', 10, 3 );
+add_filter('pre_delete_post', 'wpinv_check_delete_item', 10, 3);
 
-function wpinv_item_in_use( $item_id ) {
+function wpinv_item_in_use($item_id) {
     global $wpdb, $wpi_items_in_use;
     
-    if ( !$item_id > 0 ) {
+    if (!$item_id > 0) {
         return false;
     }
     
-    if ( !empty( $wpi_items_in_use ) ) {
-        if ( isset( $wpi_items_in_use[$item_id] ) ) {
+    if (!empty($wpi_items_in_use)) {
+        if (isset($wpi_items_in_use[$item_id])) {
             return $wpi_items_in_use[$item_id];
         }
     } else {
         $wpi_items_in_use = array();
     }
     
-    $statuses   = array_keys( wpinv_get_invoice_statuses( true, true ) );
+    $statuses = array_keys(wpinv_get_invoice_statuses(true, true));
     
-    $query  = "SELECT p.ID FROM " . $wpdb->posts . " AS p INNER JOIN " . $wpdb->postmeta . " AS pm ON p.ID = pm.post_id WHERE p.post_type = 'wpi_invoice' AND p.post_status IN( '" . implode( "','", $statuses ) . "' ) AND pm.meta_key = '_wpinv_item_ids' AND FIND_IN_SET( '" . (int)$item_id . "', pm.meta_value )";
-    $in_use = $wpdb->get_var( $query ) > 0 ? true : false;
+    $query  = "SELECT p.ID FROM " . $wpdb->posts . " AS p INNER JOIN " . $wpdb->postmeta . " AS pm ON p.ID = pm.post_id WHERE p.post_type = 'wpi_invoice' AND p.post_status IN( '" . implode("','", $statuses) . "' ) AND pm.meta_key = '_wpinv_item_ids' AND FIND_IN_SET( '" . (int) $item_id . "', pm.meta_value )";
+    $in_use = $wpdb->get_var($query) > 0 ? true : false;
     
     $wpi_items_in_use[$item_id] = $in_use;
     
     return $in_use;
 }
 
-function wpinv_create_item( $args = array(), $wp_error = false, $force_update = false ) {
+function wpinv_create_item($args = array(), $wp_error = false, $force_update = false) {
     // Set some defaults
     $defaults = array(
-        'type'                 => 'custom',                                                // Optional. Item type. Default 'custom'.
-        'title'                => '',                                                      // Required. Item title.
-        'custom_id'            => 0,                                                       // Optional. Any integer or non numeric id. Must be unique within item type.
-        'price'                => '0.00',                                                  // Optional. Item price. Default '0.00'.
-        'status'               => 'pending',                                               // Optional. pending, publish
-        'custom_name'          => '',                                                      // Optional. Plural sub title for item.
-        'custom_singular_name' => '',                                                      // Optional. Singular sub title for item.
-        'vat_rule'             => 'digital',                                               // Optional. digital => Digital item, physical => Physical item
-        'editable'             => true,                                                    // Optional. Item editable from Items list page? Default true.
-        'excerpt'              => '',                                                      // Optional. Item short description
+        'type'                 => 'custom', // Optional. Item type. Default 'custom'.
+        'title'                => '', // Required. Item title.
+        'custom_id'            => 0, // Optional. Any integer or non numeric id. Must be unique within item type.
+        'price'                => '0.00', // Optional. Item price. Default '0.00'.
+        'status'               => 'pending', // Optional. pending, publish
+        'custom_name'          => '', // Optional. Plural sub title for item.
+        'custom_singular_name' => '', // Optional. Singular sub title for item.
+        'vat_rule'             => 'digital', // Optional. digital => Digital item, physical => Physical item
+        'editable'             => true, // Optional. Item editable from Items list page? Default true.
+        'excerpt'              => '', // Optional. Item short description
         /* Recurring item fields */
-        'is_recurring'         => 0,                                                       // Optional. 1 => Allow recurring or 0 => Don't allow recurring
-        'recurring_period'     => 'M',                                                     // Optional. D => Daily, W => Weekly, M => Monthly, Y => Yearly
-        'recurring_interval'   => 0,                                                       // Optional. Integer value between 1 - 90.
-        'recurring_limit'      => 0,                                                       // Optional. Any integer number. 0 for recurring forever until cancelled.
-        'free_trial'           => 0,                                                       // Optional. 1 => Allow free trial or 0 => Don't free trial
-        'trial_period'         => 'M',                                                     // Optional. D => Daily, W => Weekly, M => Monthly, Y => Yearly
-        'trial_interval'       => 0,                                                       // Optional. Any integer number.
-        'minimum_price'        => '0.00',                                                  // Optional. Minimum allowed prices for items with dynamic pricing.
-        'dynamic_pricing'      => 0,                                                       // Optional. Whether or not the item supports dynamic prices.
+        'is_recurring'         => 0, // Optional. 1 => Allow recurring or 0 => Don't allow recurring
+        'recurring_period'     => 'M', // Optional. D => Daily, W => Weekly, M => Monthly, Y => Yearly
+        'recurring_interval'   => 0, // Optional. Integer value between 1 - 90.
+        'recurring_limit'      => 0, // Optional. Any integer number. 0 for recurring forever until cancelled.
+        'free_trial'           => 0, // Optional. 1 => Allow free trial or 0 => Don't free trial
+        'trial_period'         => 'M', // Optional. D => Daily, W => Weekly, M => Monthly, Y => Yearly
+        'trial_interval'       => 0, // Optional. Any integer number.
+        'minimum_price'        => '0.00', // Optional. Minimum allowed prices for items with dynamic pricing.
+        'dynamic_pricing'      => 0, // Optional. Whether or not the item supports dynamic prices.
     );
 
-    $data = wp_parse_args( $args, $defaults );
+    $data = wp_parse_args($args, $defaults);
 
-    if ( empty( $data['type'] ) ) {
+    if (empty($data['type'])) {
         $data['type'] = 'custom';
     }
 
-    if ( !empty( $data['custom_id'] ) ) {
-        $item = wpinv_get_item_by( 'custom_id', $data['custom_id'], $data['type'] );
+    if (!empty($data['custom_id'])) {
+        $item = wpinv_get_item_by('custom_id', $data['custom_id'], $data['type']);
     } else {
         $item = NULL;
     }
 
-    if ( !empty( $item ) ) {
-        if ( $force_update ) {
-            if ( empty( $args['ID'] ) ) {
+    if (!empty($item)) {
+        if ($force_update) {
+            if (empty($args['ID'])) {
                 $args['ID'] = $item->ID;
             }
-            return wpinv_update_item( $args, $wp_error );
+            return wpinv_update_item($args, $wp_error);
         }
 
         return $item;
@@ -802,21 +802,21 @@ 
     $meta['custom_id']              = $data['custom_id'];
     $meta['custom_singular_name']   = $data['custom_singular_name'];
     $meta['custom_name']            = $data['custom_name'];
-    $meta['price']                  = wpinv_round_amount( $data['price'] );
-    $meta['editable']               = (int)$data['editable'];
+    $meta['price']                  = wpinv_round_amount($data['price']);
+    $meta['editable']               = (int) $data['editable'];
     $meta['vat_rule']               = $data['vat_rule'];
     $meta['vat_class']              = '_standard';
     $meta['dynamic_pricing']        = (int) $data['dynamic_pricing'];
-    $meta['minimum_price']          = wpinv_round_amount( $data['minimum_price'] );
+    $meta['minimum_price']          = wpinv_round_amount($data['minimum_price']);
     
-    if ( !empty( $data['is_recurring'] ) ) {
+    if (!empty($data['is_recurring'])) {
         $meta['is_recurring']       = $data['is_recurring'];
         $meta['recurring_period']   = $data['recurring_period'];
-        $meta['recurring_interval'] = absint( $data['recurring_interval'] );
-        $meta['recurring_limit']    = absint( $data['recurring_limit'] );
+        $meta['recurring_interval'] = absint($data['recurring_interval']);
+        $meta['recurring_limit']    = absint($data['recurring_limit']);
         $meta['free_trial']         = $data['free_trial'];
         $meta['trial_period']       = $data['trial_period'];
-        $meta['trial_interval']     = absint( $data['trial_interval'] );
+        $meta['trial_interval']     = absint($data['trial_interval']);
     } else {
         $meta['is_recurring']       = 0;
         $meta['recurring_period']   = '';
@@ -827,7 +827,7 @@ 
         $meta['trial_interval']     = '';
     }
     
-    $post_data  = array( 
+    $post_data = array( 
         'post_title'    => $data['title'],
         'post_excerpt'  => $data['excerpt'],
         'post_status'   => $data['status'],
@@ -835,34 +835,34 @@ 
     );
 
     $item = new WPInv_Item();
-    $return = $item->create( $post_data, $wp_error );
+    $return = $item->create($post_data, $wp_error);
 
-    if ( $return && !empty( $item ) && !is_wp_error( $return ) ) {
+    if ($return && !empty($item) && !is_wp_error($return)) {
         return $item;
     }
 
-    if ( $wp_error && is_wp_error( $return ) ) {
+    if ($wp_error && is_wp_error($return)) {
         return $return;
     }
     return 0;
 }
 
-function wpinv_update_item( $args = array(), $wp_error = false ) {
-    $item = !empty( $args['ID'] ) ? new WPInv_Item( $args['ID'] ) : NULL;
+function wpinv_update_item($args = array(), $wp_error = false) {
+    $item = !empty($args['ID']) ? new WPInv_Item($args['ID']) : NULL;
 
-    if ( empty( $item ) || !( !empty( $item->post_type ) && $item->post_type == 'wpi_item' ) ) {
-        if ( $wp_error ) {
-            return new WP_Error( 'wpinv_invalid_item', __( 'Invalid item.', 'invoicing' ) );
+    if (empty($item) || !(!empty($item->post_type) && $item->post_type == 'wpi_item')) {
+        if ($wp_error) {
+            return new WP_Error('wpinv_invalid_item', __('Invalid item.', 'invoicing'));
         }
         return 0;
     }
     
-    if ( !empty( $args['custom_id'] ) ) {
-        $item_exists = wpinv_get_item_by( 'custom_id', $args['custom_id'], ( !empty( $args['type'] ) ? $args['type'] : $item->type ) );
+    if (!empty($args['custom_id'])) {
+        $item_exists = wpinv_get_item_by('custom_id', $args['custom_id'], (!empty($args['type']) ? $args['type'] : $item->type));
         
-        if ( !empty( $item_exists ) && $item_exists->ID != $args['ID'] ) {
-            if ( $wp_error ) {
-                return new WP_Error( 'wpinv_invalid_custom_id', __( 'Item with custom id already exists.', 'invoicing' ) );
+        if (!empty($item_exists) && $item_exists->ID != $args['ID']) {
+            if ($wp_error) {
+                return new WP_Error('wpinv_invalid_custom_id', __('Item with custom id already exists.', 'invoicing'));
             }
             return 0;
         }
@@ -889,54 +889,54 @@ 
     );
 
     $post_data = array();
-    if ( isset( $args['title'] ) ) { 
+    if (isset($args['title'])) { 
         $post_data['post_title'] = $args['title'];
     }
-    if ( isset( $args['excerpt'] ) ) { 
+    if (isset($args['excerpt'])) { 
         $post_data['post_excerpt'] = $args['excerpt'];
     }
-    if ( isset( $args['status'] ) ) { 
+    if (isset($args['status'])) { 
         $post_data['post_status'] = $args['status'];
     }
     
-    foreach ( $meta_fields as $meta_field ) {
-        if ( isset( $args[ $meta_field ] ) ) { 
-            $value = $args[ $meta_field ];
+    foreach ($meta_fields as $meta_field) {
+        if (isset($args[$meta_field])) { 
+            $value = $args[$meta_field];
 
-            switch ( $meta_field ) {
+            switch ($meta_field) {
                 case 'price':
                 case 'minimum_price':
-                    $value = wpinv_round_amount( $value );
+                    $value = wpinv_round_amount($value);
                 break;
                 case 'recurring_interval':
                 case 'recurring_limit':
                 case 'trial_interval':
-                    $value = absint( $value );
+                    $value = absint($value);
                 break;
 				case 'editable':
                     $value = (int) $value;
                 break;
             }
 
-            $post_data['meta'][ $meta_field ] = $value;
+            $post_data['meta'][$meta_field] = $value;
         };
     }
 
-    if ( empty( $post_data ) ) {
-        if ( $wp_error ) {
-            return new WP_Error( 'wpinv_invalid_item_data', __( 'Invalid item data.', 'invoicing' ) );
+    if (empty($post_data)) {
+        if ($wp_error) {
+            return new WP_Error('wpinv_invalid_item_data', __('Invalid item data.', 'invoicing'));
         }
         return 0;
     }
     $post_data['ID'] = $args['ID'];
 
-    $return = $item->update( $post_data, $wp_error );
+    $return = $item->update($post_data, $wp_error);
 
-    if ( $return && !empty( $item ) && !is_wp_error( $return ) ) {
+    if ($return && !empty($item) && !is_wp_error($return)) {
         return $item;
     }
 
-    if ( $wp_error && is_wp_error( $return ) ) {
+    if ($wp_error && is_wp_error($return)) {
         return $return;
     }
     return 0;

includes/libraries/action-scheduler/functions.php

Spacing +48 added lines, -48 removed lines

@@ -12,8 +12,8 @@ 
  * @param string $group The group to assign this job to.
  * @return string The action ID.
  */
-function as_enqueue_async_action( $hook, $args = array(), $group = '' ) {
-	return ActionScheduler::factory()->async( $hook, $args, $group );
+function as_enqueue_async_action($hook, $args = array(), $group = '') {
+	return ActionScheduler::factory()->async($hook, $args, $group);
 }
 
 /**
@@ -26,8 +26,8 @@ 
  *
  * @return string The job ID
  */
-function as_schedule_single_action( $timestamp, $hook, $args = array(), $group = '' ) {
-	return ActionScheduler::factory()->single( $hook, $args, $timestamp, $group );
+function as_schedule_single_action($timestamp, $hook, $args = array(), $group = '') {
+	return ActionScheduler::factory()->single($hook, $args, $timestamp, $group);
 }
 
 /**
@@ -41,8 +41,8 @@ 
  *
  * @return string The job ID
  */
-function as_schedule_recurring_action( $timestamp, $interval_in_seconds, $hook, $args = array(), $group = '' ) {
-	return ActionScheduler::factory()->recurring( $hook, $args, $timestamp, $interval_in_seconds, $group );
+function as_schedule_recurring_action($timestamp, $interval_in_seconds, $hook, $args = array(), $group = '') {
+	return ActionScheduler::factory()->recurring($hook, $args, $timestamp, $interval_in_seconds, $group);
 }
 
 /**
@@ -68,8 +68,8 @@ 
  *
  * @return string The job ID
  */
-function as_schedule_cron_action( $timestamp, $schedule, $hook, $args = array(), $group = '' ) {
-	return ActionScheduler::factory()->cron( $hook, $args, $timestamp, $schedule, $group );
+function as_schedule_cron_action($timestamp, $schedule, $hook, $args = array(), $group = '') {
+	return ActionScheduler::factory()->cron($hook, $args, $timestamp, $schedule, $group);
 }
 
 /**
@@ -88,18 +88,18 @@ 
  *
  * @return string The scheduled action ID if a scheduled action was found, or empty string if no matching action found.
  */
-function as_unschedule_action( $hook, $args = array(), $group = '' ) {
+function as_unschedule_action($hook, $args = array(), $group = '') {
 	$params = array();
-	if ( is_array($args) ) {
+	if (is_array($args)) {
 		$params['args'] = $args;
 	}
-	if ( !empty($group) ) {
+	if (!empty($group)) {
 		$params['group'] = $group;
 	}
-	$job_id = ActionScheduler::store()->find_action( $hook, $params );
+	$job_id = ActionScheduler::store()->find_action($hook, $params);
 
-	if ( ! empty( $job_id ) ) {
-		ActionScheduler::store()->cancel_action( $job_id );
+	if (!empty($job_id)) {
+		ActionScheduler::store()->cancel_action($job_id);
 	}
 
 	return $job_id;
@@ -112,20 +112,20 @@ 
  * @param array $args Args that would have been passed to the job
  * @param string $group
  */
-function as_unschedule_all_actions( $hook, $args = array(), $group = '' ) {
-	if ( empty( $args ) ) {
-		if ( ! empty( $hook ) && empty( $group ) ) {
-			ActionScheduler_Store::instance()->cancel_actions_by_hook( $hook );
+function as_unschedule_all_actions($hook, $args = array(), $group = '') {
+	if (empty($args)) {
+		if (!empty($hook) && empty($group)) {
+			ActionScheduler_Store::instance()->cancel_actions_by_hook($hook);
 			return;
 		}
-		if ( ! empty( $group ) && empty( $hook ) ) {
-			ActionScheduler_Store::instance()->cancel_actions_by_group( $group );
+		if (!empty($group) && empty($hook)) {
+			ActionScheduler_Store::instance()->cancel_actions_by_group($group);
 			return;
 		}
 	}
 	do {
-		$unscheduled_action = as_unschedule_action( $hook, $args, $group );
-	} while ( ! empty( $unscheduled_action ) );
+		$unscheduled_action = as_unschedule_action($hook, $args, $group);
+	} while (!empty($unscheduled_action));
 }
 
 /**
@@ -143,31 +143,31 @@ 
  *
  * @return int|bool The timestamp for the next occurrence of a pending scheduled action, true for an async or in-progress action or false if there is no matching action.
  */
-function as_next_scheduled_action( $hook, $args = NULL, $group = '' ) {
+function as_next_scheduled_action($hook, $args = NULL, $group = '') {
 	$params = array();
-	if ( is_array($args) ) {
+	if (is_array($args)) {
 		$params['args'] = $args;
 	}
-	if ( !empty($group) ) {
+	if (!empty($group)) {
 		$params['group'] = $group;
 	}
 
 	$params['status'] = ActionScheduler_Store::STATUS_RUNNING;
-	$job_id = ActionScheduler::store()->find_action( $hook, $params );
-	if ( ! empty( $job_id ) ) {
+	$job_id = ActionScheduler::store()->find_action($hook, $params);
+	if (!empty($job_id)) {
 		return true;
 	}
 
 	$params['status'] = ActionScheduler_Store::STATUS_PENDING;
-	$job_id = ActionScheduler::store()->find_action( $hook, $params );
-	if ( empty($job_id) ) {
+	$job_id = ActionScheduler::store()->find_action($hook, $params);
+	if (empty($job_id)) {
 		return false;
 	}
-	$job = ActionScheduler::store()->fetch_action( $job_id );
+	$job = ActionScheduler::store()->fetch_action($job_id);
 	$scheduled_date = $job->get_schedule()->get_date();
-	if ( $scheduled_date ) {
-		return (int) $scheduled_date->format( 'U' );
-	} elseif ( NULL === $scheduled_date ) { // pending async action with NullSchedule
+	if ($scheduled_date) {
+		return (int) $scheduled_date->format('U');
+	} elseif (NULL === $scheduled_date) { // pending async action with NullSchedule
 		return true;
 	}
 	return false;
@@ -195,26 +195,26 @@ 
  *
  * @return array
  */
-function as_get_scheduled_actions( $args = array(), $return_format = OBJECT ) {
+function as_get_scheduled_actions($args = array(), $return_format = OBJECT) {
 	$store = ActionScheduler::store();
-	foreach ( array('date', 'modified') as $key ) {
-		if ( isset($args[$key]) ) {
+	foreach (array('date', 'modified') as $key) {
+		if (isset($args[$key])) {
 			$args[$key] = as_get_datetime_object($args[$key]);
 		}
 	}
-	$ids = $store->query_actions( $args );
+	$ids = $store->query_actions($args);
 
-	if ( $return_format == 'ids' || $return_format == 'int' ) {
+	if ($return_format == 'ids' || $return_format == 'int') {
 		return $ids;
 	}
 
 	$actions = array();
-	foreach ( $ids as $action_id ) {
-		$actions[$action_id] = $store->fetch_action( $action_id );
+	foreach ($ids as $action_id) {
+		$actions[$action_id] = $store->fetch_action($action_id);
 	}
 
-	if ( $return_format == ARRAY_A ) {
-		foreach ( $actions as $action_id => $action_object ) {
+	if ($return_format == ARRAY_A) {
+		foreach ($actions as $action_id => $action_object) {
 			$actions[$action_id] = get_object_vars($action_object);
 		}
 	}
@@ -239,13 +239,13 @@ 
  *
  * @return ActionScheduler_DateTime
  */
-function as_get_datetime_object( $date_string = null, $timezone = 'UTC' ) {
-	if ( is_object( $date_string ) && $date_string instanceof DateTime ) {
-		$date = new ActionScheduler_DateTime( $date_string->format( 'Y-m-d H:i:s' ), new DateTimeZone( $timezone ) );
-	} elseif ( is_numeric( $date_string ) ) {
-		$date = new ActionScheduler_DateTime( '@' . $date_string, new DateTimeZone( $timezone ) );
+function as_get_datetime_object($date_string = null, $timezone = 'UTC') {
+	if (is_object($date_string) && $date_string instanceof DateTime) {
+		$date = new ActionScheduler_DateTime($date_string->format('Y-m-d H:i:s'), new DateTimeZone($timezone));
+	} elseif (is_numeric($date_string)) {
+		$date = new ActionScheduler_DateTime('@' . $date_string, new DateTimeZone($timezone));
 	} else {
-		$date = new ActionScheduler_DateTime( $date_string, new DateTimeZone( $timezone ) );
+		$date = new ActionScheduler_DateTime($date_string, new DateTimeZone($timezone));
 	}
 	return $date;
 }

includes/libraries/action-scheduler/deprecated/ActionScheduler_AdminView_Deprecated.php

Spacing +22 added lines, -22 removed lines

@@ -10,8 +10,8 @@ 
  */
 class ActionScheduler_AdminView_Deprecated {
 
-	public function action_scheduler_post_type_args( $args ) {
-		_deprecated_function( __METHOD__, '2.0.0' );
+	public function action_scheduler_post_type_args($args) {
+		_deprecated_function(__METHOD__, '2.0.0');
 		return $args;
 	}
 
@@ -21,8 +21,8 @@ 
 	 * @param array $views An associative array of views and view labels which can be used to filter the 'scheduled-action' posts displayed on the Scheduled Actions administration screen.
 	 * @return array $views An associative array of views and view labels which can be used to filter the 'scheduled-action' posts displayed on the Scheduled Actions administration screen.
 	 */
-	public function list_table_views( $views ) {
-		_deprecated_function( __METHOD__, '2.0.0' );
+	public function list_table_views($views) {
+		_deprecated_function(__METHOD__, '2.0.0');
 		return $views;
 	}
 
@@ -34,8 +34,8 @@ 
 	 * @param array $actions An associative array of actions which can be performed on the 'scheduled-action' post type.
 	 * @return array $actions An associative array of actions which can be performed on the 'scheduled-action' post type.
 	 */
-	public function bulk_actions( $actions ) {
-		_deprecated_function( __METHOD__, '2.0.0' );
+	public function bulk_actions($actions) {
+		_deprecated_function(__METHOD__, '2.0.0');
 		return $actions;
 	}
 
@@ -48,8 +48,8 @@ 
 	 * @param array $columns An associative array of columns that are use for the table on the Scheduled Actions administration screen.
 	 * @return array $columns An associative array of columns that are use for the table on the Scheduled Actions administration screen.
 	 */
-	public function list_table_columns( $columns ) {
-		_deprecated_function( __METHOD__, '2.0.0' );
+	public function list_table_columns($columns) {
+		_deprecated_function(__METHOD__, '2.0.0');
 		return $columns;
 	}
 
@@ -59,8 +59,8 @@ 
 	 * @param array $columns An associative array of columns that can be used to sort the table on the Scheduled Actions administration screen.
 	 * @return array $columns An associative array of columns that can be used to sort the table on the Scheduled Actions administration screen.
 	 */
-	public static function list_table_sortable_columns( $columns ) {
-		_deprecated_function( __METHOD__, '2.0.0' );
+	public static function list_table_sortable_columns($columns) {
+		_deprecated_function(__METHOD__, '2.0.0');
 		return $columns;
 	}
 
@@ -70,8 +70,8 @@ 
 	 * @param string $column_name The key for the column for which we should output our content.
 	 * @param int $post_id The ID of the 'scheduled-action' post for which this row relates.
 	 */
-	public static function list_table_column_content( $column_name, $post_id ) {
-		_deprecated_function( __METHOD__, '2.0.0' );
+	public static function list_table_column_content($column_name, $post_id) {
+		_deprecated_function(__METHOD__, '2.0.0');
 	}
 
 	/**
@@ -82,8 +82,8 @@ 
 	 * @param array $actions An associative array of actions which can be performed on the 'scheduled-action' post type.
 	 * @return array $actions An associative array of actions which can be performed on the 'scheduled-action' post type.
 	 */
-	public static function row_actions( $actions, $post ) {
-		_deprecated_function( __METHOD__, '2.0.0' );
+	public static function row_actions($actions, $post) {
+		_deprecated_function(__METHOD__, '2.0.0');
 		return $actions;
 	}
 
@@ -93,7 +93,7 @@ 
 	 * @codeCoverageIgnore
 	 */
 	public static function maybe_execute_action() {
-		_deprecated_function( __METHOD__, '2.0.0' );
+		_deprecated_function(__METHOD__, '2.0.0');
 	}
 
 	/**
@@ -109,7 +109,7 @@ 
 	 * @return string A human friendly string representation of the interval.
 	 */
 	public static function admin_notices() {
-		_deprecated_function( __METHOD__, '2.0.0' );
+		_deprecated_function(__METHOD__, '2.0.0');
 	}
 
 	/**
@@ -119,8 +119,8 @@ 
 	 * @param WP_Query $query Instance of a WP_Query object
 	 * @return string MySQL orderby string.
 	 */
-	public function custom_orderby( $orderby, $query ){
-		_deprecated_function( __METHOD__, '2.0.0' );
+	public function custom_orderby($orderby, $query) {
+		_deprecated_function(__METHOD__, '2.0.0');
 	}
 
 	/**
@@ -130,8 +130,8 @@ 
 	 * @param WP_Query $query Instance of a WP_Query object
 	 * @return string MySQL search string.
 	 */
-	public function search_post_password( $search, $query ) {
-		_deprecated_function( __METHOD__, '2.0.0' );
+	public function search_post_password($search, $query) {
+		_deprecated_function(__METHOD__, '2.0.0');
 	}
 
 	/**
@@ -140,8 +140,8 @@ 
 	 * @param  array $messages
 	 * @return array
 	 */
-	public function post_updated_messages( $messages ) {
-		_deprecated_function( __METHOD__, '2.0.0' );
+	public function post_updated_messages($messages) {
+		_deprecated_function(__METHOD__, '2.0.0');
 		return $messages;
 	}
 }
\ No newline at end of file

includes/libraries/action-scheduler/deprecated/functions.php

Spacing +18 added lines, -18 removed lines

@@ -18,9 +18,9 @@ 
  *
  * @return string The job ID
  */
-function wc_schedule_single_action( $timestamp, $hook, $args = array(), $group = '' ) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'as_schedule_single_action()' );
-	return as_schedule_single_action( $timestamp, $hook, $args, $group );
+function wc_schedule_single_action($timestamp, $hook, $args = array(), $group = '') {
+	_deprecated_function(__FUNCTION__, '2.1.0', 'as_schedule_single_action()');
+	return as_schedule_single_action($timestamp, $hook, $args, $group);
 }
 
 /**
@@ -36,9 +36,9 @@ 
  *
  * @return string The job ID
  */
-function wc_schedule_recurring_action( $timestamp, $interval_in_seconds, $hook, $args = array(), $group = '' ) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'as_schedule_recurring_action()' );
-	return as_schedule_recurring_action( $timestamp, $interval_in_seconds, $hook, $args, $group );
+function wc_schedule_recurring_action($timestamp, $interval_in_seconds, $hook, $args = array(), $group = '') {
+	_deprecated_function(__FUNCTION__, '2.1.0', 'as_schedule_recurring_action()');
+	return as_schedule_recurring_action($timestamp, $interval_in_seconds, $hook, $args, $group);
 }
 
 /**
@@ -64,9 +64,9 @@ 
  *
  * @return string The job ID
  */
-function wc_schedule_cron_action( $timestamp, $schedule, $hook, $args = array(), $group = '' ) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'as_schedule_cron_action()' );
-	return as_schedule_cron_action( $timestamp, $schedule, $hook, $args, $group );
+function wc_schedule_cron_action($timestamp, $schedule, $hook, $args = array(), $group = '') {
+	_deprecated_function(__FUNCTION__, '2.1.0', 'as_schedule_cron_action()');
+	return as_schedule_cron_action($timestamp, $schedule, $hook, $args, $group);
 }
 
 /**
@@ -78,9 +78,9 @@ 
  *
  * @deprecated 2.1.0
  */
-function wc_unschedule_action( $hook, $args = array(), $group = '' ) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'as_unschedule_action()' );
-	as_unschedule_action( $hook, $args, $group );
+function wc_unschedule_action($hook, $args = array(), $group = '') {
+	_deprecated_function(__FUNCTION__, '2.1.0', 'as_unschedule_action()');
+	as_unschedule_action($hook, $args, $group);
 }
 
 /**
@@ -92,9 +92,9 @@ 
  *
  * @return int|bool The timestamp for the next occurrence, or false if nothing was found
  */
-function wc_next_scheduled_action( $hook, $args = NULL, $group = '' ) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'as_next_scheduled_action()' );
-	return as_next_scheduled_action( $hook, $args, $group );
+function wc_next_scheduled_action($hook, $args = NULL, $group = '') {
+	_deprecated_function(__FUNCTION__, '2.1.0', 'as_next_scheduled_action()');
+	return as_next_scheduled_action($hook, $args, $group);
 }
 
 /**
@@ -120,7 +120,7 @@ 
  *
  * @return array
  */
-function wc_get_scheduled_actions( $args = array(), $return_format = OBJECT ) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'as_get_scheduled_actions()' );
-	return as_get_scheduled_actions( $args, $return_format );
+function wc_get_scheduled_actions($args = array(), $return_format = OBJECT) {
+	_deprecated_function(__FUNCTION__, '2.1.0', 'as_get_scheduled_actions()');
+	return as_get_scheduled_actions($args, $return_format);
 }

includes/libraries/action-scheduler/deprecated/ActionScheduler_Schedule_Deprecated.php

Spacing +4 added lines, -4 removed lines

@@ -13,16 +13,16 @@
 	 *
 	 * @return DateTime|null
 	 */
-	public function next( DateTime $after = NULL ) {
-		if ( empty( $after ) ) {
+	public function next(DateTime $after = NULL) {
+		if (empty($after)) {
 			$return_value       = $this->get_date();
 			$replacement_method = 'get_date()';
 		} else {
-			$return_value       = $this->get_next( $after );
+			$return_value       = $this->get_next($after);
 			$replacement_method = 'get_next( $after )';
 		}
 
-		_deprecated_function( __METHOD__, '3.0.0', __CLASS__ . '::' . $replacement_method );
+		_deprecated_function(__METHOD__, '3.0.0', __CLASS__ . '::' . $replacement_method);
 
 		return $return_value;
 	}

includes/libraries/action-scheduler/deprecated/ActionScheduler_Store_Deprecated.php

Spacing +6 added lines, -6 removed lines

@@ -13,9 +13,9 @@ 
 	 *
 	 * @param int $action_id The ID of the action.
 	 */
-	public function mark_failed_fetch_action( $action_id ) {
-		_deprecated_function( __METHOD__, '3.0.0', 'ActionScheduler_Store::mark_failure()' );
-		self::$store->mark_failure( $action_id );
+	public function mark_failed_fetch_action($action_id) {
+		_deprecated_function(__METHOD__, '3.0.0', 'ActionScheduler_Store::mark_failure()');
+		self::$store->mark_failure($action_id);
 	}
 
 	/**
@@ -24,7 +24,7 @@ 
 	 * @since 2.2.6
 	 */
 	protected static function hook() {
-		_deprecated_function( __METHOD__, '3.0.0' );
+		_deprecated_function(__METHOD__, '3.0.0');
 	}
 
 	/**
@@ -33,7 +33,7 @@ 
 	 * @since 2.2.6
 	 */
 	protected static function unhook() {
-		_deprecated_function( __METHOD__, '3.0.0' );
+		_deprecated_function(__METHOD__, '3.0.0');
 	}
 
 	/**
@@ -43,7 +43,7 @@ 
 	 * @return DateTimeZone
 	 */
 	protected function get_local_timezone() {
-		_deprecated_function( __FUNCTION__, '2.1.0', 'ActionScheduler_TimezoneHelper::set_local_timezone()' );
+		_deprecated_function(__FUNCTION__, '2.1.0', 'ActionScheduler_TimezoneHelper::set_local_timezone()');
 		return ActionScheduler_TimezoneHelper::get_local_timezone();
 	}
 }

includes/libraries/action-scheduler/deprecated/ActionScheduler_Abstract_QueueRunner_Deprecated.php

Spacing +5 added lines, -5 removed lines

@@ -12,16 +12,16 @@
 	 * @return int The number of seconds.
 	 */
 	protected function get_maximum_execution_time() {
-		_deprecated_function( __METHOD__, '2.1.1', 'ActionScheduler_Abstract_QueueRunner::get_time_limit()' );
+		_deprecated_function(__METHOD__, '2.1.1', 'ActionScheduler_Abstract_QueueRunner::get_time_limit()');
 
 		$maximum_execution_time = 30;
 
 		// Apply deprecated filter
-		if ( has_filter( 'action_scheduler_maximum_execution_time' ) ) {
-			_deprecated_function( 'action_scheduler_maximum_execution_time', '2.1.1', 'action_scheduler_queue_runner_time_limit' );
-			$maximum_execution_time = apply_filters( 'action_scheduler_maximum_execution_time', $maximum_execution_time );
+		if (has_filter('action_scheduler_maximum_execution_time')) {
+			_deprecated_function('action_scheduler_maximum_execution_time', '2.1.1', 'action_scheduler_queue_runner_time_limit');
+			$maximum_execution_time = apply_filters('action_scheduler_maximum_execution_time', $maximum_execution_time);
 		}
 
-		return absint( $maximum_execution_time );
+		return absint($maximum_execution_time);
 	}
 }

includes/libraries/action-scheduler/action-scheduler.php

Spacing +10 added lines, -10 removed lines

@@ -25,29 +25,29 @@
  *
  */
 
-if ( ! function_exists( 'action_scheduler_register_3_dot_1_dot_4' ) ) {
+if (!function_exists('action_scheduler_register_3_dot_1_dot_4')) {
 
-	if ( ! class_exists( 'ActionScheduler_Versions' ) ) {
-		require_once( 'classes/ActionScheduler_Versions.php' );
-		add_action( 'plugins_loaded', array( 'ActionScheduler_Versions', 'initialize_latest_version' ), 1, 0 );
+	if (!class_exists('ActionScheduler_Versions')) {
+		require_once('classes/ActionScheduler_Versions.php');
+		add_action('plugins_loaded', array('ActionScheduler_Versions', 'initialize_latest_version'), 1, 0);
 	}
 
-	add_action( 'plugins_loaded', 'action_scheduler_register_3_dot_1_dot_4', 0, 0 );
+	add_action('plugins_loaded', 'action_scheduler_register_3_dot_1_dot_4', 0, 0);
 
 	function action_scheduler_register_3_dot_1_dot_4() {
 		$versions = ActionScheduler_Versions::instance();
-		$versions->register( '3.1.4', 'action_scheduler_initialize_3_dot_1_dot_4' );
+		$versions->register('3.1.4', 'action_scheduler_initialize_3_dot_1_dot_4');
 	}
 
 	function action_scheduler_initialize_3_dot_1_dot_4() {
-		require_once( 'classes/abstracts/ActionScheduler.php' );
-		ActionScheduler::init( __FILE__ );
+		require_once('classes/abstracts/ActionScheduler.php');
+		ActionScheduler::init(__FILE__);
 	}
 
 	// Support usage in themes - load this version if no plugin has loaded a version yet.
-	if ( did_action( 'plugins_loaded' ) && ! class_exists( 'ActionScheduler' ) ) {
+	if (did_action('plugins_loaded') && !class_exists('ActionScheduler')) {
 		action_scheduler_initialize_3_dot_1_dot_4();
-		do_action( 'action_scheduler_pre_theme_init' );
+		do_action('action_scheduler_pre_theme_init');
 		ActionScheduler_Versions::initialize_latest_version();
 	}
 }

includes/libraries/action-scheduler/classes/ActionScheduler_FatalErrorMonitor.php

Spacing +19 added lines, -19 removed lines

@@ -10,30 +10,30 @@ 
 	private $store = NULL;
 	private $action_id = 0;
 
-	public function __construct( ActionScheduler_Store $store ) {
+	public function __construct(ActionScheduler_Store $store) {
 		$this->store = $store;
 	}
 
-	public function attach( ActionScheduler_ActionClaim $claim ) {
+	public function attach(ActionScheduler_ActionClaim $claim) {
 		$this->claim = $claim;
-		add_action( 'shutdown', array( $this, 'handle_unexpected_shutdown' ) );
-		add_action( 'action_scheduler_before_execute', array( $this, 'track_current_action' ), 0, 1 );
-		add_action( 'action_scheduler_after_execute',  array( $this, 'untrack_action' ), 0, 0 );
-		add_action( 'action_scheduler_execution_ignored',  array( $this, 'untrack_action' ), 0, 0 );
-		add_action( 'action_scheduler_failed_execution',  array( $this, 'untrack_action' ), 0, 0 );
+		add_action('shutdown', array($this, 'handle_unexpected_shutdown'));
+		add_action('action_scheduler_before_execute', array($this, 'track_current_action'), 0, 1);
+		add_action('action_scheduler_after_execute', array($this, 'untrack_action'), 0, 0);
+		add_action('action_scheduler_execution_ignored', array($this, 'untrack_action'), 0, 0);
+		add_action('action_scheduler_failed_execution', array($this, 'untrack_action'), 0, 0);
 	}
 
 	public function detach() {
 		$this->claim = NULL;
 		$this->untrack_action();
-		remove_action( 'shutdown', array( $this, 'handle_unexpected_shutdown' ) );
-		remove_action( 'action_scheduler_before_execute', array( $this, 'track_current_action' ), 0 );
-		remove_action( 'action_scheduler_after_execute',  array( $this, 'untrack_action' ), 0 );
-		remove_action( 'action_scheduler_execution_ignored',  array( $this, 'untrack_action' ), 0 );
-		remove_action( 'action_scheduler_failed_execution',  array( $this, 'untrack_action' ), 0 );
+		remove_action('shutdown', array($this, 'handle_unexpected_shutdown'));
+		remove_action('action_scheduler_before_execute', array($this, 'track_current_action'), 0);
+		remove_action('action_scheduler_after_execute', array($this, 'untrack_action'), 0);
+		remove_action('action_scheduler_execution_ignored', array($this, 'untrack_action'), 0);
+		remove_action('action_scheduler_failed_execution', array($this, 'untrack_action'), 0);
 	}
 
-	public function track_current_action( $action_id ) {
+	public function track_current_action($action_id) {
 		$this->action_id = $action_id;
 	}
 
@@ -42,14 +42,14 @@ 
 	}
 
 	public function handle_unexpected_shutdown() {
-		if ( $error = error_get_last() ) {
-			if ( in_array( $error['type'], array( E_ERROR, E_PARSE, E_COMPILE_ERROR, E_USER_ERROR, E_RECOVERABLE_ERROR ) ) ) {
-				if ( !empty($this->action_id) ) {
-					$this->store->mark_failure( $this->action_id );
-					do_action( 'action_scheduler_unexpected_shutdown', $this->action_id, $error );
+		if ($error = error_get_last()) {
+			if (in_array($error['type'], array(E_ERROR, E_PARSE, E_COMPILE_ERROR, E_USER_ERROR, E_RECOVERABLE_ERROR))) {
+				if (!empty($this->action_id)) {
+					$this->store->mark_failure($this->action_id);
+					do_action('action_scheduler_unexpected_shutdown', $this->action_id, $error);
 				}
 			}
-			$this->store->release_claim( $this->claim );
+			$this->store->release_claim($this->claim);
 		}
 	}
 }