@@ -7,15 +7,15 @@ discard block  | 
                                                    ||
| 7 | 7 | */  | 
                                                        
| 8 | 8 | |
| 9 | 9 | // MUST have WordPress.  | 
                                                        
| 10 | -if ( !defined( 'WPINC' ) ) { | 
                                                        |
| 11 | - exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );  | 
                                                        |
| 10 | +if (!defined('WPINC')) { | 
                                                        |
| 11 | +    exit('Do NOT access this file directly: ' . basename(__FILE__)); | 
                                                        |
| 12 | 12 | }  | 
                                                        
| 13 | 13 | |
| 14 | 14 |  class WPInv_Plugin { | 
                                                        
| 15 | 15 | private static $instance;  | 
                                                        
| 16 | 16 | |
| 17 | 17 |      public static function run() { | 
                                                        
| 18 | -        if ( !isset( self::$instance ) && !( self::$instance instanceof WPInv_Plugin ) ) { | 
                                                        |
| 18 | +        if (!isset(self::$instance) && !(self::$instance instanceof WPInv_Plugin)) { | 
                                                        |
| 19 | 19 | self::$instance = new WPInv_Plugin;  | 
                                                        
| 20 | 20 | self::$instance->includes();  | 
                                                        
| 21 | 21 | self::$instance->actions();  | 
                                                        
@@ -32,33 +32,33 @@ discard block  | 
                                                    ||
| 32 | 32 | }  | 
                                                        
| 33 | 33 | |
| 34 | 34 |      public function define_constants() { | 
                                                        
| 35 | - define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );  | 
                                                        |
| 36 | - define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );  | 
                                                        |
| 35 | +        define('WPINV_PLUGIN_DIR', plugin_dir_path(WPINV_PLUGIN_FILE)); | 
                                                        |
| 36 | +        define('WPINV_PLUGIN_URL', plugin_dir_url(WPINV_PLUGIN_FILE)); | 
                                                        |
| 37 | 37 | }  | 
                                                        
| 38 | 38 | |
| 39 | 39 |      private function actions() { | 
                                                        
| 40 | 40 | /* Internationalize the text strings used. */  | 
                                                        
| 41 | - add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );  | 
                                                        |
| 41 | +        add_action('plugins_loaded', array(&$this, 'plugins_loaded')); | 
                                                        |
| 42 | 42 | |
| 43 | 43 | /* Perform actions on admin initialization. */  | 
                                                        
| 44 | - add_action( 'admin_init', array( &$this, 'admin_init') );  | 
                                                        |
| 45 | - add_action( 'init', array( &$this, 'init' ), 3 );  | 
                                                        |
| 46 | - add_action( 'init', array( &$this, 'wpinv_actions' ) );  | 
                                                        |
| 44 | +        add_action('admin_init', array(&$this, 'admin_init')); | 
                                                        |
| 45 | +        add_action('init', array(&$this, 'init'), 3); | 
                                                        |
| 46 | +        add_action('init', array(&$this, 'wpinv_actions')); | 
                                                        |
| 47 | 47 | |
| 48 | -        if ( class_exists( 'BuddyPress' ) ) { | 
                                                        |
| 49 | - add_action( 'bp_include', array( &$this, 'bp_invoicing_init' ) );  | 
                                                        |
| 48 | +        if (class_exists('BuddyPress')) { | 
                                                        |
| 49 | +            add_action('bp_include', array(&$this, 'bp_invoicing_init')); | 
                                                        |
| 50 | 50 | }  | 
                                                        
| 51 | 51 | |
| 52 | - add_action( 'wp_enqueue_scripts', array( &$this, 'enqueue_scripts' ) );  | 
                                                        |
| 53 | - add_action( 'widgets_init', array( &$this, 'register_widgets' ) );  | 
                                                        |
| 52 | +        add_action('wp_enqueue_scripts', array(&$this, 'enqueue_scripts')); | 
                                                        |
| 53 | +        add_action('widgets_init', array(&$this, 'register_widgets')); | 
                                                        |
| 54 | 54 | |
| 55 | -        if ( is_admin() ) { | 
                                                        |
| 56 | - add_action( 'admin_enqueue_scripts', array( &$this, 'admin_enqueue_scripts' ) );  | 
                                                        |
| 57 | - add_action( 'admin_body_class', array( &$this, 'admin_body_class' ) );  | 
                                                        |
| 58 | - add_action( 'admin_init', array( &$this, 'init_ayecode_connect_helper' ) );  | 
                                                        |
| 55 | +        if (is_admin()) { | 
                                                        |
| 56 | +            add_action('admin_enqueue_scripts', array(&$this, 'admin_enqueue_scripts')); | 
                                                        |
| 57 | +            add_action('admin_body_class', array(&$this, 'admin_body_class')); | 
                                                        |
| 58 | +            add_action('admin_init', array(&$this, 'init_ayecode_connect_helper')); | 
                                                        |
| 59 | 59 | |
| 60 | 60 |          } else { | 
                                                        
| 61 | - add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );  | 
                                                        |
| 61 | +            add_filter('pre_get_posts', array(&$this, 'pre_get_posts')); | 
                                                        |
| 62 | 62 | }  | 
                                                        
| 63 | 63 | |
| 64 | 64 | /**  | 
                                                        
@@ -68,28 +68,28 @@ discard block  | 
                                                    ||
| 68 | 68 | *  | 
                                                        
| 69 | 69 | * @param WPInv_Plugin $this. Current WPInv_Plugin instance. Passed by reference.  | 
                                                        
| 70 | 70 | */  | 
                                                        
| 71 | - do_action_ref_array( 'wpinv_actions', array( &$this ) );  | 
                                                        |
| 71 | +        do_action_ref_array('wpinv_actions', array(&$this)); | 
                                                        |
| 72 | 72 | |
| 73 | - add_action( 'admin_init', array( &$this, 'activation_redirect') );  | 
                                                        |
| 73 | +        add_action('admin_init', array(&$this, 'activation_redirect')); | 
                                                        |
| 74 | 74 | }  | 
                                                        
| 75 | 75 | |
| 76 | 76 | /**  | 
                                                        
| 77 | 77 | * Maybe show the AyeCode Connect Notice.  | 
                                                        
| 78 | 78 | */  | 
                                                        
| 79 | -    public function init_ayecode_connect_helper(){ | 
                                                        |
| 79 | +    public function init_ayecode_connect_helper() { | 
                                                        |
| 80 | 80 | // AyeCode Connect notice  | 
                                                        
| 81 | -        if ( is_admin() ){ | 
                                                        |
| 81 | +        if (is_admin()) { | 
                                                        |
| 82 | 82 | // set the strings so they can be translated  | 
                                                        
| 83 | 83 | $strings = array(  | 
                                                        
| 84 | -                'connect_title' => __("WP Invoicing - an AyeCode product!","invoicing"), | 
                                                        |
| 85 | - 'connect_external' => __( "Please confirm you wish to connect your site?","invoicing" ),  | 
                                                        |
| 86 | - 'connect' => sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s","invoicing" ),"<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>","</a>" ),  | 
                                                        |
| 87 | -                'connect_button'    => __("Connect Site","invoicing"), | 
                                                        |
| 88 | -                'connecting_button'    => __("Connecting...","invoicing"), | 
                                                        |
| 89 | - 'error_localhost' => __( "This service will only work with a live domain, not a localhost.","invoicing" ),  | 
                                                        |
| 90 | - 'error' => __( "Something went wrong, please refresh and try again.","invoicing" ),  | 
                                                        |
| 84 | +                'connect_title' => __("WP Invoicing - an AyeCode product!", "invoicing"), | 
                                                        |
| 85 | +                'connect_external'  => __("Please confirm you wish to connect your site?", "invoicing"), | 
                                                        |
| 86 | +                'connect'           => sprintf(__("<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s", "invoicing"), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>"), | 
                                                        |
| 87 | +                'connect_button'    => __("Connect Site", "invoicing"), | 
                                                        |
| 88 | +                'connecting_button'    => __("Connecting...", "invoicing"), | 
                                                        |
| 89 | +                'error_localhost'   => __("This service will only work with a live domain, not a localhost.", "invoicing"), | 
                                                        |
| 90 | +                'error'             => __("Something went wrong, please refresh and try again.", "invoicing"), | 
                                                        |
| 91 | 91 | );  | 
                                                        
| 92 | -            new AyeCode_Connect_Helper($strings,array('wpi-addons')); | 
                                                        |
| 92 | +            new AyeCode_Connect_Helper($strings, array('wpi-addons')); | 
                                                        |
| 93 | 93 | }  | 
                                                        
| 94 | 94 | }  | 
                                                        
| 95 | 95 | |
@@ -97,10 +97,10 @@ discard block  | 
                                                    ||
| 97 | 97 | /* Internationalize the text strings used. */  | 
                                                        
| 98 | 98 | $this->load_textdomain();  | 
                                                        
| 99 | 99 | |
| 100 | - do_action( 'wpinv_loaded' );  | 
                                                        |
| 100 | +        do_action('wpinv_loaded'); | 
                                                        |
| 101 | 101 | |
| 102 | 102 | // Fix oxygen page builder conflict  | 
                                                        
| 103 | -        if ( function_exists( 'ct_css_output' ) ) { | 
                                                        |
| 103 | +        if (function_exists('ct_css_output')) { | 
                                                        |
| 104 | 104 | wpinv_oxygen_fix_conflict();  | 
                                                        
| 105 | 105 | }  | 
                                                        
| 106 | 106 | }  | 
                                                        
@@ -110,230 +110,230 @@ discard block  | 
                                                    ||
| 110 | 110 | *  | 
                                                        
| 111 | 111 | * @since 1.0  | 
                                                        
| 112 | 112 | */  | 
                                                        
| 113 | -    public function load_textdomain( $locale = NULL ) { | 
                                                        |
| 114 | -        if ( empty( $locale ) ) { | 
                                                        |
| 115 | - $locale = is_admin() && function_exists( 'get_user_locale' ) ? get_user_locale() : get_locale();  | 
                                                        |
| 113 | +    public function load_textdomain($locale = NULL) { | 
                                                        |
| 114 | +        if (empty($locale)) { | 
                                                        |
| 115 | +            $locale = is_admin() && function_exists('get_user_locale') ? get_user_locale() : get_locale(); | 
                                                        |
| 116 | 116 | }  | 
                                                        
| 117 | 117 | |
| 118 | - $locale = apply_filters( 'plugin_locale', $locale, 'invoicing' );  | 
                                                        |
| 118 | +        $locale = apply_filters('plugin_locale', $locale, 'invoicing'); | 
                                                        |
| 119 | 119 | |
| 120 | - unload_textdomain( 'invoicing' );  | 
                                                        |
| 121 | - load_textdomain( 'invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo' );  | 
                                                        |
| 122 | - load_plugin_textdomain( 'invoicing', false, WPINV_PLUGIN_DIR . 'languages' );  | 
                                                        |
| 120 | +        unload_textdomain('invoicing'); | 
                                                        |
| 121 | +        load_textdomain('invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo'); | 
                                                        |
| 122 | +        load_plugin_textdomain('invoicing', false, WPINV_PLUGIN_DIR . 'languages'); | 
                                                        |
| 123 | 123 | |
| 124 | 124 | /**  | 
                                                        
| 125 | 125 | * Define language constants.  | 
                                                        
| 126 | 126 | */  | 
                                                        
| 127 | - require_once( WPINV_PLUGIN_DIR . 'language.php' );  | 
                                                        |
| 127 | + require_once(WPINV_PLUGIN_DIR . 'language.php');  | 
                                                        |
| 128 | 128 | }  | 
                                                        
| 129 | 129 | |
| 130 | 130 |      public function includes() { | 
                                                        
| 131 | 131 | global $wpinv_options;  | 
                                                        
| 132 | 132 | |
| 133 | - require_once( WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php' );  | 
                                                        |
| 133 | + require_once(WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php');  | 
                                                        |
| 134 | 134 | $wpinv_options = wpinv_get_settings();  | 
                                                        
| 135 | 135 | |
| 136 | - require_once( WPINV_PLUGIN_DIR . 'vendor/autoload.php' );  | 
                                                        |
| 137 | - require_once( WPINV_PLUGIN_DIR . 'includes/libraries/action-scheduler/action-scheduler.php' );  | 
                                                        |
| 138 | - require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php' );  | 
                                                        |
| 139 | - require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php' );  | 
                                                        |
| 140 | - require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php' );  | 
                                                        |
| 141 | - require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php' );  | 
                                                        |
| 142 | - require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php' );  | 
                                                        |
| 143 | - require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php' );  | 
                                                        |
| 144 | - require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-invoice-functions.php' );  | 
                                                        |
| 145 | - require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php' );  | 
                                                        |
| 146 | - require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php' );  | 
                                                        |
| 147 | - require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php' );  | 
                                                        |
| 148 | - require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php' );  | 
                                                        |
| 149 | - require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php' );  | 
                                                        |
| 150 | - require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-error-functions.php' );  | 
                                                        |
| 151 | - require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-post-types.php' );  | 
                                                        |
| 152 | - require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-invoice.php' );  | 
                                                        |
| 153 | - require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-discount.php' );  | 
                                                        |
| 154 | - require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-item.php' );  | 
                                                        |
| 155 | - require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-notes.php' );  | 
                                                        |
| 156 | - require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php' );  | 
                                                        |
| 157 | - require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php' );  | 
                                                        |
| 158 | - require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php' );  | 
                                                        |
| 159 | - require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php' );  | 
                                                        |
| 160 | - require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-reports.php' );  | 
                                                        |
| 161 | - require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php' );  | 
                                                        |
| 162 | - require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php' );  | 
                                                        |
| 163 | - require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );  | 
                                                        |
| 164 | - require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php' );  | 
                                                        |
| 165 | - require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions.php' );  | 
                                                        |
| 166 | - require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php' );  | 
                                                        |
| 167 | - require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-subscriptions-list-table.php' );  | 
                                                        |
| 168 | - require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php' );  | 
                                                        |
| 169 | - require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php' );  | 
                                                        |
| 170 | - require_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php' );  | 
                                                        |
| 171 | - require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php' );  | 
                                                        |
| 172 | - require_once( WPINV_PLUGIN_DIR . 'widgets/checkout.php' );  | 
                                                        |
| 173 | - require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-history.php' );  | 
                                                        |
| 174 | - require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php' );  | 
                                                        |
| 175 | - require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php' );  | 
                                                        |
| 176 | - require_once( WPINV_PLUGIN_DIR . 'widgets/subscriptions.php' );  | 
                                                        |
| 177 | - require_once( WPINV_PLUGIN_DIR . 'widgets/buy-item.php' );  | 
                                                        |
| 178 | -  | 
                                                        |
| 179 | -        if ( !class_exists( 'WPInv_EUVat' ) ) { | 
                                                        |
| 180 | - require_once( WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php' );  | 
                                                        |
| 136 | + require_once(WPINV_PLUGIN_DIR . 'vendor/autoload.php');  | 
                                                        |
| 137 | + require_once(WPINV_PLUGIN_DIR . 'includes/libraries/action-scheduler/action-scheduler.php');  | 
                                                        |
| 138 | + require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php');  | 
                                                        |
| 139 | + require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php');  | 
                                                        |
| 140 | + require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php');  | 
                                                        |
| 141 | + require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php');  | 
                                                        |
| 142 | + require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php');  | 
                                                        |
| 143 | + require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php');  | 
                                                        |
| 144 | + require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-invoice-functions.php');  | 
                                                        |
| 145 | + require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php');  | 
                                                        |
| 146 | + require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php');  | 
                                                        |
| 147 | + require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php');  | 
                                                        |
| 148 | + require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php');  | 
                                                        |
| 149 | + require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php');  | 
                                                        |
| 150 | + require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-error-functions.php');  | 
                                                        |
| 151 | + require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-post-types.php');  | 
                                                        |
| 152 | + require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-invoice.php');  | 
                                                        |
| 153 | + require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-discount.php');  | 
                                                        |
| 154 | + require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-item.php');  | 
                                                        |
| 155 | + require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-notes.php');  | 
                                                        |
| 156 | + require_once(WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php');  | 
                                                        |
| 157 | + require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php');  | 
                                                        |
| 158 | + require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php');  | 
                                                        |
| 159 | + require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php');  | 
                                                        |
| 160 | + require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-reports.php');  | 
                                                        |
| 161 | + require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php');  | 
                                                        |
| 162 | + require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php');  | 
                                                        |
| 163 | + require_once(WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php');  | 
                                                        |
| 164 | + require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php');  | 
                                                        |
| 165 | + require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions.php');  | 
                                                        |
| 166 | + require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php');  | 
                                                        |
| 167 | + require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-subscriptions-list-table.php');  | 
                                                        |
| 168 | + require_once(WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php');  | 
                                                        |
| 169 | + require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php');  | 
                                                        |
| 170 | + require_once(WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php');  | 
                                                        |
| 171 | + require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php');  | 
                                                        |
| 172 | + require_once(WPINV_PLUGIN_DIR . 'widgets/checkout.php');  | 
                                                        |
| 173 | + require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-history.php');  | 
                                                        |
| 174 | + require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php');  | 
                                                        |
| 175 | + require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php');  | 
                                                        |
| 176 | + require_once(WPINV_PLUGIN_DIR . 'widgets/subscriptions.php');  | 
                                                        |
| 177 | + require_once(WPINV_PLUGIN_DIR . 'widgets/buy-item.php');  | 
                                                        |
| 178 | +  | 
                                                        |
| 179 | +        if (!class_exists('WPInv_EUVat')) { | 
                                                        |
| 180 | + require_once(WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php');  | 
                                                        |
| 181 | 181 | }  | 
                                                        
| 182 | 182 | |
| 183 | - $gateways = array_keys( wpinv_get_enabled_payment_gateways() );  | 
                                                        |
| 184 | -        if ( !empty( $gateways ) ) { | 
                                                        |
| 185 | -            foreach ( $gateways as $gateway ) { | 
                                                        |
| 186 | -                if ( $gateway == 'manual' ) { | 
                                                        |
| 183 | + $gateways = array_keys(wpinv_get_enabled_payment_gateways());  | 
                                                        |
| 184 | +        if (!empty($gateways)) { | 
                                                        |
| 185 | +            foreach ($gateways as $gateway) { | 
                                                        |
| 186 | +                if ($gateway == 'manual') { | 
                                                        |
| 187 | 187 | continue;  | 
                                                        
| 188 | 188 | }  | 
                                                        
| 189 | 189 | |
| 190 | 190 | $gateway_file = WPINV_PLUGIN_DIR . 'includes/gateways/' . $gateway . '.php';  | 
                                                        
| 191 | 191 | |
| 192 | -                if ( file_exists( $gateway_file ) ) { | 
                                                        |
| 193 | - require_once( $gateway_file );  | 
                                                        |
| 192 | +                if (file_exists($gateway_file)) { | 
                                                        |
| 193 | + require_once($gateway_file);  | 
                                                        |
| 194 | 194 | }  | 
                                                        
| 195 | 195 | }  | 
                                                        
| 196 | 196 | }  | 
                                                        
| 197 | - require_once( WPINV_PLUGIN_DIR . 'includes/gateways/manual.php' );  | 
                                                        |
| 197 | + require_once(WPINV_PLUGIN_DIR . 'includes/gateways/manual.php');  | 
                                                        |
| 198 | 198 | |
| 199 | -        if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) { | 
                                                        |
| 200 | - require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php' );  | 
                                                        |
| 201 | - require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php' );  | 
                                                        |
| 202 | - require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-meta-boxes.php' );  | 
                                                        |
| 199 | +        if (is_admin() || (defined('WP_CLI') && WP_CLI)) { | 
                                                        |
| 200 | + require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php');  | 
                                                        |
| 201 | + require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php');  | 
                                                        |
| 202 | + require_once(WPINV_PLUGIN_DIR . 'includes/admin/admin-meta-boxes.php');  | 
                                                        |
| 203 | 203 | //require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-recurring-admin.php' );  | 
                                                        
| 204 | - require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-details.php' );  | 
                                                        |
| 205 | - require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-items.php' );  | 
                                                        |
| 206 | - require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php' );  | 
                                                        |
| 207 | - require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-address.php' );  | 
                                                        |
| 208 | - require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php' );  | 
                                                        |
| 209 | - require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php' );  | 
                                                        |
| 210 | - require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php' );  | 
                                                        |
| 204 | + require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-details.php');  | 
                                                        |
| 205 | + require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-items.php');  | 
                                                        |
| 206 | + require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php');  | 
                                                        |
| 207 | + require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-address.php');  | 
                                                        |
| 208 | + require_once(WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php');  | 
                                                        |
| 209 | + require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php');  | 
                                                        |
| 210 | + require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php');  | 
                                                        |
| 211 | 211 | //require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );  | 
                                                        
| 212 | 212 | // load the user class only on the users.php page  | 
                                                        
| 213 | 213 | global $pagenow;  | 
                                                        
| 214 | -            if($pagenow=='users.php'){ | 
                                                        |
| 214 | +            if ($pagenow == 'users.php') { | 
                                                        |
| 215 | 215 | new WPInv_Admin_Users();  | 
                                                        
| 216 | 216 | }  | 
                                                        
| 217 | 217 | }  | 
                                                        
| 218 | 218 | |
| 219 | 219 | // Register cli commands  | 
                                                        
| 220 | -        if ( defined( 'WP_CLI' ) && WP_CLI ) { | 
                                                        |
| 221 | - require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php' );  | 
                                                        |
| 222 | - WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );  | 
                                                        |
| 220 | +        if (defined('WP_CLI') && WP_CLI) { | 
                                                        |
| 221 | + require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php');  | 
                                                        |
| 222 | +            WP_CLI::add_command('invoicing', 'WPInv_CLI'); | 
                                                        |
| 223 | 223 | }  | 
                                                        
| 224 | 224 | |
| 225 | 225 | // include css inliner  | 
                                                        
| 226 | -        if ( ! class_exists( 'Emogrifier' ) && class_exists( 'DOMDocument' ) ) { | 
                                                        |
| 227 | - include_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-emogrifier.php' );  | 
                                                        |
| 226 | +        if (!class_exists('Emogrifier') && class_exists('DOMDocument')) { | 
                                                        |
| 227 | + include_once(WPINV_PLUGIN_DIR . 'includes/libraries/class-emogrifier.php');  | 
                                                        |
| 228 | 228 | }  | 
                                                        
| 229 | 229 | |
| 230 | - require_once( WPINV_PLUGIN_DIR . 'includes/admin/install.php' );  | 
                                                        |
| 230 | + require_once(WPINV_PLUGIN_DIR . 'includes/admin/install.php');  | 
                                                        |
| 231 | 231 | }  | 
                                                        
| 232 | 232 | |
| 233 | 233 |      public function init() { | 
                                                        
| 234 | 234 | }  | 
                                                        
| 235 | 235 | |
| 236 | 236 |      public function admin_init() { | 
                                                        
| 237 | - add_action( 'admin_print_scripts-edit.php', array( &$this, 'admin_print_scripts_edit_php' ) );  | 
                                                        |
| 237 | +        add_action('admin_print_scripts-edit.php', array(&$this, 'admin_print_scripts_edit_php')); | 
                                                        |
| 238 | 238 | }  | 
                                                        
| 239 | 239 | |
| 240 | 240 |      public function activation_redirect() { | 
                                                        
| 241 | 241 | // Bail if no activation redirect  | 
                                                        
| 242 | -        if ( !get_transient( '_wpinv_activation_redirect' ) ) { | 
                                                        |
| 242 | +        if (!get_transient('_wpinv_activation_redirect')) { | 
                                                        |
| 243 | 243 | return;  | 
                                                        
| 244 | 244 | }  | 
                                                        
| 245 | 245 | |
| 246 | 246 | // Delete the redirect transient  | 
                                                        
| 247 | - delete_transient( '_wpinv_activation_redirect' );  | 
                                                        |
| 247 | +        delete_transient('_wpinv_activation_redirect'); | 
                                                        |
| 248 | 248 | |
| 249 | 249 | // Bail if activating from network, or bulk  | 
                                                        
| 250 | -        if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) { | 
                                                        |
| 250 | +        if (is_network_admin() || isset($_GET['activate-multi'])) { | 
                                                        |
| 251 | 251 | return;  | 
                                                        
| 252 | 252 | }  | 
                                                        
| 253 | 253 | |
| 254 | - wp_safe_redirect( admin_url( 'admin.php?page=wpinv-settings&tab=general' ) );  | 
                                                        |
| 254 | +        wp_safe_redirect(admin_url('admin.php?page=wpinv-settings&tab=general')); | 
                                                        |
| 255 | 255 | exit;  | 
                                                        
| 256 | 256 | }  | 
                                                        
| 257 | 257 | |
| 258 | 258 |      public function enqueue_scripts() { | 
                                                        
| 259 | - $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';  | 
                                                        |
| 259 | +        $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min'; | 
                                                        |
| 260 | 260 | |
| 261 | - wp_register_style( 'wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), WPINV_VERSION );  | 
                                                        |
| 262 | - wp_enqueue_style( 'wpinv_front_style' );  | 
                                                        |
| 261 | +        wp_register_style('wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), WPINV_VERSION); | 
                                                        |
| 262 | +        wp_enqueue_style('wpinv_front_style'); | 
                                                        |
| 263 | 263 | |
| 264 | 264 | // Register scripts  | 
                                                        
| 265 | - wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );  | 
                                                        |
| 266 | - wp_register_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front.js', array( 'jquery' ), WPINV_VERSION );  | 
                                                        |
| 265 | +        wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '2.70', true); | 
                                                        |
| 266 | +        wp_register_script('wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front.js', array('jquery'), WPINV_VERSION); | 
                                                        |
| 267 | 267 | |
| 268 | 268 | $localize = array();  | 
                                                        
| 269 | - $localize['ajax_url'] = admin_url( 'admin-ajax.php' );  | 
                                                        |
| 270 | - $localize['nonce'] = wp_create_nonce( 'wpinv-nonce' );  | 
                                                        |
| 269 | +        $localize['ajax_url']             = admin_url('admin-ajax.php'); | 
                                                        |
| 270 | +        $localize['nonce']                = wp_create_nonce('wpinv-nonce'); | 
                                                        |
| 271 | 271 | $localize['currency_symbol'] = wpinv_currency_symbol();  | 
                                                        
| 272 | 272 | $localize['currency_pos'] = wpinv_currency_position();  | 
                                                        
| 273 | 273 | $localize['thousand_sep'] = wpinv_thousands_separator();  | 
                                                        
| 274 | 274 | $localize['decimal_sep'] = wpinv_decimal_separator();  | 
                                                        
| 275 | 275 | $localize['decimals'] = wpinv_decimals();  | 
                                                        
| 276 | - $localize['txtComplete'] = __( 'Complete', 'invoicing' );  | 
                                                        |
| 276 | +        $localize['txtComplete']          = __('Complete', 'invoicing'); | 
                                                        |
| 277 | 277 | $localize['UseTaxes'] = wpinv_use_taxes();  | 
                                                        
| 278 | - $localize['checkoutNonce'] = wp_create_nonce( 'wpinv_checkout_nonce' );  | 
                                                        |
| 278 | +        $localize['checkoutNonce']        = wp_create_nonce('wpinv_checkout_nonce'); | 
                                                        |
| 279 | 279 | |
| 280 | - $localize = apply_filters( 'wpinv_front_js_localize', $localize );  | 
                                                        |
| 280 | +        $localize = apply_filters('wpinv_front_js_localize', $localize); | 
                                                        |
| 281 | 281 | |
| 282 | - wp_enqueue_script( 'jquery-blockui' );  | 
                                                        |
| 282 | +        wp_enqueue_script('jquery-blockui'); | 
                                                        |
| 283 | 283 |          $autofill_api = wpinv_get_option('address_autofill_api'); | 
                                                        
| 284 | 284 |          $autofill_active = wpinv_get_option('address_autofill_active'); | 
                                                        
| 285 | -        if ( isset( $autofill_active ) && 1 == $autofill_active && !empty( $autofill_api ) && wpinv_is_checkout() ) { | 
                                                        |
| 286 | -            if ( wp_script_is( 'google-maps-api', 'enqueued' ) ) { | 
                                                        |
| 287 | - wp_dequeue_script( 'google-maps-api' );  | 
                                                        |
| 285 | +        if (isset($autofill_active) && 1 == $autofill_active && !empty($autofill_api) && wpinv_is_checkout()) { | 
                                                        |
| 286 | +            if (wp_script_is('google-maps-api', 'enqueued')) { | 
                                                        |
| 287 | +                wp_dequeue_script('google-maps-api'); | 
                                                        |
| 288 | 288 | }  | 
                                                        
| 289 | - wp_enqueue_script( 'google-maps-api', 'https://maps.googleapis.com/maps/api/js?key=' . $autofill_api . '&libraries=places', array( 'jquery' ), '', false );  | 
                                                        |
| 290 | - wp_enqueue_script( 'google-maps-init', WPINV_PLUGIN_URL . 'assets/js/gaaf.js', array( 'jquery', 'google-maps-api' ), '', true );  | 
                                                        |
| 289 | +            wp_enqueue_script('google-maps-api', 'https://maps.googleapis.com/maps/api/js?key=' . $autofill_api . '&libraries=places', array('jquery'), '', false); | 
                                                        |
| 290 | +            wp_enqueue_script('google-maps-init', WPINV_PLUGIN_URL . 'assets/js/gaaf.js', array('jquery', 'google-maps-api'), '', true); | 
                                                        |
| 291 | 291 | }  | 
                                                        
| 292 | 292 | |
| 293 | - wp_enqueue_style( "select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all' );  | 
                                                        |
| 294 | -        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array( 'jquery' ), WPINV_VERSION ); | 
                                                        |
| 293 | +        wp_enqueue_style("select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all'); | 
                                                        |
| 294 | +        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array('jquery'), WPINV_VERSION); | 
                                                        |
| 295 | 295 | |
| 296 | - wp_enqueue_script( 'wpinv-front-script' );  | 
                                                        |
| 297 | - wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );  | 
                                                        |
| 296 | +        wp_enqueue_script('wpinv-front-script'); | 
                                                        |
| 297 | +        wp_localize_script('wpinv-front-script', 'WPInv', $localize); | 
                                                        |
| 298 | 298 | }  | 
                                                        
| 299 | 299 | |
| 300 | 300 |      public function admin_enqueue_scripts() { | 
                                                        
| 301 | 301 | global $post, $pagenow;  | 
                                                        
| 302 | 302 | |
| 303 | 303 | $post_type = wpinv_admin_post_type();  | 
                                                        
| 304 | - $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';  | 
                                                        |
| 305 | - $page = isset( $_GET['page'] ) ? strtolower( $_GET['page'] ) : '';  | 
                                                        |
| 304 | +        $suffix     = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min'; | 
                                                        |
| 305 | + $page = isset($_GET['page']) ? strtolower($_GET['page']) : '';  | 
                                                        |
| 306 | 306 | |
| 307 | 307 | $jquery_ui_css = false;  | 
                                                        
| 308 | -        if ( ( $post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $post_type == 'wpi_discount' ) && ( $pagenow == 'post-new.php' || $pagenow == 'post.php' ) ) { | 
                                                        |
| 308 | +        if (($post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $post_type == 'wpi_discount') && ($pagenow == 'post-new.php' || $pagenow == 'post.php')) { | 
                                                        |
| 309 | 309 | $jquery_ui_css = true;  | 
                                                        
| 310 | -        } else if ( $page == 'wpinv-settings' || $page == 'wpinv-reports' ) { | 
                                                        |
| 310 | +        } else if ($page == 'wpinv-settings' || $page == 'wpinv-reports') { | 
                                                        |
| 311 | 311 | $jquery_ui_css = true;  | 
                                                        
| 312 | 312 | }  | 
                                                        
| 313 | -        if ( $jquery_ui_css ) { | 
                                                        |
| 314 | - wp_register_style( 'jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui' . $suffix . '.css', array(), '1.8.16' );  | 
                                                        |
| 315 | - wp_enqueue_style( 'jquery-ui-css' );  | 
                                                        |
| 313 | +        if ($jquery_ui_css) { | 
                                                        |
| 314 | +            wp_register_style('jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui' . $suffix . '.css', array(), '1.8.16'); | 
                                                        |
| 315 | +            wp_enqueue_style('jquery-ui-css'); | 
                                                        |
| 316 | 316 | }  | 
                                                        
| 317 | 317 | |
| 318 | - wp_register_style( 'wpinv_meta_box_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION );  | 
                                                        |
| 319 | - wp_enqueue_style( 'wpinv_meta_box_style' );  | 
                                                        |
| 318 | +        wp_register_style('wpinv_meta_box_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION); | 
                                                        |
| 319 | +        wp_enqueue_style('wpinv_meta_box_style'); | 
                                                        |
| 320 | 320 | |
| 321 | - wp_register_style( 'wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array(), WPINV_VERSION );  | 
                                                        |
| 322 | - wp_enqueue_style( 'wpinv_admin_style' );  | 
                                                        |
| 321 | +        wp_register_style('wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array(), WPINV_VERSION); | 
                                                        |
| 322 | +        wp_enqueue_style('wpinv_admin_style'); | 
                                                        |
| 323 | 323 | |
| 324 | - $enqueue = ( $post_type == 'wpi_discount' || $post_type == 'wpi_invoice' && ( $pagenow == 'post-new.php' || $pagenow == 'post.php' ) );  | 
                                                        |
| 325 | -        if ( $page == 'wpinv-subscriptions' ) { | 
                                                        |
| 326 | - wp_enqueue_script( 'jquery-ui-datepicker' );  | 
                                                        |
| 324 | + $enqueue = ($post_type == 'wpi_discount' || $post_type == 'wpi_invoice' && ($pagenow == 'post-new.php' || $pagenow == 'post.php'));  | 
                                                        |
| 325 | +        if ($page == 'wpinv-subscriptions') { | 
                                                        |
| 326 | +            wp_enqueue_script('jquery-ui-datepicker'); | 
                                                        |
| 327 | 327 | }  | 
                                                        
| 328 | 328 | |
| 329 | -        if ( $enqueue_datepicker = apply_filters( 'wpinv_admin_enqueue_jquery_ui_datepicker', $enqueue ) ) { | 
                                                        |
| 330 | - wp_enqueue_script( 'jquery-ui-datepicker' );  | 
                                                        |
| 329 | +        if ($enqueue_datepicker = apply_filters('wpinv_admin_enqueue_jquery_ui_datepicker', $enqueue)) { | 
                                                        |
| 330 | +            wp_enqueue_script('jquery-ui-datepicker'); | 
                                                        |
| 331 | 331 | }  | 
                                                        
| 332 | 332 | |
| 333 | - wp_enqueue_style( 'wp-color-picker' );  | 
                                                        |
| 334 | - wp_enqueue_script( 'wp-color-picker' );  | 
                                                        |
| 333 | +        wp_enqueue_style('wp-color-picker'); | 
                                                        |
| 334 | +        wp_enqueue_script('wp-color-picker'); | 
                                                        |
| 335 | 335 | |
| 336 | - wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );  | 
                                                        |
| 336 | +        wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '2.70', true); | 
                                                        |
| 337 | 337 | |
| 338 | 338 |          if (($post_type == 'wpi_invoice' || $post_type == 'wpi_quote') && ($pagenow == 'post-new.php' || $pagenow == 'post.php')) { | 
                                                        
| 339 | 339 |              $autofill_api = wpinv_get_option('address_autofill_api'); | 
                                                        
@@ -344,20 +344,20 @@ discard block  | 
                                                    ||
| 344 | 344 | }  | 
                                                        
| 345 | 345 | }  | 
                                                        
| 346 | 346 | |
| 347 | - wp_enqueue_style( "select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all' );  | 
                                                        |
| 348 | -        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array( 'jquery' ), WPINV_VERSION ); | 
                                                        |
| 347 | +        wp_enqueue_style("select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all'); | 
                                                        |
| 348 | +        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array('jquery'), WPINV_VERSION); | 
                                                        |
| 349 | 349 | |
| 350 | - wp_register_script( 'wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array( 'jquery', 'jquery-blockui','jquery-ui-tooltip' ), WPINV_VERSION );  | 
                                                        |
| 351 | - wp_enqueue_script( 'wpinv-admin-script' );  | 
                                                        |
| 350 | +        wp_register_script('wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array('jquery', 'jquery-blockui', 'jquery-ui-tooltip'), WPINV_VERSION); | 
                                                        |
| 351 | +        wp_enqueue_script('wpinv-admin-script'); | 
                                                        |
| 352 | 352 | |
| 353 | 353 | $localize = array();  | 
                                                        
| 354 | - $localize['ajax_url'] = admin_url( 'admin-ajax.php' );  | 
                                                        |
| 355 | - $localize['post_ID'] = isset( $post->ID ) ? $post->ID : '';  | 
                                                        |
| 356 | - $localize['wpinv_nonce'] = wp_create_nonce( 'wpinv-nonce' );  | 
                                                        |
| 357 | - $localize['add_invoice_note_nonce'] = wp_create_nonce( 'add-invoice-note' );  | 
                                                        |
| 358 | - $localize['delete_invoice_note_nonce'] = wp_create_nonce( 'delete-invoice-note' );  | 
                                                        |
| 359 | - $localize['invoice_item_nonce'] = wp_create_nonce( 'invoice-item' );  | 
                                                        |
| 360 | - $localize['billing_details_nonce'] = wp_create_nonce( 'get-billing-details' );  | 
                                                        |
| 354 | +        $localize['ajax_url']                   = admin_url('admin-ajax.php'); | 
                                                        |
| 355 | + $localize['post_ID'] = isset($post->ID) ? $post->ID : '';  | 
                                                        |
| 356 | +        $localize['wpinv_nonce']                = wp_create_nonce('wpinv-nonce'); | 
                                                        |
| 357 | +        $localize['add_invoice_note_nonce']     = wp_create_nonce('add-invoice-note'); | 
                                                        |
| 358 | +        $localize['delete_invoice_note_nonce']  = wp_create_nonce('delete-invoice-note'); | 
                                                        |
| 359 | +        $localize['invoice_item_nonce']         = wp_create_nonce('invoice-item'); | 
                                                        |
| 360 | +        $localize['billing_details_nonce']      = wp_create_nonce('get-billing-details'); | 
                                                        |
| 361 | 361 | $localize['tax'] = wpinv_tax_amount();  | 
                                                        
| 362 | 362 | $localize['discount'] = wpinv_discount_amount();  | 
                                                        
| 363 | 363 | $localize['currency_symbol'] = wpinv_currency_symbol();  | 
                                                        
@@ -365,69 +365,69 @@ discard block  | 
                                                    ||
| 365 | 365 | $localize['thousand_sep'] = wpinv_thousands_separator();  | 
                                                        
| 366 | 366 | $localize['decimal_sep'] = wpinv_decimal_separator();  | 
                                                        
| 367 | 367 | $localize['decimals'] = wpinv_decimals();  | 
                                                        
| 368 | - $localize['save_invoice'] = __( 'Save Invoice', 'invoicing' );  | 
                                                        |
| 369 | - $localize['status_publish'] = wpinv_status_nicename( 'publish' );  | 
                                                        |
| 370 | - $localize['status_pending'] = wpinv_status_nicename( 'wpi-pending' );  | 
                                                        |
| 371 | - $localize['delete_tax_rate'] = __( 'Are you sure you wish to delete this tax rate?', 'invoicing' );  | 
                                                        |
| 372 | - $localize['OneItemMin'] = __( 'Invoice must contain at least one item', 'invoicing' );  | 
                                                        |
| 373 | - $localize['DeleteInvoiceItem'] = __( 'Are you sure you wish to delete this item?', 'invoicing' );  | 
                                                        |
| 374 | - $localize['FillBillingDetails'] = __( 'Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing' );  | 
                                                        |
| 375 | - $localize['confirmCalcTotals'] = __( 'Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing' );  | 
                                                        |
| 376 | - $localize['AreYouSure'] = __( 'Are you sure?', 'invoicing' );  | 
                                                        |
| 377 | - $localize['emptyInvoice'] = __( 'Add at least one item to save invoice!', 'invoicing' );  | 
                                                        |
| 378 | - $localize['errDeleteItem'] = __( 'This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing' );  | 
                                                        |
| 379 | - $localize['delete_subscription'] = __( 'Are you sure you want to delete this subscription?', 'invoicing' );  | 
                                                        |
| 380 | - $localize['action_edit'] = __( 'Edit', 'invoicing' );  | 
                                                        |
| 381 | - $localize['action_cancel'] = __( 'Cancel', 'invoicing' );  | 
                                                        |
| 382 | -  | 
                                                        |
| 383 | - $localize = apply_filters( 'wpinv_admin_js_localize', $localize );  | 
                                                        |
| 384 | -  | 
                                                        |
| 385 | - wp_localize_script( 'wpinv-admin-script', 'WPInv_Admin', $localize );  | 
                                                        |
| 386 | -  | 
                                                        |
| 387 | -        if ( $page == 'wpinv-subscriptions' ) { | 
                                                        |
| 388 | - wp_register_script( 'wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions.js', array( 'wpinv-admin-script' ), WPINV_VERSION );  | 
                                                        |
| 389 | - wp_enqueue_script( 'wpinv-sub-admin-script' );  | 
                                                        |
| 368 | +        $localize['save_invoice']               = __('Save Invoice', 'invoicing'); | 
                                                        |
| 369 | +        $localize['status_publish']             = wpinv_status_nicename('publish'); | 
                                                        |
| 370 | +        $localize['status_pending']             = wpinv_status_nicename('wpi-pending'); | 
                                                        |
| 371 | +        $localize['delete_tax_rate']            = __('Are you sure you wish to delete this tax rate?', 'invoicing'); | 
                                                        |
| 372 | +        $localize['OneItemMin']                 = __('Invoice must contain at least one item', 'invoicing'); | 
                                                        |
| 373 | +        $localize['DeleteInvoiceItem']          = __('Are you sure you wish to delete this item?', 'invoicing'); | 
                                                        |
| 374 | +        $localize['FillBillingDetails']         = __('Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing'); | 
                                                        |
| 375 | +        $localize['confirmCalcTotals']          = __('Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing'); | 
                                                        |
| 376 | +        $localize['AreYouSure']                 = __('Are you sure?', 'invoicing'); | 
                                                        |
| 377 | +        $localize['emptyInvoice']               = __('Add at least one item to save invoice!', 'invoicing'); | 
                                                        |
| 378 | +        $localize['errDeleteItem']              = __('This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing'); | 
                                                        |
| 379 | +        $localize['delete_subscription']        = __('Are you sure you want to delete this subscription?', 'invoicing'); | 
                                                        |
| 380 | +        $localize['action_edit']                = __('Edit', 'invoicing'); | 
                                                        |
| 381 | +        $localize['action_cancel']              = __('Cancel', 'invoicing'); | 
                                                        |
| 382 | +  | 
                                                        |
| 383 | +        $localize = apply_filters('wpinv_admin_js_localize', $localize); | 
                                                        |
| 384 | +  | 
                                                        |
| 385 | +        wp_localize_script('wpinv-admin-script', 'WPInv_Admin', $localize); | 
                                                        |
| 386 | +  | 
                                                        |
| 387 | +        if ($page == 'wpinv-subscriptions') { | 
                                                        |
| 388 | +            wp_register_script('wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions.js', array('wpinv-admin-script'), WPINV_VERSION); | 
                                                        |
| 389 | +            wp_enqueue_script('wpinv-sub-admin-script'); | 
                                                        |
| 390 | 390 | }  | 
                                                        
| 391 | 391 | }  | 
                                                        
| 392 | 392 | |
| 393 | -    public function admin_body_class( $classes ) { | 
                                                        |
| 393 | +    public function admin_body_class($classes) { | 
                                                        |
| 394 | 394 | global $pagenow, $post, $current_screen;  | 
                                                        
| 395 | 395 | |
| 396 | -        if ( !empty( $current_screen->post_type ) && ( $current_screen->post_type == 'wpi_invoice' || $current_screen->post_type == 'wpi_quote' ) ) { | 
                                                        |
| 396 | +        if (!empty($current_screen->post_type) && ($current_screen->post_type == 'wpi_invoice' || $current_screen->post_type == 'wpi_quote')) { | 
                                                        |
| 397 | 397 | $classes .= ' wpinv-cpt';  | 
                                                        
| 398 | 398 | }  | 
                                                        
| 399 | 399 | |
| 400 | - $page = isset( $_GET['page'] ) ? strtolower( $_GET['page'] ) : false;  | 
                                                        |
| 400 | + $page = isset($_GET['page']) ? strtolower($_GET['page']) : false;  | 
                                                        |
| 401 | 401 | |
| 402 | - $add_class = $page && $pagenow == 'admin.php' && strpos( $page, 'wpinv-' ) === 0 ? true : false;  | 
                                                        |
| 403 | -        if ( $add_class ) { | 
                                                        |
| 404 | - $classes .= ' wpi-' . wpinv_sanitize_key( $page );  | 
                                                        |
| 402 | + $add_class = $page && $pagenow == 'admin.php' && strpos($page, 'wpinv-') === 0 ? true : false;  | 
                                                        |
| 403 | +        if ($add_class) { | 
                                                        |
| 404 | + $classes .= ' wpi-' . wpinv_sanitize_key($page);  | 
                                                        |
| 405 | 405 | }  | 
                                                        
| 406 | 406 | |
| 407 | 407 | $settings_class = array();  | 
                                                        
| 408 | -        if ( $page == 'wpinv-settings' ) { | 
                                                        |
| 409 | -            if ( !empty( $_REQUEST['tab'] ) ) { | 
                                                        |
| 410 | - $settings_class[] = sanitize_text_field( $_REQUEST['tab'] );  | 
                                                        |
| 408 | +        if ($page == 'wpinv-settings') { | 
                                                        |
| 409 | +            if (!empty($_REQUEST['tab'])) { | 
                                                        |
| 410 | + $settings_class[] = sanitize_text_field($_REQUEST['tab']);  | 
                                                        |
| 411 | 411 | }  | 
                                                        
| 412 | 412 | |
| 413 | -            if ( !empty( $_REQUEST['section'] ) ) { | 
                                                        |
| 414 | - $settings_class[] = sanitize_text_field( $_REQUEST['section'] );  | 
                                                        |
| 413 | +            if (!empty($_REQUEST['section'])) { | 
                                                        |
| 414 | + $settings_class[] = sanitize_text_field($_REQUEST['section']);  | 
                                                        |
| 415 | 415 | }  | 
                                                        
| 416 | 416 | |
| 417 | - $settings_class[] = isset( $_REQUEST['wpi_sub'] ) && $_REQUEST['wpi_sub'] !== '' ? sanitize_text_field( $_REQUEST['wpi_sub'] ) : 'main';  | 
                                                        |
| 417 | + $settings_class[] = isset($_REQUEST['wpi_sub']) && $_REQUEST['wpi_sub'] !== '' ? sanitize_text_field($_REQUEST['wpi_sub']) : 'main';  | 
                                                        |
| 418 | 418 | }  | 
                                                        
| 419 | 419 | |
| 420 | -        if ( !empty( $settings_class ) ) { | 
                                                        |
| 421 | - $classes .= ' wpi-' . wpinv_sanitize_key( implode( $settings_class, '-' ) );  | 
                                                        |
| 420 | +        if (!empty($settings_class)) { | 
                                                        |
| 421 | + $classes .= ' wpi-' . wpinv_sanitize_key(implode($settings_class, '-'));  | 
                                                        |
| 422 | 422 | }  | 
                                                        
| 423 | 423 | |
| 424 | 424 | $post_type = wpinv_admin_post_type();  | 
                                                        
| 425 | 425 | |
| 426 | -        if ( $post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $add_class !== false ) { | 
                                                        |
| 426 | +        if ($post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $add_class !== false) { | 
                                                        |
| 427 | 427 | return $classes .= ' wpinv';  | 
                                                        
| 428 | 428 | }  | 
                                                        
| 429 | 429 | |
| 430 | -        if ( $pagenow == 'post.php' && $post_type == 'wpi_item' && !empty( $post ) && !wpinv_item_is_editable( $post ) ) { | 
                                                        |
| 430 | +        if ($pagenow == 'post.php' && $post_type == 'wpi_item' && !empty($post) && !wpinv_item_is_editable($post)) { | 
                                                        |
| 431 | 431 | $classes .= ' wpi-editable-n';  | 
                                                        
| 432 | 432 | }  | 
                                                        
| 433 | 433 | |
@@ -439,21 +439,21 @@ discard block  | 
                                                    ||
| 439 | 439 | }  | 
                                                        
| 440 | 440 | |
| 441 | 441 |      public function wpinv_actions() { | 
                                                        
| 442 | -        if ( isset( $_REQUEST['wpi_action'] ) ) { | 
                                                        |
| 443 | - do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );  | 
                                                        |
| 442 | +        if (isset($_REQUEST['wpi_action'])) { | 
                                                        |
| 443 | +            do_action('wpinv_' . wpinv_sanitize_key($_REQUEST['wpi_action']), $_REQUEST); | 
                                                        |
| 444 | 444 | }  | 
                                                        
| 445 | 445 | }  | 
                                                        
| 446 | 446 | |
| 447 | -    public function pre_get_posts( $wp_query ) { | 
                                                        |
| 448 | -        if ( !empty( $wp_query->query_vars['post_type'] ) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) { | 
                                                        |
| 449 | - $wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses() );  | 
                                                        |
| 447 | +    public function pre_get_posts($wp_query) { | 
                                                        |
| 448 | +        if (!empty($wp_query->query_vars['post_type']) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query()) { | 
                                                        |
| 449 | + $wp_query->query_vars['post_status'] = array_keys(wpinv_get_invoice_statuses());  | 
                                                        |
| 450 | 450 | }  | 
                                                        
| 451 | 451 | |
| 452 | 452 | return $wp_query;  | 
                                                        
| 453 | 453 | }  | 
                                                        
| 454 | 454 | |
| 455 | 455 |      public function bp_invoicing_init() { | 
                                                        
| 456 | - require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php' );  | 
                                                        |
| 456 | + require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php');  | 
                                                        |
| 457 | 457 | }  | 
                                                        
| 458 | 458 | |
| 459 | 459 | /**  | 
                                                        
@@ -461,11 +461,11 @@ discard block  | 
                                                    ||
| 461 | 461 | *  | 
                                                        
| 462 | 462 | */  | 
                                                        
| 463 | 463 |  	public function register_widgets() { | 
                                                        
| 464 | - register_widget( "WPInv_Checkout_Widget" );  | 
                                                        |
| 465 | - register_widget( "WPInv_History_Widget" );  | 
                                                        |
| 466 | - register_widget( "WPInv_Receipt_Widget" );  | 
                                                        |
| 467 | - register_widget( "WPInv_Subscriptions_Widget" );  | 
                                                        |
| 468 | - register_widget( "WPInv_Buy_Item_Widget" );  | 
                                                        |
| 469 | - register_widget( "WPInv_Messages_Widget" );  | 
                                                        |
| 464 | +		register_widget("WPInv_Checkout_Widget"); | 
                                                        |
| 465 | +		register_widget("WPInv_History_Widget"); | 
                                                        |
| 466 | +		register_widget("WPInv_Receipt_Widget"); | 
                                                        |
| 467 | +		register_widget("WPInv_Subscriptions_Widget"); | 
                                                        |
| 468 | +		register_widget("WPInv_Buy_Item_Widget"); | 
                                                        |
| 469 | +		register_widget("WPInv_Messages_Widget"); | 
                                                        |
| 470 | 470 | }  | 
                                                        
| 471 | 471 | }  | 
                                                        
| 472 | 472 | \ No newline at end of file  | 
                                                        
@@ -1,6 +1,8 @@  | 
                                                    ||
| 1 | 1 | <?php  | 
                                                        
| 2 | 2 | // Exit if accessed directly  | 
                                                        
| 3 | -if ( ! defined( 'ABSPATH' ) ) exit;  | 
                                                        |
| 3 | +if ( ! defined( 'ABSPATH' ) ) { | 
                                                        |
| 4 | + exit;  | 
                                                        |
| 5 | +}  | 
                                                        |
| 4 | 6 | |
| 5 | 7 | add_action( 'wpinv_manual_cc_form', '__return_false' );  | 
                                                        
| 6 | 8 | add_filter( 'wpinv_manual_support_subscription', '__return_true' );  | 
                                                        
@@ -1,13 +1,13 @@ discard block  | 
                                                    ||
| 1 | 1 | <?php  | 
                                                        
| 2 | 2 | // Exit if accessed directly  | 
                                                        
| 3 | -if ( ! defined( 'ABSPATH' ) ) exit;  | 
                                                        |
| 3 | +if (!defined('ABSPATH')) exit; | 
                                                        |
| 4 | 4 | |
| 5 | -add_action( 'wpinv_manual_cc_form', '__return_false' );  | 
                                                        |
| 6 | -add_filter( 'wpinv_manual_support_subscription', '__return_true' );  | 
                                                        |
| 5 | +add_action('wpinv_manual_cc_form', '__return_false'); | 
                                                        |
| 6 | +add_filter('wpinv_manual_support_subscription', '__return_true'); | 
                                                        |
| 7 | 7 | |
| 8 | -function wpinv_process_manual_payment( $purchase_data ) { | 
                                                        |
| 9 | -    if( ! wp_verify_nonce( $purchase_data['gateway_nonce'], 'wpi-gateway' ) ) { | 
                                                        |
| 10 | - wp_die( __( 'Nonce verification has failed', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );  | 
                                                        |
| 8 | +function wpinv_process_manual_payment($purchase_data) { | 
                                                        |
| 9 | +    if (!wp_verify_nonce($purchase_data['gateway_nonce'], 'wpi-gateway')) { | 
                                                        |
| 10 | +        wp_die(__('Nonce verification has failed', 'invoicing'), __('Error', 'invoicing'), array('response' => 403)); | 
                                                        |
| 11 | 11 | }  | 
                                                        
| 12 | 12 | |
| 13 | 13 | /*  | 
                                                        
@@ -42,45 +42,45 @@ discard block  | 
                                                    ||
| 42 | 42 | );  | 
                                                        
| 43 | 43 | |
| 44 | 44 | // Record the pending payment  | 
                                                        
| 45 | - $invoice = wpinv_get_invoice( $purchase_data['invoice_id'] );  | 
                                                        |
| 45 | + $invoice = wpinv_get_invoice($purchase_data['invoice_id']);  | 
                                                        |
| 46 | 46 | |
| 47 | -    if ( !empty( $invoice ) ) {         | 
                                                        |
| 48 | - wpinv_set_payment_transaction_id( $invoice->ID, $invoice->generate_key() );  | 
                                                        |
| 49 | - wpinv_update_payment_status( $invoice, 'publish' );  | 
                                                        |
| 47 | +    if (!empty($invoice)) {         | 
                                                        |
| 48 | + wpinv_set_payment_transaction_id($invoice->ID, $invoice->generate_key());  | 
                                                        |
| 49 | + wpinv_update_payment_status($invoice, 'publish');  | 
                                                        |
| 50 | 50 | |
| 51 | 51 | // Empty the shopping cart  | 
                                                        
| 52 | 52 | wpinv_empty_cart();  | 
                                                        
| 53 | 53 | |
| 54 | 54 | // (Maybe) set recurring hooks.  | 
                                                        
| 55 | - wpinv_start_manual_subscription_profile( $purchase_data['invoice_id'] );  | 
                                                        |
| 55 | + wpinv_start_manual_subscription_profile($purchase_data['invoice_id']);  | 
                                                        |
| 56 | 56 | |
| 57 | - do_action( 'wpinv_send_to_success_page', $invoice->ID, $payment_data );  | 
                                                        |
| 57 | +        do_action('wpinv_send_to_success_page', $invoice->ID, $payment_data); | 
                                                        |
| 58 | 58 | |
| 59 | - wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );  | 
                                                        |
| 59 | +        wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key())); | 
                                                        |
| 60 | 60 |      } else { | 
                                                        
| 61 | - wpinv_record_gateway_error( __( 'Payment Error', 'invoicing' ), sprintf( __( 'Payment creation failed while processing a manual (free or test) purchase. Payment data: %s', 'invoicing' ), json_encode( $payment_data ) ), $invoice );  | 
                                                        |
| 61 | +        wpinv_record_gateway_error(__('Payment Error', 'invoicing'), sprintf(__('Payment creation failed while processing a manual (free or test) purchase. Payment data: %s', 'invoicing'), json_encode($payment_data)), $invoice); | 
                                                        |
| 62 | 62 | // If errors are present, send the user back to the purchase page so they can be corrected  | 
                                                        
| 63 | - wpinv_send_back_to_checkout( '?payment-mode=' . $purchase_data['post_data']['wpi-gateway'] );  | 
                                                        |
| 63 | +        wpinv_send_back_to_checkout('?payment-mode=' . $purchase_data['post_data']['wpi-gateway']); | 
                                                        |
| 64 | 64 | }  | 
                                                        
| 65 | 65 | }  | 
                                                        
| 66 | -add_action( 'wpinv_gateway_manual', 'wpinv_process_manual_payment' );  | 
                                                        |
| 66 | +add_action('wpinv_gateway_manual', 'wpinv_process_manual_payment'); | 
                                                        |
| 67 | 67 | |
| 68 | 68 | /**  | 
                                                        
| 69 | 69 | * Starts a manual subscription profile.  | 
                                                        
| 70 | 70 | */  | 
                                                        
| 71 | -function wpinv_start_manual_subscription_profile( $invoice_id ) { | 
                                                        |
| 71 | +function wpinv_start_manual_subscription_profile($invoice_id) { | 
                                                        |
| 72 | 72 | |
| 73 | 73 | // Retrieve the subscription.  | 
                                                        
| 74 | - $subscription = wpinv_get_subscription( $invoice_id );  | 
                                                        |
| 75 | -    if ( empty( $subscription ) ) { | 
                                                        |
| 74 | + $subscription = wpinv_get_subscription($invoice_id);  | 
                                                        |
| 75 | +    if (empty($subscription)) { | 
                                                        |
| 76 | 76 | return;  | 
                                                        
| 77 | 77 | }  | 
                                                        
| 78 | 78 | |
| 79 | 79 | // Schedule an action to run when the subscription expires.  | 
                                                        
| 80 | 80 | $action_id = as_schedule_single_action(  | 
                                                        
| 81 | - strtotime( $subscription->expiration ),  | 
                                                        |
| 81 | + strtotime($subscription->expiration),  | 
                                                        |
| 82 | 82 | 'wpinv_renew_manual_subscription_profile',  | 
                                                        
| 83 | - array( $invoice_id ),  | 
                                                        |
| 83 | + array($invoice_id),  | 
                                                        |
| 84 | 84 | 'invoicing'  | 
                                                        
| 85 | 85 | );  | 
                                                        
| 86 | 86 | |
@@ -97,11 +97,11 @@ discard block  | 
                                                    ||
| 97 | 97 | /**  | 
                                                        
| 98 | 98 | * Renews a manual subscription profile.  | 
                                                        
| 99 | 99 | */  | 
                                                        
| 100 | -function wpinv_renew_manual_subscription_profile( $invoice_id ) { | 
                                                        |
| 100 | +function wpinv_renew_manual_subscription_profile($invoice_id) { | 
                                                        |
| 101 | 101 | |
| 102 | 102 | // Retrieve the subscription.  | 
                                                        
| 103 | - $subscription = wpinv_get_subscription( $invoice_id );  | 
                                                        |
| 104 | -    if ( empty( $subscription ) ) { | 
                                                        |
| 103 | + $subscription = wpinv_get_subscription($invoice_id);  | 
                                                        |
| 104 | +    if (empty($subscription)) { | 
                                                        |
| 105 | 105 | return;  | 
                                                        
| 106 | 106 | }  | 
                                                        
| 107 | 107 | |
@@ -109,29 +109,29 @@ discard block  | 
                                                    ||
| 109 | 109 | $max_bills = $subscription->bill_times;  | 
                                                        
| 110 | 110 | |
| 111 | 111 | // If we have not maxed out on bill times...  | 
                                                        
| 112 | -    if ( empty( $bill_times ) || $times_billed > $max_bills ) { | 
                                                        |
| 112 | +    if (empty($bill_times) || $times_billed > $max_bills) { | 
                                                        |
| 113 | 113 | |
| 114 | 114 | // Renew the subscription.  | 
                                                        
| 115 | - $subscription->add_payment( array(  | 
                                                        |
| 115 | + $subscription->add_payment(array(  | 
                                                        |
| 116 | 116 | 'amount' => $subscription->recurring_amount,  | 
                                                        
| 117 | 117 | 'transaction_id' => time(),  | 
                                                        
| 118 | 118 | 'gateway' => 'manual'  | 
                                                        
| 119 | - ) );  | 
                                                        |
| 119 | + ));  | 
                                                        |
| 120 | 120 | |
| 121 | 121 | // Calculate the new expiration.  | 
                                                        
| 122 | -        $new_expiration = strtotime( "+ {$subscription->frequency} {$subscription->period}", strtotime( $subscription->expiration ) ); | 
                                                        |
| 122 | +        $new_expiration = strtotime("+ {$subscription->frequency} {$subscription->period}", strtotime($subscription->expiration)); | 
                                                        |
| 123 | 123 | |
| 124 | 124 | // Schedule an action to run when the subscription expires.  | 
                                                        
| 125 | 125 | $action_id = as_schedule_single_action(  | 
                                                        
| 126 | 126 | $new_expiration,  | 
                                                        
| 127 | 127 | 'wpinv_renew_manual_subscription_profile',  | 
                                                        
| 128 | - array( $invoice_id ),  | 
                                                        |
| 128 | + array($invoice_id),  | 
                                                        |
| 129 | 129 | 'invoicing'  | 
                                                        
| 130 | 130 | );  | 
                                                        
| 131 | 131 | |
| 132 | 132 | $subscription->update(  | 
                                                        
| 133 | 133 | array(  | 
                                                        
| 134 | - 'expiration' => date_i18n( 'Y-m-d H:i:s', $new_expiration ),  | 
                                                        |
| 134 | +                'expiration' => date_i18n('Y-m-d H:i:s', $new_expiration), | 
                                                        |
| 135 | 135 | 'status' => 'active',  | 
                                                        
| 136 | 136 | 'profile_id' => $action_id,  | 
                                                        
| 137 | 137 | )  | 
                                                        
@@ -149,4 +149,4 @@ discard block  | 
                                                    ||
| 149 | 149 | }  | 
                                                        
| 150 | 150 | |
| 151 | 151 | }  | 
                                                        
| 152 | -add_action( 'wpinv_renew_manual_subscription_profile', 'wpinv_renew_manual_subscription_profile' );  | 
                                                        |
| 152 | +add_action('wpinv_renew_manual_subscription_profile', 'wpinv_renew_manual_subscription_profile'); | 
                                                        |
@@ -13,7 +13,7 @@ discard block  | 
                                                    ||
| 13 | 13 | * @return string The action ID.  | 
                                                        
| 14 | 14 | */  | 
                                                        
| 15 | 15 |  function as_enqueue_async_action( $hook, $args = array(), $group = '' ) { | 
                                                        
| 16 | - return ActionScheduler::factory()->async( $hook, $args, $group );  | 
                                                        |
| 16 | + return ActionScheduler::factory()->async( $hook, $args, $group );  | 
                                                        |
| 17 | 17 | }  | 
                                                        
| 18 | 18 | |
| 19 | 19 | /**  | 
                                                        
@@ -27,7 +27,7 @@ discard block  | 
                                                    ||
| 27 | 27 | * @return string The job ID  | 
                                                        
| 28 | 28 | */  | 
                                                        
| 29 | 29 |  function as_schedule_single_action( $timestamp, $hook, $args = array(), $group = '' ) { | 
                                                        
| 30 | - return ActionScheduler::factory()->single( $hook, $args, $timestamp, $group );  | 
                                                        |
| 30 | + return ActionScheduler::factory()->single( $hook, $args, $timestamp, $group );  | 
                                                        |
| 31 | 31 | }  | 
                                                        
| 32 | 32 | |
| 33 | 33 | /**  | 
                                                        
@@ -42,7 +42,7 @@ discard block  | 
                                                    ||
| 42 | 42 | * @return string The job ID  | 
                                                        
| 43 | 43 | */  | 
                                                        
| 44 | 44 |  function as_schedule_recurring_action( $timestamp, $interval_in_seconds, $hook, $args = array(), $group = '' ) { | 
                                                        
| 45 | - return ActionScheduler::factory()->recurring( $hook, $args, $timestamp, $interval_in_seconds, $group );  | 
                                                        |
| 45 | + return ActionScheduler::factory()->recurring( $hook, $args, $timestamp, $interval_in_seconds, $group );  | 
                                                        |
| 46 | 46 | }  | 
                                                        
| 47 | 47 | |
| 48 | 48 | /**  | 
                                                        
@@ -69,7 +69,7 @@ discard block  | 
                                                    ||
| 69 | 69 | * @return string The job ID  | 
                                                        
| 70 | 70 | */  | 
                                                        
| 71 | 71 |  function as_schedule_cron_action( $timestamp, $schedule, $hook, $args = array(), $group = '' ) { | 
                                                        
| 72 | - return ActionScheduler::factory()->cron( $hook, $args, $timestamp, $schedule, $group );  | 
                                                        |
| 72 | + return ActionScheduler::factory()->cron( $hook, $args, $timestamp, $schedule, $group );  | 
                                                        |
| 73 | 73 | }  | 
                                                        
| 74 | 74 | |
| 75 | 75 | /**  | 
                                                        
@@ -89,20 +89,20 @@ discard block  | 
                                                    ||
| 89 | 89 | * @return string The scheduled action ID if a scheduled action was found, or empty string if no matching action found.  | 
                                                        
| 90 | 90 | */  | 
                                                        
| 91 | 91 |  function as_unschedule_action( $hook, $args = array(), $group = '' ) { | 
                                                        
| 92 | - $params = array();  | 
                                                        |
| 93 | -	if ( is_array($args) ) { | 
                                                        |
| 94 | - $params['args'] = $args;  | 
                                                        |
| 95 | - }  | 
                                                        |
| 96 | -	if ( !empty($group) ) { | 
                                                        |
| 97 | - $params['group'] = $group;  | 
                                                        |
| 98 | - }  | 
                                                        |
| 99 | - $job_id = ActionScheduler::store()->find_action( $hook, $params );  | 
                                                        |
| 100 | -  | 
                                                        |
| 101 | -	if ( ! empty( $job_id ) ) { | 
                                                        |
| 102 | - ActionScheduler::store()->cancel_action( $job_id );  | 
                                                        |
| 103 | - }  | 
                                                        |
| 104 | -  | 
                                                        |
| 105 | - return $job_id;  | 
                                                        |
| 92 | + $params = array();  | 
                                                        |
| 93 | +    if ( is_array($args) ) { | 
                                                        |
| 94 | + $params['args'] = $args;  | 
                                                        |
| 95 | + }  | 
                                                        |
| 96 | +    if ( !empty($group) ) { | 
                                                        |
| 97 | + $params['group'] = $group;  | 
                                                        |
| 98 | + }  | 
                                                        |
| 99 | + $job_id = ActionScheduler::store()->find_action( $hook, $params );  | 
                                                        |
| 100 | +  | 
                                                        |
| 101 | +    if ( ! empty( $job_id ) ) { | 
                                                        |
| 102 | + ActionScheduler::store()->cancel_action( $job_id );  | 
                                                        |
| 103 | + }  | 
                                                        |
| 104 | +  | 
                                                        |
| 105 | + return $job_id;  | 
                                                        |
| 106 | 106 | }  | 
                                                        
| 107 | 107 | |
| 108 | 108 | /**  | 
                                                        
@@ -113,19 +113,19 @@ discard block  | 
                                                    ||
| 113 | 113 | * @param string $group  | 
                                                        
| 114 | 114 | */  | 
                                                        
| 115 | 115 |  function as_unschedule_all_actions( $hook, $args = array(), $group = '' ) { | 
                                                        
| 116 | -	if ( empty( $args ) ) { | 
                                                        |
| 117 | -		if ( ! empty( $hook ) && empty( $group ) ) { | 
                                                        |
| 118 | - ActionScheduler_Store::instance()->cancel_actions_by_hook( $hook );  | 
                                                        |
| 119 | - return;  | 
                                                        |
| 120 | - }  | 
                                                        |
| 121 | -		if ( ! empty( $group ) && empty( $hook ) ) { | 
                                                        |
| 122 | - ActionScheduler_Store::instance()->cancel_actions_by_group( $group );  | 
                                                        |
| 123 | - return;  | 
                                                        |
| 124 | - }  | 
                                                        |
| 125 | - }  | 
                                                        |
| 126 | -	do { | 
                                                        |
| 127 | - $unscheduled_action = as_unschedule_action( $hook, $args, $group );  | 
                                                        |
| 128 | - } while ( ! empty( $unscheduled_action ) );  | 
                                                        |
| 116 | +    if ( empty( $args ) ) { | 
                                                        |
| 117 | +        if ( ! empty( $hook ) && empty( $group ) ) { | 
                                                        |
| 118 | + ActionScheduler_Store::instance()->cancel_actions_by_hook( $hook );  | 
                                                        |
| 119 | + return;  | 
                                                        |
| 120 | + }  | 
                                                        |
| 121 | +        if ( ! empty( $group ) && empty( $hook ) ) { | 
                                                        |
| 122 | + ActionScheduler_Store::instance()->cancel_actions_by_group( $group );  | 
                                                        |
| 123 | + return;  | 
                                                        |
| 124 | + }  | 
                                                        |
| 125 | + }  | 
                                                        |
| 126 | +    do { | 
                                                        |
| 127 | + $unscheduled_action = as_unschedule_action( $hook, $args, $group );  | 
                                                        |
| 128 | + } while ( ! empty( $unscheduled_action ) );  | 
                                                        |
| 129 | 129 | }  | 
                                                        
| 130 | 130 | |
| 131 | 131 | /**  | 
                                                        
@@ -144,33 +144,33 @@ discard block  | 
                                                    ||
| 144 | 144 | * @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.  | 
                                                        
| 145 | 145 | */  | 
                                                        
| 146 | 146 |  function as_next_scheduled_action( $hook, $args = NULL, $group = '' ) { | 
                                                        
| 147 | - $params = array();  | 
                                                        |
| 148 | -	if ( is_array($args) ) { | 
                                                        |
| 149 | - $params['args'] = $args;  | 
                                                        |
| 150 | - }  | 
                                                        |
| 151 | -	if ( !empty($group) ) { | 
                                                        |
| 152 | - $params['group'] = $group;  | 
                                                        |
| 153 | - }  | 
                                                        |
| 154 | -  | 
                                                        |
| 155 | - $params['status'] = ActionScheduler_Store::STATUS_RUNNING;  | 
                                                        |
| 156 | - $job_id = ActionScheduler::store()->find_action( $hook, $params );  | 
                                                        |
| 157 | -	if ( ! empty( $job_id ) ) { | 
                                                        |
| 158 | - return true;  | 
                                                        |
| 159 | - }  | 
                                                        |
| 160 | -  | 
                                                        |
| 161 | - $params['status'] = ActionScheduler_Store::STATUS_PENDING;  | 
                                                        |
| 162 | - $job_id = ActionScheduler::store()->find_action( $hook, $params );  | 
                                                        |
| 163 | -	if ( empty($job_id) ) { | 
                                                        |
| 164 | - return false;  | 
                                                        |
| 165 | - }  | 
                                                        |
| 166 | - $job = ActionScheduler::store()->fetch_action( $job_id );  | 
                                                        |
| 167 | - $scheduled_date = $job->get_schedule()->get_date();  | 
                                                        |
| 168 | -	if ( $scheduled_date ) { | 
                                                        |
| 169 | - return (int) $scheduled_date->format( 'U' );  | 
                                                        |
| 170 | -	} elseif ( NULL === $scheduled_date ) { // pending async action with NullSchedule | 
                                                        |
| 171 | - return true;  | 
                                                        |
| 172 | - }  | 
                                                        |
| 173 | - return false;  | 
                                                        |
| 147 | + $params = array();  | 
                                                        |
| 148 | +    if ( is_array($args) ) { | 
                                                        |
| 149 | + $params['args'] = $args;  | 
                                                        |
| 150 | + }  | 
                                                        |
| 151 | +    if ( !empty($group) ) { | 
                                                        |
| 152 | + $params['group'] = $group;  | 
                                                        |
| 153 | + }  | 
                                                        |
| 154 | +  | 
                                                        |
| 155 | + $params['status'] = ActionScheduler_Store::STATUS_RUNNING;  | 
                                                        |
| 156 | + $job_id = ActionScheduler::store()->find_action( $hook, $params );  | 
                                                        |
| 157 | +    if ( ! empty( $job_id ) ) { | 
                                                        |
| 158 | + return true;  | 
                                                        |
| 159 | + }  | 
                                                        |
| 160 | +  | 
                                                        |
| 161 | + $params['status'] = ActionScheduler_Store::STATUS_PENDING;  | 
                                                        |
| 162 | + $job_id = ActionScheduler::store()->find_action( $hook, $params );  | 
                                                        |
| 163 | +    if ( empty($job_id) ) { | 
                                                        |
| 164 | + return false;  | 
                                                        |
| 165 | + }  | 
                                                        |
| 166 | + $job = ActionScheduler::store()->fetch_action( $job_id );  | 
                                                        |
| 167 | + $scheduled_date = $job->get_schedule()->get_date();  | 
                                                        |
| 168 | +    if ( $scheduled_date ) { | 
                                                        |
| 169 | + return (int) $scheduled_date->format( 'U' );  | 
                                                        |
| 170 | +    } elseif ( NULL === $scheduled_date ) { // pending async action with NullSchedule | 
                                                        |
| 171 | + return true;  | 
                                                        |
| 172 | + }  | 
                                                        |
| 173 | + return false;  | 
                                                        |
| 174 | 174 | }  | 
                                                        
| 175 | 175 | |
| 176 | 176 | /**  | 
                                                        
@@ -196,30 +196,30 @@ discard block  | 
                                                    ||
| 196 | 196 | * @return array  | 
                                                        
| 197 | 197 | */  | 
                                                        
| 198 | 198 |  function as_get_scheduled_actions( $args = array(), $return_format = OBJECT ) { | 
                                                        
| 199 | - $store = ActionScheduler::store();  | 
                                                        |
| 200 | -	foreach ( array('date', 'modified') as $key ) { | 
                                                        |
| 201 | -		if ( isset($args[$key]) ) { | 
                                                        |
| 202 | - $args[$key] = as_get_datetime_object($args[$key]);  | 
                                                        |
| 203 | - }  | 
                                                        |
| 204 | - }  | 
                                                        |
| 205 | - $ids = $store->query_actions( $args );  | 
                                                        |
| 206 | -  | 
                                                        |
| 207 | -	if ( $return_format == 'ids' || $return_format == 'int' ) { | 
                                                        |
| 208 | - return $ids;  | 
                                                        |
| 209 | - }  | 
                                                        |
| 210 | -  | 
                                                        |
| 211 | - $actions = array();  | 
                                                        |
| 212 | -	foreach ( $ids as $action_id ) { | 
                                                        |
| 213 | - $actions[$action_id] = $store->fetch_action( $action_id );  | 
                                                        |
| 214 | - }  | 
                                                        |
| 215 | -  | 
                                                        |
| 216 | -	if ( $return_format == ARRAY_A ) { | 
                                                        |
| 217 | -		foreach ( $actions as $action_id => $action_object ) { | 
                                                        |
| 218 | - $actions[$action_id] = get_object_vars($action_object);  | 
                                                        |
| 219 | - }  | 
                                                        |
| 220 | - }  | 
                                                        |
| 221 | -  | 
                                                        |
| 222 | - return $actions;  | 
                                                        |
| 199 | + $store = ActionScheduler::store();  | 
                                                        |
| 200 | +    foreach ( array('date', 'modified') as $key ) { | 
                                                        |
| 201 | +        if ( isset($args[$key]) ) { | 
                                                        |
| 202 | + $args[$key] = as_get_datetime_object($args[$key]);  | 
                                                        |
| 203 | + }  | 
                                                        |
| 204 | + }  | 
                                                        |
| 205 | + $ids = $store->query_actions( $args );  | 
                                                        |
| 206 | +  | 
                                                        |
| 207 | +    if ( $return_format == 'ids' || $return_format == 'int' ) { | 
                                                        |
| 208 | + return $ids;  | 
                                                        |
| 209 | + }  | 
                                                        |
| 210 | +  | 
                                                        |
| 211 | + $actions = array();  | 
                                                        |
| 212 | +    foreach ( $ids as $action_id ) { | 
                                                        |
| 213 | + $actions[$action_id] = $store->fetch_action( $action_id );  | 
                                                        |
| 214 | + }  | 
                                                        |
| 215 | +  | 
                                                        |
| 216 | +    if ( $return_format == ARRAY_A ) { | 
                                                        |
| 217 | +        foreach ( $actions as $action_id => $action_object ) { | 
                                                        |
| 218 | + $actions[$action_id] = get_object_vars($action_object);  | 
                                                        |
| 219 | + }  | 
                                                        |
| 220 | + }  | 
                                                        |
| 221 | +  | 
                                                        |
| 222 | + return $actions;  | 
                                                        |
| 223 | 223 | }  | 
                                                        
| 224 | 224 | |
| 225 | 225 | /**  | 
                                                        
@@ -240,12 +240,12 @@ discard block  | 
                                                    ||
| 240 | 240 | * @return ActionScheduler_DateTime  | 
                                                        
| 241 | 241 | */  | 
                                                        
| 242 | 242 |  function as_get_datetime_object( $date_string = null, $timezone = 'UTC' ) { | 
                                                        
| 243 | -	if ( is_object( $date_string ) && $date_string instanceof DateTime ) { | 
                                                        |
| 244 | - $date = new ActionScheduler_DateTime( $date_string->format( 'Y-m-d H:i:s' ), new DateTimeZone( $timezone ) );  | 
                                                        |
| 245 | -	} elseif ( is_numeric( $date_string ) ) { | 
                                                        |
| 246 | - $date = new ActionScheduler_DateTime( '@' . $date_string, new DateTimeZone( $timezone ) );  | 
                                                        |
| 247 | -	} else { | 
                                                        |
| 248 | - $date = new ActionScheduler_DateTime( $date_string, new DateTimeZone( $timezone ) );  | 
                                                        |
| 249 | - }  | 
                                                        |
| 250 | - return $date;  | 
                                                        |
| 243 | +    if ( is_object( $date_string ) && $date_string instanceof DateTime ) { | 
                                                        |
| 244 | + $date = new ActionScheduler_DateTime( $date_string->format( 'Y-m-d H:i:s' ), new DateTimeZone( $timezone ) );  | 
                                                        |
| 245 | +    } elseif ( is_numeric( $date_string ) ) { | 
                                                        |
| 246 | + $date = new ActionScheduler_DateTime( '@' . $date_string, new DateTimeZone( $timezone ) );  | 
                                                        |
| 247 | +    } else { | 
                                                        |
| 248 | + $date = new ActionScheduler_DateTime( $date_string, new DateTimeZone( $timezone ) );  | 
                                                        |
| 249 | + }  | 
                                                        |
| 250 | + return $date;  | 
                                                        |
| 251 | 251 | }  | 
                                                        
@@ -12,8 +12,8 @@ discard block  | 
                                                    ||
| 12 | 12 | * @param string $group The group to assign this job to.  | 
                                                        
| 13 | 13 | * @return string The action ID.  | 
                                                        
| 14 | 14 | */  | 
                                                        
| 15 | -function as_enqueue_async_action( $hook, $args = array(), $group = '' ) { | 
                                                        |
| 16 | - return ActionScheduler::factory()->async( $hook, $args, $group );  | 
                                                        |
| 15 | +function as_enqueue_async_action($hook, $args = array(), $group = '') { | 
                                                        |
| 16 | + return ActionScheduler::factory()->async($hook, $args, $group);  | 
                                                        |
| 17 | 17 | }  | 
                                                        
| 18 | 18 | |
| 19 | 19 | /**  | 
                                                        
@@ -26,8 +26,8 @@ discard block  | 
                                                    ||
| 26 | 26 | *  | 
                                                        
| 27 | 27 | * @return string The job ID  | 
                                                        
| 28 | 28 | */  | 
                                                        
| 29 | -function as_schedule_single_action( $timestamp, $hook, $args = array(), $group = '' ) { | 
                                                        |
| 30 | - return ActionScheduler::factory()->single( $hook, $args, $timestamp, $group );  | 
                                                        |
| 29 | +function as_schedule_single_action($timestamp, $hook, $args = array(), $group = '') { | 
                                                        |
| 30 | + return ActionScheduler::factory()->single($hook, $args, $timestamp, $group);  | 
                                                        |
| 31 | 31 | }  | 
                                                        
| 32 | 32 | |
| 33 | 33 | /**  | 
                                                        
@@ -41,8 +41,8 @@ discard block  | 
                                                    ||
| 41 | 41 | *  | 
                                                        
| 42 | 42 | * @return string The job ID  | 
                                                        
| 43 | 43 | */  | 
                                                        
| 44 | -function as_schedule_recurring_action( $timestamp, $interval_in_seconds, $hook, $args = array(), $group = '' ) { | 
                                                        |
| 45 | - return ActionScheduler::factory()->recurring( $hook, $args, $timestamp, $interval_in_seconds, $group );  | 
                                                        |
| 44 | +function as_schedule_recurring_action($timestamp, $interval_in_seconds, $hook, $args = array(), $group = '') { | 
                                                        |
| 45 | + return ActionScheduler::factory()->recurring($hook, $args, $timestamp, $interval_in_seconds, $group);  | 
                                                        |
| 46 | 46 | }  | 
                                                        
| 47 | 47 | |
| 48 | 48 | /**  | 
                                                        
@@ -68,8 +68,8 @@ discard block  | 
                                                    ||
| 68 | 68 | *  | 
                                                        
| 69 | 69 | * @return string The job ID  | 
                                                        
| 70 | 70 | */  | 
                                                        
| 71 | -function as_schedule_cron_action( $timestamp, $schedule, $hook, $args = array(), $group = '' ) { | 
                                                        |
| 72 | - return ActionScheduler::factory()->cron( $hook, $args, $timestamp, $schedule, $group );  | 
                                                        |
| 71 | +function as_schedule_cron_action($timestamp, $schedule, $hook, $args = array(), $group = '') { | 
                                                        |
| 72 | + return ActionScheduler::factory()->cron($hook, $args, $timestamp, $schedule, $group);  | 
                                                        |
| 73 | 73 | }  | 
                                                        
| 74 | 74 | |
| 75 | 75 | /**  | 
                                                        
@@ -88,18 +88,18 @@ discard block  | 
                                                    ||
| 88 | 88 | *  | 
                                                        
| 89 | 89 | * @return string The scheduled action ID if a scheduled action was found, or empty string if no matching action found.  | 
                                                        
| 90 | 90 | */  | 
                                                        
| 91 | -function as_unschedule_action( $hook, $args = array(), $group = '' ) { | 
                                                        |
| 91 | +function as_unschedule_action($hook, $args = array(), $group = '') { | 
                                                        |
| 92 | 92 | $params = array();  | 
                                                        
| 93 | -	if ( is_array($args) ) { | 
                                                        |
| 93 | +	if (is_array($args)) { | 
                                                        |
| 94 | 94 | $params['args'] = $args;  | 
                                                        
| 95 | 95 | }  | 
                                                        
| 96 | -	if ( !empty($group) ) { | 
                                                        |
| 96 | +	if (!empty($group)) { | 
                                                        |
| 97 | 97 | $params['group'] = $group;  | 
                                                        
| 98 | 98 | }  | 
                                                        
| 99 | - $job_id = ActionScheduler::store()->find_action( $hook, $params );  | 
                                                        |
| 99 | + $job_id = ActionScheduler::store()->find_action($hook, $params);  | 
                                                        |
| 100 | 100 | |
| 101 | -	if ( ! empty( $job_id ) ) { | 
                                                        |
| 102 | - ActionScheduler::store()->cancel_action( $job_id );  | 
                                                        |
| 101 | +	if (!empty($job_id)) { | 
                                                        |
| 102 | + ActionScheduler::store()->cancel_action($job_id);  | 
                                                        |
| 103 | 103 | }  | 
                                                        
| 104 | 104 | |
| 105 | 105 | return $job_id;  | 
                                                        
@@ -112,20 +112,20 @@ discard block  | 
                                                    ||
| 112 | 112 | * @param array $args Args that would have been passed to the job  | 
                                                        
| 113 | 113 | * @param string $group  | 
                                                        
| 114 | 114 | */  | 
                                                        
| 115 | -function as_unschedule_all_actions( $hook, $args = array(), $group = '' ) { | 
                                                        |
| 116 | -	if ( empty( $args ) ) { | 
                                                        |
| 117 | -		if ( ! empty( $hook ) && empty( $group ) ) { | 
                                                        |
| 118 | - ActionScheduler_Store::instance()->cancel_actions_by_hook( $hook );  | 
                                                        |
| 115 | +function as_unschedule_all_actions($hook, $args = array(), $group = '') { | 
                                                        |
| 116 | +	if (empty($args)) { | 
                                                        |
| 117 | +		if (!empty($hook) && empty($group)) { | 
                                                        |
| 118 | + ActionScheduler_Store::instance()->cancel_actions_by_hook($hook);  | 
                                                        |
| 119 | 119 | return;  | 
                                                        
| 120 | 120 | }  | 
                                                        
| 121 | -		if ( ! empty( $group ) && empty( $hook ) ) { | 
                                                        |
| 122 | - ActionScheduler_Store::instance()->cancel_actions_by_group( $group );  | 
                                                        |
| 121 | +		if (!empty($group) && empty($hook)) { | 
                                                        |
| 122 | + ActionScheduler_Store::instance()->cancel_actions_by_group($group);  | 
                                                        |
| 123 | 123 | return;  | 
                                                        
| 124 | 124 | }  | 
                                                        
| 125 | 125 | }  | 
                                                        
| 126 | 126 |  	do { | 
                                                        
| 127 | - $unscheduled_action = as_unschedule_action( $hook, $args, $group );  | 
                                                        |
| 128 | - } while ( ! empty( $unscheduled_action ) );  | 
                                                        |
| 127 | + $unscheduled_action = as_unschedule_action($hook, $args, $group);  | 
                                                        |
| 128 | + } while (!empty($unscheduled_action));  | 
                                                        |
| 129 | 129 | }  | 
                                                        
| 130 | 130 | |
| 131 | 131 | /**  | 
                                                        
@@ -143,31 +143,31 @@ discard block  | 
                                                    ||
| 143 | 143 | *  | 
                                                        
| 144 | 144 | * @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.  | 
                                                        
| 145 | 145 | */  | 
                                                        
| 146 | -function as_next_scheduled_action( $hook, $args = NULL, $group = '' ) { | 
                                                        |
| 146 | +function as_next_scheduled_action($hook, $args = NULL, $group = '') { | 
                                                        |
| 147 | 147 | $params = array();  | 
                                                        
| 148 | -	if ( is_array($args) ) { | 
                                                        |
| 148 | +	if (is_array($args)) { | 
                                                        |
| 149 | 149 | $params['args'] = $args;  | 
                                                        
| 150 | 150 | }  | 
                                                        
| 151 | -	if ( !empty($group) ) { | 
                                                        |
| 151 | +	if (!empty($group)) { | 
                                                        |
| 152 | 152 | $params['group'] = $group;  | 
                                                        
| 153 | 153 | }  | 
                                                        
| 154 | 154 | |
| 155 | 155 | $params['status'] = ActionScheduler_Store::STATUS_RUNNING;  | 
                                                        
| 156 | - $job_id = ActionScheduler::store()->find_action( $hook, $params );  | 
                                                        |
| 157 | -	if ( ! empty( $job_id ) ) { | 
                                                        |
| 156 | + $job_id = ActionScheduler::store()->find_action($hook, $params);  | 
                                                        |
| 157 | +	if (!empty($job_id)) { | 
                                                        |
| 158 | 158 | return true;  | 
                                                        
| 159 | 159 | }  | 
                                                        
| 160 | 160 | |
| 161 | 161 | $params['status'] = ActionScheduler_Store::STATUS_PENDING;  | 
                                                        
| 162 | - $job_id = ActionScheduler::store()->find_action( $hook, $params );  | 
                                                        |
| 163 | -	if ( empty($job_id) ) { | 
                                                        |
| 162 | + $job_id = ActionScheduler::store()->find_action($hook, $params);  | 
                                                        |
| 163 | +	if (empty($job_id)) { | 
                                                        |
| 164 | 164 | return false;  | 
                                                        
| 165 | 165 | }  | 
                                                        
| 166 | - $job = ActionScheduler::store()->fetch_action( $job_id );  | 
                                                        |
| 166 | + $job = ActionScheduler::store()->fetch_action($job_id);  | 
                                                        |
| 167 | 167 | $scheduled_date = $job->get_schedule()->get_date();  | 
                                                        
| 168 | -	if ( $scheduled_date ) { | 
                                                        |
| 169 | - return (int) $scheduled_date->format( 'U' );  | 
                                                        |
| 170 | -	} elseif ( NULL === $scheduled_date ) { // pending async action with NullSchedule | 
                                                        |
| 168 | +	if ($scheduled_date) { | 
                                                        |
| 169 | +		return (int) $scheduled_date->format('U'); | 
                                                        |
| 170 | +	} elseif (NULL === $scheduled_date) { // pending async action with NullSchedule | 
                                                        |
| 171 | 171 | return true;  | 
                                                        
| 172 | 172 | }  | 
                                                        
| 173 | 173 | return false;  | 
                                                        
@@ -195,26 +195,26 @@ discard block  | 
                                                    ||
| 195 | 195 | *  | 
                                                        
| 196 | 196 | * @return array  | 
                                                        
| 197 | 197 | */  | 
                                                        
| 198 | -function as_get_scheduled_actions( $args = array(), $return_format = OBJECT ) { | 
                                                        |
| 198 | +function as_get_scheduled_actions($args = array(), $return_format = OBJECT) { | 
                                                        |
| 199 | 199 | $store = ActionScheduler::store();  | 
                                                        
| 200 | -	foreach ( array('date', 'modified') as $key ) { | 
                                                        |
| 201 | -		if ( isset($args[$key]) ) { | 
                                                        |
| 200 | +	foreach (array('date', 'modified') as $key) { | 
                                                        |
| 201 | +		if (isset($args[$key])) { | 
                                                        |
| 202 | 202 | $args[$key] = as_get_datetime_object($args[$key]);  | 
                                                        
| 203 | 203 | }  | 
                                                        
| 204 | 204 | }  | 
                                                        
| 205 | - $ids = $store->query_actions( $args );  | 
                                                        |
| 205 | + $ids = $store->query_actions($args);  | 
                                                        |
| 206 | 206 | |
| 207 | -	if ( $return_format == 'ids' || $return_format == 'int' ) { | 
                                                        |
| 207 | +	if ($return_format == 'ids' || $return_format == 'int') { | 
                                                        |
| 208 | 208 | return $ids;  | 
                                                        
| 209 | 209 | }  | 
                                                        
| 210 | 210 | |
| 211 | 211 | $actions = array();  | 
                                                        
| 212 | -	foreach ( $ids as $action_id ) { | 
                                                        |
| 213 | - $actions[$action_id] = $store->fetch_action( $action_id );  | 
                                                        |
| 212 | +	foreach ($ids as $action_id) { | 
                                                        |
| 213 | + $actions[$action_id] = $store->fetch_action($action_id);  | 
                                                        |
| 214 | 214 | }  | 
                                                        
| 215 | 215 | |
| 216 | -	if ( $return_format == ARRAY_A ) { | 
                                                        |
| 217 | -		foreach ( $actions as $action_id => $action_object ) { | 
                                                        |
| 216 | +	if ($return_format == ARRAY_A) { | 
                                                        |
| 217 | +		foreach ($actions as $action_id => $action_object) { | 
                                                        |
| 218 | 218 | $actions[$action_id] = get_object_vars($action_object);  | 
                                                        
| 219 | 219 | }  | 
                                                        
| 220 | 220 | }  | 
                                                        
@@ -239,13 +239,13 @@ discard block  | 
                                                    ||
| 239 | 239 | *  | 
                                                        
| 240 | 240 | * @return ActionScheduler_DateTime  | 
                                                        
| 241 | 241 | */  | 
                                                        
| 242 | -function as_get_datetime_object( $date_string = null, $timezone = 'UTC' ) { | 
                                                        |
| 243 | -	if ( is_object( $date_string ) && $date_string instanceof DateTime ) { | 
                                                        |
| 244 | - $date = new ActionScheduler_DateTime( $date_string->format( 'Y-m-d H:i:s' ), new DateTimeZone( $timezone ) );  | 
                                                        |
| 245 | -	} elseif ( is_numeric( $date_string ) ) { | 
                                                        |
| 246 | - $date = new ActionScheduler_DateTime( '@' . $date_string, new DateTimeZone( $timezone ) );  | 
                                                        |
| 242 | +function as_get_datetime_object($date_string = null, $timezone = 'UTC') { | 
                                                        |
| 243 | +	if (is_object($date_string) && $date_string instanceof DateTime) { | 
                                                        |
| 244 | +		$date = new ActionScheduler_DateTime($date_string->format('Y-m-d H:i:s'), new DateTimeZone($timezone)); | 
                                                        |
| 245 | +	} elseif (is_numeric($date_string)) { | 
                                                        |
| 246 | +		$date = new ActionScheduler_DateTime('@' . $date_string, new DateTimeZone($timezone)); | 
                                                        |
| 247 | 247 |  	} else { | 
                                                        
| 248 | - $date = new ActionScheduler_DateTime( $date_string, new DateTimeZone( $timezone ) );  | 
                                                        |
| 248 | + $date = new ActionScheduler_DateTime($date_string, new DateTimeZone($timezone));  | 
                                                        |
| 249 | 249 | }  | 
                                                        
| 250 | 250 | return $date;  | 
                                                        
| 251 | 251 | }  | 
                                                        
@@ -10,138 +10,138 @@  | 
                                                    ||
| 10 | 10 | */  | 
                                                        
| 11 | 11 |  class ActionScheduler_AdminView_Deprecated { | 
                                                        
| 12 | 12 | |
| 13 | -	public function action_scheduler_post_type_args( $args ) { | 
                                                        |
| 14 | - _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 15 | - return $args;  | 
                                                        |
| 16 | - }  | 
                                                        |
| 13 | +    public function action_scheduler_post_type_args( $args ) { | 
                                                        |
| 14 | + _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 15 | + return $args;  | 
                                                        |
| 16 | + }  | 
                                                        |
| 17 | 17 | |
| 18 | - /**  | 
                                                        |
| 19 | - * Customise the post status related views displayed on the Scheduled Actions administration screen.  | 
                                                        |
| 20 | - *  | 
                                                        |
| 21 | - * @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.  | 
                                                        |
| 22 | - * @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.  | 
                                                        |
| 23 | - */  | 
                                                        |
| 24 | -	public function list_table_views( $views ) { | 
                                                        |
| 25 | - _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 26 | - return $views;  | 
                                                        |
| 27 | - }  | 
                                                        |
| 18 | + /**  | 
                                                        |
| 19 | + * Customise the post status related views displayed on the Scheduled Actions administration screen.  | 
                                                        |
| 20 | + *  | 
                                                        |
| 21 | + * @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.  | 
                                                        |
| 22 | + * @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.  | 
                                                        |
| 23 | + */  | 
                                                        |
| 24 | +    public function list_table_views( $views ) { | 
                                                        |
| 25 | + _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 26 | + return $views;  | 
                                                        |
| 27 | + }  | 
                                                        |
| 28 | 28 | |
| 29 | - /**  | 
                                                        |
| 30 | - * Do not include the "Edit" action for the Scheduled Actions administration screen.  | 
                                                        |
| 31 | - *  | 
                                                        |
| 32 | - * Hooked to the 'bulk_actions-edit-action-scheduler' filter.  | 
                                                        |
| 33 | - *  | 
                                                        |
| 34 | - * @param array $actions An associative array of actions which can be performed on the 'scheduled-action' post type.  | 
                                                        |
| 35 | - * @return array $actions An associative array of actions which can be performed on the 'scheduled-action' post type.  | 
                                                        |
| 36 | - */  | 
                                                        |
| 37 | -	public function bulk_actions( $actions ) { | 
                                                        |
| 38 | - _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 39 | - return $actions;  | 
                                                        |
| 40 | - }  | 
                                                        |
| 29 | + /**  | 
                                                        |
| 30 | + * Do not include the "Edit" action for the Scheduled Actions administration screen.  | 
                                                        |
| 31 | + *  | 
                                                        |
| 32 | + * Hooked to the 'bulk_actions-edit-action-scheduler' filter.  | 
                                                        |
| 33 | + *  | 
                                                        |
| 34 | + * @param array $actions An associative array of actions which can be performed on the 'scheduled-action' post type.  | 
                                                        |
| 35 | + * @return array $actions An associative array of actions which can be performed on the 'scheduled-action' post type.  | 
                                                        |
| 36 | + */  | 
                                                        |
| 37 | +    public function bulk_actions( $actions ) { | 
                                                        |
| 38 | + _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 39 | + return $actions;  | 
                                                        |
| 40 | + }  | 
                                                        |
| 41 | 41 | |
| 42 | - /**  | 
                                                        |
| 43 | - * Completely customer the columns displayed on the Scheduled Actions administration screen.  | 
                                                        |
| 44 | - *  | 
                                                        |
| 45 | - * Because we can't filter the content of the default title and date columns, we need to recreate our own  | 
                                                        |
| 46 | - * custom columns for displaying those post fields. For the column content, @see self::list_table_column_content().  | 
                                                        |
| 47 | - *  | 
                                                        |
| 48 | - * @param array $columns An associative array of columns that are use for the table on the Scheduled Actions administration screen.  | 
                                                        |
| 49 | - * @return array $columns An associative array of columns that are use for the table on the Scheduled Actions administration screen.  | 
                                                        |
| 50 | - */  | 
                                                        |
| 51 | -	public function list_table_columns( $columns ) { | 
                                                        |
| 52 | - _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 53 | - return $columns;  | 
                                                        |
| 54 | - }  | 
                                                        |
| 42 | + /**  | 
                                                        |
| 43 | + * Completely customer the columns displayed on the Scheduled Actions administration screen.  | 
                                                        |
| 44 | + *  | 
                                                        |
| 45 | + * Because we can't filter the content of the default title and date columns, we need to recreate our own  | 
                                                        |
| 46 | + * custom columns for displaying those post fields. For the column content, @see self::list_table_column_content().  | 
                                                        |
| 47 | + *  | 
                                                        |
| 48 | + * @param array $columns An associative array of columns that are use for the table on the Scheduled Actions administration screen.  | 
                                                        |
| 49 | + * @return array $columns An associative array of columns that are use for the table on the Scheduled Actions administration screen.  | 
                                                        |
| 50 | + */  | 
                                                        |
| 51 | +    public function list_table_columns( $columns ) { | 
                                                        |
| 52 | + _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 53 | + return $columns;  | 
                                                        |
| 54 | + }  | 
                                                        |
| 55 | 55 | |
| 56 | - /**  | 
                                                        |
| 57 | - * Make our custom title & date columns use defaulting title & date sorting.  | 
                                                        |
| 58 | - *  | 
                                                        |
| 59 | - * @param array $columns An associative array of columns that can be used to sort the table on the Scheduled Actions administration screen.  | 
                                                        |
| 60 | - * @return array $columns An associative array of columns that can be used to sort the table on the Scheduled Actions administration screen.  | 
                                                        |
| 61 | - */  | 
                                                        |
| 62 | -	public static function list_table_sortable_columns( $columns ) { | 
                                                        |
| 63 | - _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 64 | - return $columns;  | 
                                                        |
| 65 | - }  | 
                                                        |
| 56 | + /**  | 
                                                        |
| 57 | + * Make our custom title & date columns use defaulting title & date sorting.  | 
                                                        |
| 58 | + *  | 
                                                        |
| 59 | + * @param array $columns An associative array of columns that can be used to sort the table on the Scheduled Actions administration screen.  | 
                                                        |
| 60 | + * @return array $columns An associative array of columns that can be used to sort the table on the Scheduled Actions administration screen.  | 
                                                        |
| 61 | + */  | 
                                                        |
| 62 | +    public static function list_table_sortable_columns( $columns ) { | 
                                                        |
| 63 | + _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 64 | + return $columns;  | 
                                                        |
| 65 | + }  | 
                                                        |
| 66 | 66 | |
| 67 | - /**  | 
                                                        |
| 68 | - * Print the content for our custom columns.  | 
                                                        |
| 69 | - *  | 
                                                        |
| 70 | - * @param string $column_name The key for the column for which we should output our content.  | 
                                                        |
| 71 | - * @param int $post_id The ID of the 'scheduled-action' post for which this row relates.  | 
                                                        |
| 72 | - */  | 
                                                        |
| 73 | -	public static function list_table_column_content( $column_name, $post_id ) { | 
                                                        |
| 74 | - _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 75 | - }  | 
                                                        |
| 67 | + /**  | 
                                                        |
| 68 | + * Print the content for our custom columns.  | 
                                                        |
| 69 | + *  | 
                                                        |
| 70 | + * @param string $column_name The key for the column for which we should output our content.  | 
                                                        |
| 71 | + * @param int $post_id The ID of the 'scheduled-action' post for which this row relates.  | 
                                                        |
| 72 | + */  | 
                                                        |
| 73 | +    public static function list_table_column_content( $column_name, $post_id ) { | 
                                                        |
| 74 | + _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 75 | + }  | 
                                                        |
| 76 | 76 | |
| 77 | - /**  | 
                                                        |
| 78 | - * Hide the inline "Edit" action for all 'scheduled-action' posts.  | 
                                                        |
| 79 | - *  | 
                                                        |
| 80 | - * Hooked to the 'post_row_actions' filter.  | 
                                                        |
| 81 | - *  | 
                                                        |
| 82 | - * @param array $actions An associative array of actions which can be performed on the 'scheduled-action' post type.  | 
                                                        |
| 83 | - * @return array $actions An associative array of actions which can be performed on the 'scheduled-action' post type.  | 
                                                        |
| 84 | - */  | 
                                                        |
| 85 | -	public static function row_actions( $actions, $post ) { | 
                                                        |
| 86 | - _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 87 | - return $actions;  | 
                                                        |
| 88 | - }  | 
                                                        |
| 77 | + /**  | 
                                                        |
| 78 | + * Hide the inline "Edit" action for all 'scheduled-action' posts.  | 
                                                        |
| 79 | + *  | 
                                                        |
| 80 | + * Hooked to the 'post_row_actions' filter.  | 
                                                        |
| 81 | + *  | 
                                                        |
| 82 | + * @param array $actions An associative array of actions which can be performed on the 'scheduled-action' post type.  | 
                                                        |
| 83 | + * @return array $actions An associative array of actions which can be performed on the 'scheduled-action' post type.  | 
                                                        |
| 84 | + */  | 
                                                        |
| 85 | +    public static function row_actions( $actions, $post ) { | 
                                                        |
| 86 | + _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 87 | + return $actions;  | 
                                                        |
| 88 | + }  | 
                                                        |
| 89 | 89 | |
| 90 | - /**  | 
                                                        |
| 91 | - * Run an action when triggered from the Action Scheduler administration screen.  | 
                                                        |
| 92 | - *  | 
                                                        |
| 93 | - * @codeCoverageIgnore  | 
                                                        |
| 94 | - */  | 
                                                        |
| 95 | -	public static function maybe_execute_action() { | 
                                                        |
| 96 | - _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 97 | - }  | 
                                                        |
| 90 | + /**  | 
                                                        |
| 91 | + * Run an action when triggered from the Action Scheduler administration screen.  | 
                                                        |
| 92 | + *  | 
                                                        |
| 93 | + * @codeCoverageIgnore  | 
                                                        |
| 94 | + */  | 
                                                        |
| 95 | +    public static function maybe_execute_action() { | 
                                                        |
| 96 | + _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 97 | + }  | 
                                                        |
| 98 | 98 | |
| 99 | - /**  | 
                                                        |
| 100 | - * Convert an interval of seconds into a two part human friendly string.  | 
                                                        |
| 101 | - *  | 
                                                        |
| 102 | - * The WordPress human_time_diff() function only calculates the time difference to one degree, meaning  | 
                                                        |
| 103 | - * even if an action is 1 day and 11 hours away, it will display "1 day". This funciton goes one step  | 
                                                        |
| 104 | - * further to display two degrees of accuracy.  | 
                                                        |
| 105 | - *  | 
                                                        |
| 106 | - * Based on Crontrol::interval() function by Edward Dale: https://wordpress.org/plugins/wp-crontrol/  | 
                                                        |
| 107 | - *  | 
                                                        |
| 108 | - * @param int $interval A interval in seconds.  | 
                                                        |
| 109 | - * @return string A human friendly string representation of the interval.  | 
                                                        |
| 110 | - */  | 
                                                        |
| 111 | -	public static function admin_notices() { | 
                                                        |
| 112 | - _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 113 | - }  | 
                                                        |
| 99 | + /**  | 
                                                        |
| 100 | + * Convert an interval of seconds into a two part human friendly string.  | 
                                                        |
| 101 | + *  | 
                                                        |
| 102 | + * The WordPress human_time_diff() function only calculates the time difference to one degree, meaning  | 
                                                        |
| 103 | + * even if an action is 1 day and 11 hours away, it will display "1 day". This funciton goes one step  | 
                                                        |
| 104 | + * further to display two degrees of accuracy.  | 
                                                        |
| 105 | + *  | 
                                                        |
| 106 | + * Based on Crontrol::interval() function by Edward Dale: https://wordpress.org/plugins/wp-crontrol/  | 
                                                        |
| 107 | + *  | 
                                                        |
| 108 | + * @param int $interval A interval in seconds.  | 
                                                        |
| 109 | + * @return string A human friendly string representation of the interval.  | 
                                                        |
| 110 | + */  | 
                                                        |
| 111 | +    public static function admin_notices() { | 
                                                        |
| 112 | + _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 113 | + }  | 
                                                        |
| 114 | 114 | |
| 115 | - /**  | 
                                                        |
| 116 | - * Filter search queries to allow searching by Claim ID (i.e. post_password).  | 
                                                        |
| 117 | - *  | 
                                                        |
| 118 | - * @param string $orderby MySQL orderby string.  | 
                                                        |
| 119 | - * @param WP_Query $query Instance of a WP_Query object  | 
                                                        |
| 120 | - * @return string MySQL orderby string.  | 
                                                        |
| 121 | - */  | 
                                                        |
| 122 | -	public function custom_orderby( $orderby, $query ){ | 
                                                        |
| 123 | - _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 124 | - }  | 
                                                        |
| 115 | + /**  | 
                                                        |
| 116 | + * Filter search queries to allow searching by Claim ID (i.e. post_password).  | 
                                                        |
| 117 | + *  | 
                                                        |
| 118 | + * @param string $orderby MySQL orderby string.  | 
                                                        |
| 119 | + * @param WP_Query $query Instance of a WP_Query object  | 
                                                        |
| 120 | + * @return string MySQL orderby string.  | 
                                                        |
| 121 | + */  | 
                                                        |
| 122 | +    public function custom_orderby( $orderby, $query ){ | 
                                                        |
| 123 | + _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 124 | + }  | 
                                                        |
| 125 | 125 | |
| 126 | - /**  | 
                                                        |
| 127 | - * Filter search queries to allow searching by Claim ID (i.e. post_password).  | 
                                                        |
| 128 | - *  | 
                                                        |
| 129 | - * @param string $search MySQL search string.  | 
                                                        |
| 130 | - * @param WP_Query $query Instance of a WP_Query object  | 
                                                        |
| 131 | - * @return string MySQL search string.  | 
                                                        |
| 132 | - */  | 
                                                        |
| 133 | -	public function search_post_password( $search, $query ) { | 
                                                        |
| 134 | - _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 135 | - }  | 
                                                        |
| 126 | + /**  | 
                                                        |
| 127 | + * Filter search queries to allow searching by Claim ID (i.e. post_password).  | 
                                                        |
| 128 | + *  | 
                                                        |
| 129 | + * @param string $search MySQL search string.  | 
                                                        |
| 130 | + * @param WP_Query $query Instance of a WP_Query object  | 
                                                        |
| 131 | + * @return string MySQL search string.  | 
                                                        |
| 132 | + */  | 
                                                        |
| 133 | +    public function search_post_password( $search, $query ) { | 
                                                        |
| 134 | + _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 135 | + }  | 
                                                        |
| 136 | 136 | |
| 137 | - /**  | 
                                                        |
| 138 | - * Change messages when a scheduled action is updated.  | 
                                                        |
| 139 | - *  | 
                                                        |
| 140 | - * @param array $messages  | 
                                                        |
| 141 | - * @return array  | 
                                                        |
| 142 | - */  | 
                                                        |
| 143 | -	public function post_updated_messages( $messages ) { | 
                                                        |
| 144 | - _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 145 | - return $messages;  | 
                                                        |
| 146 | - }  | 
                                                        |
| 137 | + /**  | 
                                                        |
| 138 | + * Change messages when a scheduled action is updated.  | 
                                                        |
| 139 | + *  | 
                                                        |
| 140 | + * @param array $messages  | 
                                                        |
| 141 | + * @return array  | 
                                                        |
| 142 | + */  | 
                                                        |
| 143 | +    public function post_updated_messages( $messages ) { | 
                                                        |
| 144 | + _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 145 | + return $messages;  | 
                                                        |
| 146 | + }  | 
                                                        |
| 147 | 147 | }  | 
                                                        
| 148 | 148 | \ No newline at end of file  | 
                                                        
@@ -10,8 +10,8 @@ discard block  | 
                                                    ||
| 10 | 10 | */  | 
                                                        
| 11 | 11 |  class ActionScheduler_AdminView_Deprecated { | 
                                                        
| 12 | 12 | |
| 13 | -	public function action_scheduler_post_type_args( $args ) { | 
                                                        |
| 14 | - _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 13 | +	public function action_scheduler_post_type_args($args) { | 
                                                        |
| 14 | + _deprecated_function(__METHOD__, '2.0.0');  | 
                                                        |
| 15 | 15 | return $args;  | 
                                                        
| 16 | 16 | }  | 
                                                        
| 17 | 17 | |
@@ -21,8 +21,8 @@ discard block  | 
                                                    ||
| 21 | 21 | * @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.  | 
                                                        
| 22 | 22 | * @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.  | 
                                                        
| 23 | 23 | */  | 
                                                        
| 24 | -	public function list_table_views( $views ) { | 
                                                        |
| 25 | - _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 24 | +	public function list_table_views($views) { | 
                                                        |
| 25 | + _deprecated_function(__METHOD__, '2.0.0');  | 
                                                        |
| 26 | 26 | return $views;  | 
                                                        
| 27 | 27 | }  | 
                                                        
| 28 | 28 | |
@@ -34,8 +34,8 @@ discard block  | 
                                                    ||
| 34 | 34 | * @param array $actions An associative array of actions which can be performed on the 'scheduled-action' post type.  | 
                                                        
| 35 | 35 | * @return array $actions An associative array of actions which can be performed on the 'scheduled-action' post type.  | 
                                                        
| 36 | 36 | */  | 
                                                        
| 37 | -	public function bulk_actions( $actions ) { | 
                                                        |
| 38 | - _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 37 | +	public function bulk_actions($actions) { | 
                                                        |
| 38 | + _deprecated_function(__METHOD__, '2.0.0');  | 
                                                        |
| 39 | 39 | return $actions;  | 
                                                        
| 40 | 40 | }  | 
                                                        
| 41 | 41 | |
@@ -48,8 +48,8 @@ discard block  | 
                                                    ||
| 48 | 48 | * @param array $columns An associative array of columns that are use for the table on the Scheduled Actions administration screen.  | 
                                                        
| 49 | 49 | * @return array $columns An associative array of columns that are use for the table on the Scheduled Actions administration screen.  | 
                                                        
| 50 | 50 | */  | 
                                                        
| 51 | -	public function list_table_columns( $columns ) { | 
                                                        |
| 52 | - _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 51 | +	public function list_table_columns($columns) { | 
                                                        |
| 52 | + _deprecated_function(__METHOD__, '2.0.0');  | 
                                                        |
| 53 | 53 | return $columns;  | 
                                                        
| 54 | 54 | }  | 
                                                        
| 55 | 55 | |
@@ -59,8 +59,8 @@ discard block  | 
                                                    ||
| 59 | 59 | * @param array $columns An associative array of columns that can be used to sort the table on the Scheduled Actions administration screen.  | 
                                                        
| 60 | 60 | * @return array $columns An associative array of columns that can be used to sort the table on the Scheduled Actions administration screen.  | 
                                                        
| 61 | 61 | */  | 
                                                        
| 62 | -	public static function list_table_sortable_columns( $columns ) { | 
                                                        |
| 63 | - _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 62 | +	public static function list_table_sortable_columns($columns) { | 
                                                        |
| 63 | + _deprecated_function(__METHOD__, '2.0.0');  | 
                                                        |
| 64 | 64 | return $columns;  | 
                                                        
| 65 | 65 | }  | 
                                                        
| 66 | 66 | |
@@ -70,8 +70,8 @@ discard block  | 
                                                    ||
| 70 | 70 | * @param string $column_name The key for the column for which we should output our content.  | 
                                                        
| 71 | 71 | * @param int $post_id The ID of the 'scheduled-action' post for which this row relates.  | 
                                                        
| 72 | 72 | */  | 
                                                        
| 73 | -	public static function list_table_column_content( $column_name, $post_id ) { | 
                                                        |
| 74 | - _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 73 | +	public static function list_table_column_content($column_name, $post_id) { | 
                                                        |
| 74 | + _deprecated_function(__METHOD__, '2.0.0');  | 
                                                        |
| 75 | 75 | }  | 
                                                        
| 76 | 76 | |
| 77 | 77 | /**  | 
                                                        
@@ -82,8 +82,8 @@ discard block  | 
                                                    ||
| 82 | 82 | * @param array $actions An associative array of actions which can be performed on the 'scheduled-action' post type.  | 
                                                        
| 83 | 83 | * @return array $actions An associative array of actions which can be performed on the 'scheduled-action' post type.  | 
                                                        
| 84 | 84 | */  | 
                                                        
| 85 | -	public static function row_actions( $actions, $post ) { | 
                                                        |
| 86 | - _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 85 | +	public static function row_actions($actions, $post) { | 
                                                        |
| 86 | + _deprecated_function(__METHOD__, '2.0.0');  | 
                                                        |
| 87 | 87 | return $actions;  | 
                                                        
| 88 | 88 | }  | 
                                                        
| 89 | 89 | |
@@ -93,7 +93,7 @@ discard block  | 
                                                    ||
| 93 | 93 | * @codeCoverageIgnore  | 
                                                        
| 94 | 94 | */  | 
                                                        
| 95 | 95 |  	public static function maybe_execute_action() { | 
                                                        
| 96 | - _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 96 | + _deprecated_function(__METHOD__, '2.0.0');  | 
                                                        |
| 97 | 97 | }  | 
                                                        
| 98 | 98 | |
| 99 | 99 | /**  | 
                                                        
@@ -109,7 +109,7 @@ discard block  | 
                                                    ||
| 109 | 109 | * @return string A human friendly string representation of the interval.  | 
                                                        
| 110 | 110 | */  | 
                                                        
| 111 | 111 |  	public static function admin_notices() { | 
                                                        
| 112 | - _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 112 | + _deprecated_function(__METHOD__, '2.0.0');  | 
                                                        |
| 113 | 113 | }  | 
                                                        
| 114 | 114 | |
| 115 | 115 | /**  | 
                                                        
@@ -119,8 +119,8 @@ discard block  | 
                                                    ||
| 119 | 119 | * @param WP_Query $query Instance of a WP_Query object  | 
                                                        
| 120 | 120 | * @return string MySQL orderby string.  | 
                                                        
| 121 | 121 | */  | 
                                                        
| 122 | -	public function custom_orderby( $orderby, $query ){ | 
                                                        |
| 123 | - _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 122 | +	public function custom_orderby($orderby, $query) { | 
                                                        |
| 123 | + _deprecated_function(__METHOD__, '2.0.0');  | 
                                                        |
| 124 | 124 | }  | 
                                                        
| 125 | 125 | |
| 126 | 126 | /**  | 
                                                        
@@ -130,8 +130,8 @@ discard block  | 
                                                    ||
| 130 | 130 | * @param WP_Query $query Instance of a WP_Query object  | 
                                                        
| 131 | 131 | * @return string MySQL search string.  | 
                                                        
| 132 | 132 | */  | 
                                                        
| 133 | -	public function search_post_password( $search, $query ) { | 
                                                        |
| 134 | - _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 133 | +	public function search_post_password($search, $query) { | 
                                                        |
| 134 | + _deprecated_function(__METHOD__, '2.0.0');  | 
                                                        |
| 135 | 135 | }  | 
                                                        
| 136 | 136 | |
| 137 | 137 | /**  | 
                                                        
@@ -140,8 +140,8 @@ discard block  | 
                                                    ||
| 140 | 140 | * @param array $messages  | 
                                                        
| 141 | 141 | * @return array  | 
                                                        
| 142 | 142 | */  | 
                                                        
| 143 | -	public function post_updated_messages( $messages ) { | 
                                                        |
| 144 | - _deprecated_function( __METHOD__, '2.0.0' );  | 
                                                        |
| 143 | +	public function post_updated_messages($messages) { | 
                                                        |
| 144 | + _deprecated_function(__METHOD__, '2.0.0');  | 
                                                        |
| 145 | 145 | return $messages;  | 
                                                        
| 146 | 146 | }  | 
                                                        
| 147 | 147 | }  | 
                                                        
| 148 | 148 | \ No newline at end of file  | 
                                                        
@@ -19,8 +19,8 @@ discard block  | 
                                                    ||
| 19 | 19 | * @return string The job ID  | 
                                                        
| 20 | 20 | */  | 
                                                        
| 21 | 21 |  function wc_schedule_single_action( $timestamp, $hook, $args = array(), $group = '' ) { | 
                                                        
| 22 | - _deprecated_function( __FUNCTION__, '2.1.0', 'as_schedule_single_action()' );  | 
                                                        |
| 23 | - return as_schedule_single_action( $timestamp, $hook, $args, $group );  | 
                                                        |
| 22 | + _deprecated_function( __FUNCTION__, '2.1.0', 'as_schedule_single_action()' );  | 
                                                        |
| 23 | + return as_schedule_single_action( $timestamp, $hook, $args, $group );  | 
                                                        |
| 24 | 24 | }  | 
                                                        
| 25 | 25 | |
| 26 | 26 | /**  | 
                                                        
@@ -37,8 +37,8 @@ discard block  | 
                                                    ||
| 37 | 37 | * @return string The job ID  | 
                                                        
| 38 | 38 | */  | 
                                                        
| 39 | 39 |  function wc_schedule_recurring_action( $timestamp, $interval_in_seconds, $hook, $args = array(), $group = '' ) { | 
                                                        
| 40 | - _deprecated_function( __FUNCTION__, '2.1.0', 'as_schedule_recurring_action()' );  | 
                                                        |
| 41 | - return as_schedule_recurring_action( $timestamp, $interval_in_seconds, $hook, $args, $group );  | 
                                                        |
| 40 | + _deprecated_function( __FUNCTION__, '2.1.0', 'as_schedule_recurring_action()' );  | 
                                                        |
| 41 | + return as_schedule_recurring_action( $timestamp, $interval_in_seconds, $hook, $args, $group );  | 
                                                        |
| 42 | 42 | }  | 
                                                        
| 43 | 43 | |
| 44 | 44 | /**  | 
                                                        
@@ -65,8 +65,8 @@ discard block  | 
                                                    ||
| 65 | 65 | * @return string The job ID  | 
                                                        
| 66 | 66 | */  | 
                                                        
| 67 | 67 |  function wc_schedule_cron_action( $timestamp, $schedule, $hook, $args = array(), $group = '' ) { | 
                                                        
| 68 | - _deprecated_function( __FUNCTION__, '2.1.0', 'as_schedule_cron_action()' );  | 
                                                        |
| 69 | - return as_schedule_cron_action( $timestamp, $schedule, $hook, $args, $group );  | 
                                                        |
| 68 | + _deprecated_function( __FUNCTION__, '2.1.0', 'as_schedule_cron_action()' );  | 
                                                        |
| 69 | + return as_schedule_cron_action( $timestamp, $schedule, $hook, $args, $group );  | 
                                                        |
| 70 | 70 | }  | 
                                                        
| 71 | 71 | |
| 72 | 72 | /**  | 
                                                        
@@ -79,8 +79,8 @@ discard block  | 
                                                    ||
| 79 | 79 | * @deprecated 2.1.0  | 
                                                        
| 80 | 80 | */  | 
                                                        
| 81 | 81 |  function wc_unschedule_action( $hook, $args = array(), $group = '' ) { | 
                                                        
| 82 | - _deprecated_function( __FUNCTION__, '2.1.0', 'as_unschedule_action()' );  | 
                                                        |
| 83 | - as_unschedule_action( $hook, $args, $group );  | 
                                                        |
| 82 | + _deprecated_function( __FUNCTION__, '2.1.0', 'as_unschedule_action()' );  | 
                                                        |
| 83 | + as_unschedule_action( $hook, $args, $group );  | 
                                                        |
| 84 | 84 | }  | 
                                                        
| 85 | 85 | |
| 86 | 86 | /**  | 
                                                        
@@ -93,8 +93,8 @@ discard block  | 
                                                    ||
| 93 | 93 | * @return int|bool The timestamp for the next occurrence, or false if nothing was found  | 
                                                        
| 94 | 94 | */  | 
                                                        
| 95 | 95 |  function wc_next_scheduled_action( $hook, $args = NULL, $group = '' ) { | 
                                                        
| 96 | - _deprecated_function( __FUNCTION__, '2.1.0', 'as_next_scheduled_action()' );  | 
                                                        |
| 97 | - return as_next_scheduled_action( $hook, $args, $group );  | 
                                                        |
| 96 | + _deprecated_function( __FUNCTION__, '2.1.0', 'as_next_scheduled_action()' );  | 
                                                        |
| 97 | + return as_next_scheduled_action( $hook, $args, $group );  | 
                                                        |
| 98 | 98 | }  | 
                                                        
| 99 | 99 | |
| 100 | 100 | /**  | 
                                                        
@@ -121,6 +121,6 @@ discard block  | 
                                                    ||
| 121 | 121 | * @return array  | 
                                                        
| 122 | 122 | */  | 
                                                        
| 123 | 123 |  function wc_get_scheduled_actions( $args = array(), $return_format = OBJECT ) { | 
                                                        
| 124 | - _deprecated_function( __FUNCTION__, '2.1.0', 'as_get_scheduled_actions()' );  | 
                                                        |
| 125 | - return as_get_scheduled_actions( $args, $return_format );  | 
                                                        |
| 124 | + _deprecated_function( __FUNCTION__, '2.1.0', 'as_get_scheduled_actions()' );  | 
                                                        |
| 125 | + return as_get_scheduled_actions( $args, $return_format );  | 
                                                        |
| 126 | 126 | }  | 
                                                        
@@ -18,9 +18,9 @@ discard block  | 
                                                    ||
| 18 | 18 | *  | 
                                                        
| 19 | 19 | * @return string The job ID  | 
                                                        
| 20 | 20 | */  | 
                                                        
| 21 | -function wc_schedule_single_action( $timestamp, $hook, $args = array(), $group = '' ) { | 
                                                        |
| 22 | - _deprecated_function( __FUNCTION__, '2.1.0', 'as_schedule_single_action()' );  | 
                                                        |
| 23 | - return as_schedule_single_action( $timestamp, $hook, $args, $group );  | 
                                                        |
| 21 | +function wc_schedule_single_action($timestamp, $hook, $args = array(), $group = '') { | 
                                                        |
| 22 | + _deprecated_function(__FUNCTION__, '2.1.0', 'as_schedule_single_action()');  | 
                                                        |
| 23 | + return as_schedule_single_action($timestamp, $hook, $args, $group);  | 
                                                        |
| 24 | 24 | }  | 
                                                        
| 25 | 25 | |
| 26 | 26 | /**  | 
                                                        
@@ -36,9 +36,9 @@ discard block  | 
                                                    ||
| 36 | 36 | *  | 
                                                        
| 37 | 37 | * @return string The job ID  | 
                                                        
| 38 | 38 | */  | 
                                                        
| 39 | -function wc_schedule_recurring_action( $timestamp, $interval_in_seconds, $hook, $args = array(), $group = '' ) { | 
                                                        |
| 40 | - _deprecated_function( __FUNCTION__, '2.1.0', 'as_schedule_recurring_action()' );  | 
                                                        |
| 41 | - return as_schedule_recurring_action( $timestamp, $interval_in_seconds, $hook, $args, $group );  | 
                                                        |
| 39 | +function wc_schedule_recurring_action($timestamp, $interval_in_seconds, $hook, $args = array(), $group = '') { | 
                                                        |
| 40 | + _deprecated_function(__FUNCTION__, '2.1.0', 'as_schedule_recurring_action()');  | 
                                                        |
| 41 | + return as_schedule_recurring_action($timestamp, $interval_in_seconds, $hook, $args, $group);  | 
                                                        |
| 42 | 42 | }  | 
                                                        
| 43 | 43 | |
| 44 | 44 | /**  | 
                                                        
@@ -64,9 +64,9 @@ discard block  | 
                                                    ||
| 64 | 64 | *  | 
                                                        
| 65 | 65 | * @return string The job ID  | 
                                                        
| 66 | 66 | */  | 
                                                        
| 67 | -function wc_schedule_cron_action( $timestamp, $schedule, $hook, $args = array(), $group = '' ) { | 
                                                        |
| 68 | - _deprecated_function( __FUNCTION__, '2.1.0', 'as_schedule_cron_action()' );  | 
                                                        |
| 69 | - return as_schedule_cron_action( $timestamp, $schedule, $hook, $args, $group );  | 
                                                        |
| 67 | +function wc_schedule_cron_action($timestamp, $schedule, $hook, $args = array(), $group = '') { | 
                                                        |
| 68 | + _deprecated_function(__FUNCTION__, '2.1.0', 'as_schedule_cron_action()');  | 
                                                        |
| 69 | + return as_schedule_cron_action($timestamp, $schedule, $hook, $args, $group);  | 
                                                        |
| 70 | 70 | }  | 
                                                        
| 71 | 71 | |
| 72 | 72 | /**  | 
                                                        
@@ -78,9 +78,9 @@ discard block  | 
                                                    ||
| 78 | 78 | *  | 
                                                        
| 79 | 79 | * @deprecated 2.1.0  | 
                                                        
| 80 | 80 | */  | 
                                                        
| 81 | -function wc_unschedule_action( $hook, $args = array(), $group = '' ) { | 
                                                        |
| 82 | - _deprecated_function( __FUNCTION__, '2.1.0', 'as_unschedule_action()' );  | 
                                                        |
| 83 | - as_unschedule_action( $hook, $args, $group );  | 
                                                        |
| 81 | +function wc_unschedule_action($hook, $args = array(), $group = '') { | 
                                                        |
| 82 | + _deprecated_function(__FUNCTION__, '2.1.0', 'as_unschedule_action()');  | 
                                                        |
| 83 | + as_unschedule_action($hook, $args, $group);  | 
                                                        |
| 84 | 84 | }  | 
                                                        
| 85 | 85 | |
| 86 | 86 | /**  | 
                                                        
@@ -92,9 +92,9 @@ discard block  | 
                                                    ||
| 92 | 92 | *  | 
                                                        
| 93 | 93 | * @return int|bool The timestamp for the next occurrence, or false if nothing was found  | 
                                                        
| 94 | 94 | */  | 
                                                        
| 95 | -function wc_next_scheduled_action( $hook, $args = NULL, $group = '' ) { | 
                                                        |
| 96 | - _deprecated_function( __FUNCTION__, '2.1.0', 'as_next_scheduled_action()' );  | 
                                                        |
| 97 | - return as_next_scheduled_action( $hook, $args, $group );  | 
                                                        |
| 95 | +function wc_next_scheduled_action($hook, $args = NULL, $group = '') { | 
                                                        |
| 96 | + _deprecated_function(__FUNCTION__, '2.1.0', 'as_next_scheduled_action()');  | 
                                                        |
| 97 | + return as_next_scheduled_action($hook, $args, $group);  | 
                                                        |
| 98 | 98 | }  | 
                                                        
| 99 | 99 | |
| 100 | 100 | /**  | 
                                                        
@@ -120,7 +120,7 @@ discard block  | 
                                                    ||
| 120 | 120 | *  | 
                                                        
| 121 | 121 | * @return array  | 
                                                        
| 122 | 122 | */  | 
                                                        
| 123 | -function wc_get_scheduled_actions( $args = array(), $return_format = OBJECT ) { | 
                                                        |
| 124 | - _deprecated_function( __FUNCTION__, '2.1.0', 'as_get_scheduled_actions()' );  | 
                                                        |
| 125 | - return as_get_scheduled_actions( $args, $return_format );  | 
                                                        |
| 123 | +function wc_get_scheduled_actions($args = array(), $return_format = OBJECT) { | 
                                                        |
| 124 | + _deprecated_function(__FUNCTION__, '2.1.0', 'as_get_scheduled_actions()');  | 
                                                        |
| 125 | + return as_get_scheduled_actions($args, $return_format);  | 
                                                        |
| 126 | 126 | }  | 
                                                        
@@ -5,25 +5,25 @@  | 
                                                    ||
| 5 | 5 | */  | 
                                                        
| 6 | 6 |  abstract class ActionScheduler_Schedule_Deprecated implements ActionScheduler_Schedule { | 
                                                        
| 7 | 7 | |
| 8 | - /**  | 
                                                        |
| 9 | - * Get the date & time this schedule was created to run, or calculate when it should be run  | 
                                                        |
| 10 | - * after a given date & time.  | 
                                                        |
| 11 | - *  | 
                                                        |
| 12 | - * @param DateTime $after  | 
                                                        |
| 13 | - *  | 
                                                        |
| 14 | - * @return DateTime|null  | 
                                                        |
| 15 | - */  | 
                                                        |
| 16 | -	public function next( DateTime $after = NULL ) { | 
                                                        |
| 17 | -		if ( empty( $after ) ) { | 
                                                        |
| 18 | - $return_value = $this->get_date();  | 
                                                        |
| 19 | - $replacement_method = 'get_date()';  | 
                                                        |
| 20 | -		} else { | 
                                                        |
| 21 | - $return_value = $this->get_next( $after );  | 
                                                        |
| 22 | - $replacement_method = 'get_next( $after )';  | 
                                                        |
| 23 | - }  | 
                                                        |
| 8 | + /**  | 
                                                        |
| 9 | + * Get the date & time this schedule was created to run, or calculate when it should be run  | 
                                                        |
| 10 | + * after a given date & time.  | 
                                                        |
| 11 | + *  | 
                                                        |
| 12 | + * @param DateTime $after  | 
                                                        |
| 13 | + *  | 
                                                        |
| 14 | + * @return DateTime|null  | 
                                                        |
| 15 | + */  | 
                                                        |
| 16 | +    public function next( DateTime $after = NULL ) { | 
                                                        |
| 17 | +        if ( empty( $after ) ) { | 
                                                        |
| 18 | + $return_value = $this->get_date();  | 
                                                        |
| 19 | + $replacement_method = 'get_date()';  | 
                                                        |
| 20 | +        } else { | 
                                                        |
| 21 | + $return_value = $this->get_next( $after );  | 
                                                        |
| 22 | + $replacement_method = 'get_next( $after )';  | 
                                                        |
| 23 | + }  | 
                                                        |
| 24 | 24 | |
| 25 | - _deprecated_function( __METHOD__, '3.0.0', __CLASS__ . '::' . $replacement_method );  | 
                                                        |
| 25 | + _deprecated_function( __METHOD__, '3.0.0', __CLASS__ . '::' . $replacement_method );  | 
                                                        |
| 26 | 26 | |
| 27 | - return $return_value;  | 
                                                        |
| 28 | - }  | 
                                                        |
| 27 | + return $return_value;  | 
                                                        |
| 28 | + }  | 
                                                        |
| 29 | 29 | }  | 
                                                        
@@ -13,16 +13,16 @@  | 
                                                    ||
| 13 | 13 | *  | 
                                                        
| 14 | 14 | * @return DateTime|null  | 
                                                        
| 15 | 15 | */  | 
                                                        
| 16 | -	public function next( DateTime $after = NULL ) { | 
                                                        |
| 17 | -		if ( empty( $after ) ) { | 
                                                        |
| 16 | +	public function next(DateTime $after = NULL) { | 
                                                        |
| 17 | +		if (empty($after)) { | 
                                                        |
| 18 | 18 | $return_value = $this->get_date();  | 
                                                        
| 19 | 19 | $replacement_method = 'get_date()';  | 
                                                        
| 20 | 20 |  		} else { | 
                                                        
| 21 | - $return_value = $this->get_next( $after );  | 
                                                        |
| 21 | + $return_value = $this->get_next($after);  | 
                                                        |
| 22 | 22 | $replacement_method = 'get_next( $after )';  | 
                                                        
| 23 | 23 | }  | 
                                                        
| 24 | 24 | |
| 25 | - _deprecated_function( __METHOD__, '3.0.0', __CLASS__ . '::' . $replacement_method );  | 
                                                        |
| 25 | + _deprecated_function(__METHOD__, '3.0.0', __CLASS__ . '::' . $replacement_method);  | 
                                                        |
| 26 | 26 | |
| 27 | 27 | return $return_value;  | 
                                                        
| 28 | 28 | }  | 
                                                        
@@ -6,44 +6,44 @@  | 
                                                    ||
| 6 | 6 | */  | 
                                                        
| 7 | 7 |  abstract class ActionScheduler_Store_Deprecated { | 
                                                        
| 8 | 8 | |
| 9 | - /**  | 
                                                        |
| 10 | - * Mark an action that failed to fetch correctly as failed.  | 
                                                        |
| 11 | - *  | 
                                                        |
| 12 | - * @since 2.2.6  | 
                                                        |
| 13 | - *  | 
                                                        |
| 14 | - * @param int $action_id The ID of the action.  | 
                                                        |
| 15 | - */  | 
                                                        |
| 16 | -	public function mark_failed_fetch_action( $action_id ) { | 
                                                        |
| 17 | - _deprecated_function( __METHOD__, '3.0.0', 'ActionScheduler_Store::mark_failure()' );  | 
                                                        |
| 18 | - self::$store->mark_failure( $action_id );  | 
                                                        |
| 19 | - }  | 
                                                        |
| 9 | + /**  | 
                                                        |
| 10 | + * Mark an action that failed to fetch correctly as failed.  | 
                                                        |
| 11 | + *  | 
                                                        |
| 12 | + * @since 2.2.6  | 
                                                        |
| 13 | + *  | 
                                                        |
| 14 | + * @param int $action_id The ID of the action.  | 
                                                        |
| 15 | + */  | 
                                                        |
| 16 | +    public function mark_failed_fetch_action( $action_id ) { | 
                                                        |
| 17 | + _deprecated_function( __METHOD__, '3.0.0', 'ActionScheduler_Store::mark_failure()' );  | 
                                                        |
| 18 | + self::$store->mark_failure( $action_id );  | 
                                                        |
| 19 | + }  | 
                                                        |
| 20 | 20 | |
| 21 | - /**  | 
                                                        |
| 22 | - * Add base hooks  | 
                                                        |
| 23 | - *  | 
                                                        |
| 24 | - * @since 2.2.6  | 
                                                        |
| 25 | - */  | 
                                                        |
| 26 | -	protected static function hook() { | 
                                                        |
| 27 | - _deprecated_function( __METHOD__, '3.0.0' );  | 
                                                        |
| 28 | - }  | 
                                                        |
| 21 | + /**  | 
                                                        |
| 22 | + * Add base hooks  | 
                                                        |
| 23 | + *  | 
                                                        |
| 24 | + * @since 2.2.6  | 
                                                        |
| 25 | + */  | 
                                                        |
| 26 | +    protected static function hook() { | 
                                                        |
| 27 | + _deprecated_function( __METHOD__, '3.0.0' );  | 
                                                        |
| 28 | + }  | 
                                                        |
| 29 | 29 | |
| 30 | - /**  | 
                                                        |
| 31 | - * Remove base hooks  | 
                                                        |
| 32 | - *  | 
                                                        |
| 33 | - * @since 2.2.6  | 
                                                        |
| 34 | - */  | 
                                                        |
| 35 | -	protected static function unhook() { | 
                                                        |
| 36 | - _deprecated_function( __METHOD__, '3.0.0' );  | 
                                                        |
| 37 | - }  | 
                                                        |
| 30 | + /**  | 
                                                        |
| 31 | + * Remove base hooks  | 
                                                        |
| 32 | + *  | 
                                                        |
| 33 | + * @since 2.2.6  | 
                                                        |
| 34 | + */  | 
                                                        |
| 35 | +    protected static function unhook() { | 
                                                        |
| 36 | + _deprecated_function( __METHOD__, '3.0.0' );  | 
                                                        |
| 37 | + }  | 
                                                        |
| 38 | 38 | |
| 39 | - /**  | 
                                                        |
| 40 | - * Get the site's local time.  | 
                                                        |
| 41 | - *  | 
                                                        |
| 42 | - * @deprecated 2.1.0  | 
                                                        |
| 43 | - * @return DateTimeZone  | 
                                                        |
| 44 | - */  | 
                                                        |
| 45 | -	protected function get_local_timezone() { | 
                                                        |
| 46 | - _deprecated_function( __FUNCTION__, '2.1.0', 'ActionScheduler_TimezoneHelper::set_local_timezone()' );  | 
                                                        |
| 47 | - return ActionScheduler_TimezoneHelper::get_local_timezone();  | 
                                                        |
| 48 | - }  | 
                                                        |
| 39 | + /**  | 
                                                        |
| 40 | + * Get the site's local time.  | 
                                                        |
| 41 | + *  | 
                                                        |
| 42 | + * @deprecated 2.1.0  | 
                                                        |
| 43 | + * @return DateTimeZone  | 
                                                        |
| 44 | + */  | 
                                                        |
| 45 | +    protected function get_local_timezone() { | 
                                                        |
| 46 | + _deprecated_function( __FUNCTION__, '2.1.0', 'ActionScheduler_TimezoneHelper::set_local_timezone()' );  | 
                                                        |
| 47 | + return ActionScheduler_TimezoneHelper::get_local_timezone();  | 
                                                        |
| 48 | + }  | 
                                                        |
| 49 | 49 | }  | 
                                                        
@@ -13,9 +13,9 @@ discard block  | 
                                                    ||
| 13 | 13 | *  | 
                                                        
| 14 | 14 | * @param int $action_id The ID of the action.  | 
                                                        
| 15 | 15 | */  | 
                                                        
| 16 | -	public function mark_failed_fetch_action( $action_id ) { | 
                                                        |
| 17 | - _deprecated_function( __METHOD__, '3.0.0', 'ActionScheduler_Store::mark_failure()' );  | 
                                                        |
| 18 | - self::$store->mark_failure( $action_id );  | 
                                                        |
| 16 | +	public function mark_failed_fetch_action($action_id) { | 
                                                        |
| 17 | + _deprecated_function(__METHOD__, '3.0.0', 'ActionScheduler_Store::mark_failure()');  | 
                                                        |
| 18 | + self::$store->mark_failure($action_id);  | 
                                                        |
| 19 | 19 | }  | 
                                                        
| 20 | 20 | |
| 21 | 21 | /**  | 
                                                        
@@ -24,7 +24,7 @@ discard block  | 
                                                    ||
| 24 | 24 | * @since 2.2.6  | 
                                                        
| 25 | 25 | */  | 
                                                        
| 26 | 26 |  	protected static function hook() { | 
                                                        
| 27 | - _deprecated_function( __METHOD__, '3.0.0' );  | 
                                                        |
| 27 | + _deprecated_function(__METHOD__, '3.0.0');  | 
                                                        |
| 28 | 28 | }  | 
                                                        
| 29 | 29 | |
| 30 | 30 | /**  | 
                                                        
@@ -33,7 +33,7 @@ discard block  | 
                                                    ||
| 33 | 33 | * @since 2.2.6  | 
                                                        
| 34 | 34 | */  | 
                                                        
| 35 | 35 |  	protected static function unhook() { | 
                                                        
| 36 | - _deprecated_function( __METHOD__, '3.0.0' );  | 
                                                        |
| 36 | + _deprecated_function(__METHOD__, '3.0.0');  | 
                                                        |
| 37 | 37 | }  | 
                                                        
| 38 | 38 | |
| 39 | 39 | /**  | 
                                                        
@@ -43,7 +43,7 @@ discard block  | 
                                                    ||
| 43 | 43 | * @return DateTimeZone  | 
                                                        
| 44 | 44 | */  | 
                                                        
| 45 | 45 |  	protected function get_local_timezone() { | 
                                                        
| 46 | - _deprecated_function( __FUNCTION__, '2.1.0', 'ActionScheduler_TimezoneHelper::set_local_timezone()' );  | 
                                                        |
| 46 | + _deprecated_function(__FUNCTION__, '2.1.0', 'ActionScheduler_TimezoneHelper::set_local_timezone()');  | 
                                                        |
| 47 | 47 | return ActionScheduler_TimezoneHelper::get_local_timezone();  | 
                                                        
| 48 | 48 | }  | 
                                                        
| 49 | 49 | }  | 
                                                        
@@ -5,23 +5,23 @@  | 
                                                    ||
| 5 | 5 | */  | 
                                                        
| 6 | 6 |  abstract class ActionScheduler_Abstract_QueueRunner_Deprecated { | 
                                                        
| 7 | 7 | |
| 8 | - /**  | 
                                                        |
| 9 | - * Get the maximum number of seconds a batch can run for.  | 
                                                        |
| 10 | - *  | 
                                                        |
| 11 | - * @deprecated 2.1.1  | 
                                                        |
| 12 | - * @return int The number of seconds.  | 
                                                        |
| 13 | - */  | 
                                                        |
| 14 | -	protected function get_maximum_execution_time() { | 
                                                        |
| 15 | - _deprecated_function( __METHOD__, '2.1.1', 'ActionScheduler_Abstract_QueueRunner::get_time_limit()' );  | 
                                                        |
| 8 | + /**  | 
                                                        |
| 9 | + * Get the maximum number of seconds a batch can run for.  | 
                                                        |
| 10 | + *  | 
                                                        |
| 11 | + * @deprecated 2.1.1  | 
                                                        |
| 12 | + * @return int The number of seconds.  | 
                                                        |
| 13 | + */  | 
                                                        |
| 14 | +    protected function get_maximum_execution_time() { | 
                                                        |
| 15 | + _deprecated_function( __METHOD__, '2.1.1', 'ActionScheduler_Abstract_QueueRunner::get_time_limit()' );  | 
                                                        |
| 16 | 16 | |
| 17 | - $maximum_execution_time = 30;  | 
                                                        |
| 17 | + $maximum_execution_time = 30;  | 
                                                        |
| 18 | 18 | |
| 19 | - // Apply deprecated filter  | 
                                                        |
| 20 | -		if ( has_filter( 'action_scheduler_maximum_execution_time' ) ) { | 
                                                        |
| 21 | - _deprecated_function( 'action_scheduler_maximum_execution_time', '2.1.1', 'action_scheduler_queue_runner_time_limit' );  | 
                                                        |
| 22 | - $maximum_execution_time = apply_filters( 'action_scheduler_maximum_execution_time', $maximum_execution_time );  | 
                                                        |
| 23 | - }  | 
                                                        |
| 19 | + // Apply deprecated filter  | 
                                                        |
| 20 | +        if ( has_filter( 'action_scheduler_maximum_execution_time' ) ) { | 
                                                        |
| 21 | + _deprecated_function( 'action_scheduler_maximum_execution_time', '2.1.1', 'action_scheduler_queue_runner_time_limit' );  | 
                                                        |
| 22 | + $maximum_execution_time = apply_filters( 'action_scheduler_maximum_execution_time', $maximum_execution_time );  | 
                                                        |
| 23 | + }  | 
                                                        |
| 24 | 24 | |
| 25 | - return absint( $maximum_execution_time );  | 
                                                        |
| 26 | - }  | 
                                                        |
| 25 | + return absint( $maximum_execution_time );  | 
                                                        |
| 26 | + }  | 
                                                        |
| 27 | 27 | }  | 
                                                        
@@ -12,16 +12,16 @@  | 
                                                    ||
| 12 | 12 | * @return int The number of seconds.  | 
                                                        
| 13 | 13 | */  | 
                                                        
| 14 | 14 |  	protected function get_maximum_execution_time() { | 
                                                        
| 15 | - _deprecated_function( __METHOD__, '2.1.1', 'ActionScheduler_Abstract_QueueRunner::get_time_limit()' );  | 
                                                        |
| 15 | + _deprecated_function(__METHOD__, '2.1.1', 'ActionScheduler_Abstract_QueueRunner::get_time_limit()');  | 
                                                        |
| 16 | 16 | |
| 17 | 17 | $maximum_execution_time = 30;  | 
                                                        
| 18 | 18 | |
| 19 | 19 | // Apply deprecated filter  | 
                                                        
| 20 | -		if ( has_filter( 'action_scheduler_maximum_execution_time' ) ) { | 
                                                        |
| 21 | - _deprecated_function( 'action_scheduler_maximum_execution_time', '2.1.1', 'action_scheduler_queue_runner_time_limit' );  | 
                                                        |
| 22 | - $maximum_execution_time = apply_filters( 'action_scheduler_maximum_execution_time', $maximum_execution_time );  | 
                                                        |
| 20 | +		if (has_filter('action_scheduler_maximum_execution_time')) { | 
                                                        |
| 21 | +			_deprecated_function('action_scheduler_maximum_execution_time', '2.1.1', 'action_scheduler_queue_runner_time_limit'); | 
                                                        |
| 22 | +			$maximum_execution_time = apply_filters('action_scheduler_maximum_execution_time', $maximum_execution_time); | 
                                                        |
| 23 | 23 | }  | 
                                                        
| 24 | 24 | |
| 25 | - return absint( $maximum_execution_time );  | 
                                                        |
| 25 | + return absint($maximum_execution_time);  | 
                                                        |
| 26 | 26 | }  | 
                                                        
| 27 | 27 | }  | 
                                                        
@@ -27,27 +27,27 @@  | 
                                                    ||
| 27 | 27 | |
| 28 | 28 |  if ( ! function_exists( 'action_scheduler_register_3_dot_1_dot_4' ) ) { | 
                                                        
| 29 | 29 | |
| 30 | -	if ( ! class_exists( 'ActionScheduler_Versions' ) ) { | 
                                                        |
| 31 | - require_once( 'classes/ActionScheduler_Versions.php' );  | 
                                                        |
| 32 | - add_action( 'plugins_loaded', array( 'ActionScheduler_Versions', 'initialize_latest_version' ), 1, 0 );  | 
                                                        |
| 33 | - }  | 
                                                        |
| 30 | +    if ( ! class_exists( 'ActionScheduler_Versions' ) ) { | 
                                                        |
| 31 | + require_once( 'classes/ActionScheduler_Versions.php' );  | 
                                                        |
| 32 | + add_action( 'plugins_loaded', array( 'ActionScheduler_Versions', 'initialize_latest_version' ), 1, 0 );  | 
                                                        |
| 33 | + }  | 
                                                        |
| 34 | 34 | |
| 35 | - add_action( 'plugins_loaded', 'action_scheduler_register_3_dot_1_dot_4', 0, 0 );  | 
                                                        |
| 35 | + add_action( 'plugins_loaded', 'action_scheduler_register_3_dot_1_dot_4', 0, 0 );  | 
                                                        |
| 36 | 36 | |
| 37 | -	function action_scheduler_register_3_dot_1_dot_4() { | 
                                                        |
| 38 | - $versions = ActionScheduler_Versions::instance();  | 
                                                        |
| 39 | - $versions->register( '3.1.4', 'action_scheduler_initialize_3_dot_1_dot_4' );  | 
                                                        |
| 40 | - }  | 
                                                        |
| 37 | +    function action_scheduler_register_3_dot_1_dot_4() { | 
                                                        |
| 38 | + $versions = ActionScheduler_Versions::instance();  | 
                                                        |
| 39 | + $versions->register( '3.1.4', 'action_scheduler_initialize_3_dot_1_dot_4' );  | 
                                                        |
| 40 | + }  | 
                                                        |
| 41 | 41 | |
| 42 | -	function action_scheduler_initialize_3_dot_1_dot_4() { | 
                                                        |
| 43 | - require_once( 'classes/abstracts/ActionScheduler.php' );  | 
                                                        |
| 44 | - ActionScheduler::init( __FILE__ );  | 
                                                        |
| 45 | - }  | 
                                                        |
| 42 | +    function action_scheduler_initialize_3_dot_1_dot_4() { | 
                                                        |
| 43 | + require_once( 'classes/abstracts/ActionScheduler.php' );  | 
                                                        |
| 44 | + ActionScheduler::init( __FILE__ );  | 
                                                        |
| 45 | + }  | 
                                                        |
| 46 | 46 | |
| 47 | - // Support usage in themes - load this version if no plugin has loaded a version yet.  | 
                                                        |
| 48 | -	if ( did_action( 'plugins_loaded' ) && ! class_exists( 'ActionScheduler' ) ) { | 
                                                        |
| 49 | - action_scheduler_initialize_3_dot_1_dot_4();  | 
                                                        |
| 50 | - do_action( 'action_scheduler_pre_theme_init' );  | 
                                                        |
| 51 | - ActionScheduler_Versions::initialize_latest_version();  | 
                                                        |
| 52 | - }  | 
                                                        |
| 47 | + // Support usage in themes - load this version if no plugin has loaded a version yet.  | 
                                                        |
| 48 | +    if ( did_action( 'plugins_loaded' ) && ! class_exists( 'ActionScheduler' ) ) { | 
                                                        |
| 49 | + action_scheduler_initialize_3_dot_1_dot_4();  | 
                                                        |
| 50 | + do_action( 'action_scheduler_pre_theme_init' );  | 
                                                        |
| 51 | + ActionScheduler_Versions::initialize_latest_version();  | 
                                                        |
| 52 | + }  | 
                                                        |
| 53 | 53 | }  | 
                                                        
@@ -25,29 +25,29 @@  | 
                                                    ||
| 25 | 25 | *  | 
                                                        
| 26 | 26 | */  | 
                                                        
| 27 | 27 | |
| 28 | -if ( ! function_exists( 'action_scheduler_register_3_dot_1_dot_4' ) ) { | 
                                                        |
| 28 | +if (!function_exists('action_scheduler_register_3_dot_1_dot_4')) { | 
                                                        |
| 29 | 29 | |
| 30 | -	if ( ! class_exists( 'ActionScheduler_Versions' ) ) { | 
                                                        |
| 31 | - require_once( 'classes/ActionScheduler_Versions.php' );  | 
                                                        |
| 32 | - add_action( 'plugins_loaded', array( 'ActionScheduler_Versions', 'initialize_latest_version' ), 1, 0 );  | 
                                                        |
| 30 | +	if (!class_exists('ActionScheduler_Versions')) { | 
                                                        |
| 31 | +		require_once('classes/ActionScheduler_Versions.php'); | 
                                                        |
| 32 | +		add_action('plugins_loaded', array('ActionScheduler_Versions', 'initialize_latest_version'), 1, 0); | 
                                                        |
| 33 | 33 | }  | 
                                                        
| 34 | 34 | |
| 35 | - add_action( 'plugins_loaded', 'action_scheduler_register_3_dot_1_dot_4', 0, 0 );  | 
                                                        |
| 35 | +	add_action('plugins_loaded', 'action_scheduler_register_3_dot_1_dot_4', 0, 0); | 
                                                        |
| 36 | 36 | |
| 37 | 37 |  	function action_scheduler_register_3_dot_1_dot_4() { | 
                                                        
| 38 | 38 | $versions = ActionScheduler_Versions::instance();  | 
                                                        
| 39 | - $versions->register( '3.1.4', 'action_scheduler_initialize_3_dot_1_dot_4' );  | 
                                                        |
| 39 | +		$versions->register('3.1.4', 'action_scheduler_initialize_3_dot_1_dot_4'); | 
                                                        |
| 40 | 40 | }  | 
                                                        
| 41 | 41 | |
| 42 | 42 |  	function action_scheduler_initialize_3_dot_1_dot_4() { | 
                                                        
| 43 | - require_once( 'classes/abstracts/ActionScheduler.php' );  | 
                                                        |
| 44 | - ActionScheduler::init( __FILE__ );  | 
                                                        |
| 43 | +		require_once('classes/abstracts/ActionScheduler.php'); | 
                                                        |
| 44 | + ActionScheduler::init(__FILE__);  | 
                                                        |
| 45 | 45 | }  | 
                                                        
| 46 | 46 | |
| 47 | 47 | // Support usage in themes - load this version if no plugin has loaded a version yet.  | 
                                                        
| 48 | -	if ( did_action( 'plugins_loaded' ) && ! class_exists( 'ActionScheduler' ) ) { | 
                                                        |
| 48 | +	if (did_action('plugins_loaded') && !class_exists('ActionScheduler')) { | 
                                                        |
| 49 | 49 | action_scheduler_initialize_3_dot_1_dot_4();  | 
                                                        
| 50 | - do_action( 'action_scheduler_pre_theme_init' );  | 
                                                        |
| 50 | +		do_action('action_scheduler_pre_theme_init'); | 
                                                        |
| 51 | 51 | ActionScheduler_Versions::initialize_latest_version();  | 
                                                        
| 52 | 52 | }  | 
                                                        
| 53 | 53 | }  |