nbsp;
")}}},computed:{hooks(){return wp.hooks},unique_products(){return n.uniq(this.products,!1,e=>parseInt(e,10))}},methods:{debounce(e){return n.debounce(e,200,!0)},open_url(e,t="_blank"){window.open(e,t)},get_template(e,t){void 0===t.id&&(t.id="default");var o=e+"/"+t.id;return void 0!==this.stored_templates[o]?this.stored_templates[o]:(o=this.hooks.applyFilters("wu_before_template_fetch",{duration:this.duration,duration_unit:this.duration_unit,products:this.products,...t},this),this.fetch_template(e,o),''+wu_checkout.i18n.loading+"
")},reset_templates(r){if(void 0===r)this.stored_templates={};else{let i={};n.forEach(this.stored_templates,function(e,t){var o=t.toString().substr(0,t.toString().indexOf("/"));!1===n.contains(r,o)&&(i[t]=e)}),this.stored_templates=i}},fetch_template(o,i){let r=this;void 0===i.id&&(i.id="default"),this.request("wu_render_field_template",{template:o,attributes:i},function(e){var t=o+"/"+i.id;e.success?Vue.set(r.stored_templates,t,e.data.html):Vue.set(r.stored_templates,t,""+e.data[0].message+"
")})},go_back(){this.block(),window.history.back()},set_prevent_submission(e){this.$nextTick(function(){this.prevent_submission=e})},remove_product(t,o){this.products=n.filter(this.products,function(e){return e!=t&&e!=o})},add_plan(e){this.plan&&this.remove_product(this.plan),this.plan=e,this.add_product(e)},add_product(e){this.products.push(e)},has_product(e){return-1' . sprintf(__('An unexpected PayPal error occurred. Error message: %s.', 'ultimate-multisite'), $error) . '
'; + echo '' . sprintf(esc_html__('An unexpected PayPal error occurred. Error message: %s.', 'ultimate-multisite'), esc_html($error)) . '
'; } /* diff --git a/inc/gateways/class-stripe-checkout-gateway.php b/inc/gateways/class-stripe-checkout-gateway.php index ce857bf10..1c8c430af 100644 --- a/inc/gateways/class-stripe-checkout-gateway.php +++ b/inc/gateways/class-stripe-checkout-gateway.php @@ -11,9 +11,9 @@ namespace WP_Ultimo\Gateways; +use Stripe\Exception\ApiErrorException; use Stripe\PaymentMethod; -use Stripe; -use WP_Ultimo\Checkout\Cart; +use WP_Ultimo\Exception\Runtime_Exception; // Exit if accessed directly defined('ABSPATH') || exit; @@ -206,8 +206,10 @@ public function settings(): void { * intents for Stripe to make the experience more * streamlined. * + * @return \WP_Error|array + * @throws Runtime_Exception Something happened creating the client. + * @throws ApiErrorException Something bag happened sending an API request. * @since 2.0.0 - * @return void|array */ public function run_preflight() { @@ -293,27 +295,92 @@ public function run_preflight() { 'metadata' => $metadata, ]; - if ($this->order->should_auto_renew()) { - $stripe_cart = $this->build_stripe_cart($this->order); + if ($this->order->should_auto_renew() && $this->order->has_recurring()) { + $subscription_data['mode'] = 'subscription'; + + $stripe_cart = $this->build_stripe_cart($this->order); + + if (is_wp_error($stripe_cart)) { + return $stripe_cart; + } + + /* + * In subscription mode, recurring items go in line_items + * with their plan/price IDs. The deprecated subscription_data[items] + * parameter has been replaced by line_items. + */ + $line_items = []; + + foreach (array_values($stripe_cart) as $plan_data) { + $item = [ + 'price' => $plan_data['plan'], + 'quantity' => 1, + ]; + + if ( ! empty($plan_data['tax_rates'])) { + $item['tax_rates'] = $plan_data['tax_rates']; + } + + $line_items[] = $item; + } + + /* + * Add non-recurring items (setup fees, etc.) + */ $stripe_non_recurring_cart = $this->build_non_recurring_cart($this->order); + $line_items = array_merge($line_items, $stripe_non_recurring_cart); + + $subscription_data['line_items'] = $line_items; + $subscription_data['subscription_data'] = []; + + /** + * If its a downgrade, we need to set as a trial, + * billing_cycle_anchor isn't supported by Checkout. + * (https://stripe.com/docs/api/checkout/sessions/create) + */ + if ($this->order->get_cart_type() === 'downgrade') { + $next_charge = $this->order->get_billing_next_charge_date(); + $next_charge_date = \DateTime::createFromFormat('U', $next_charge); + $current_time = new \DateTime(); + + if ($current_time < $next_charge_date) { + + // The `trial_end` date has to be at least 2 days in the future. + $next_charge = $next_charge_date->diff($current_time)->days > 2 ? $next_charge : strtotime('+2 days'); + + $subscription_data['subscription_data']['trial_end'] = $next_charge; + } + } + /* - * Adds recurring stuff. + * Handle trial periods. */ - $subscription_data['subscription_data'] = [ - 'items' => array_values($stripe_cart), - ]; + elseif ($this->order->has_trial()) { + $subscription_data['subscription_data']['trial_end'] = $this->order->get_billing_start_date(); + } } else { + $subscription_data['mode'] = 'payment'; + /* * Create non-recurring only cart. */ $stripe_non_recurring_cart = $this->build_non_recurring_cart($this->order, true); - } - /* - * Add non-recurring line items - */ - $subscription_data['line_items'] = $stripe_non_recurring_cart; + /* + * If there are no payable line items (e.g. $0 checkout with 100% coupon), + * Stripe Checkout cannot process this. Return an error so the + * checkout falls back gracefully. + */ + if (empty($stripe_non_recurring_cart)) { + return new \WP_Error( + 'stripe-checkout-no-items', + __('No payable items for Stripe Checkout. The order total may be zero.', 'ultimate-multisite') + ); + } + + $subscription_data['line_items'] = $stripe_non_recurring_cart; + } /** * If we have pro-rata credit (in case of an upgrade, for example) @@ -327,32 +394,6 @@ public function run_preflight() { ]; } - /** - * If its a downgrade, we need to set as a trial, - * billing_cycle_anchor isn't supported by Checkout. - * (https://stripe.com/docs/api/checkout/sessions/create) - */ - if ($this->order->get_cart_type() === 'downgrade') { - $next_charge = $this->order->get_billing_next_charge_date(); - $next_charge_date = \DateTime::createFromFormat('U', $next_charge); - $current_time = new \DateTime(); - - if ($current_time < $next_charge_date) { - - // The `trial_end` date has to be at least 2 days in the future. - $next_charge = $next_charge_date->diff($current_time)->days > 2 ? $next_charge : strtotime('+2 days'); - - $subscription_data['subscription_data']['trial_end'] = $next_charge; - } - } - - /* - * Handle trial periods. - */ - if ($this->order->has_trial() && $this->order->has_recurring()) { - $subscription_data['subscription_data']['trial_end'] = $this->order->get_billing_start_date(); - } - $session = $this->get_stripe_client()->checkout->sessions->create(apply_filters('wu_stripe_checkout_subscription_data', $subscription_data, $this)); // Add the client secret to the JSON success data. diff --git a/inc/helpers/validation-rules/class-exists.php b/inc/helpers/validation-rules/class-exists.php index 788ee2ef8..737c9d3f1 100644 --- a/inc/helpers/validation-rules/class-exists.php +++ b/inc/helpers/validation-rules/class-exists.php @@ -53,6 +53,11 @@ public function check($value): bool { ] ); + // Allow explicit "no association" sentinels for optional foreign keys. + if ($value === null || $value === '' || $value === 0 || $value === '0') { + return true; + } + $column = $this->parameter('column'); $model = $this->parameter('model'); diff --git a/inc/installers/class-multisite-network-installer.php b/inc/installers/class-multisite-network-installer.php index a5ea01b64..14c8fa79b 100644 --- a/inc/installers/class-multisite-network-installer.php +++ b/inc/installers/class-multisite-network-installer.php @@ -173,10 +173,23 @@ public function _install_create_network(): void { // phpcs:ignore PSR2.Methods.M } // On a single-site install, $wpdb doesn't have multisite table names set. - foreach ($wpdb->ms_global_tables as $table) { + // Explicitly set the core WordPress multisite tables that install_network() + // and wp_get_db_schema('global') reference via $wpdb->tablename interpolation. + // We cannot rely solely on $wpdb->ms_global_tables because plugins may have + // appended custom entries while the core defaults could be missing. + $wp_ms_tables = ['blogs', 'blogmeta', 'signups', 'site', 'sitemeta', 'registration_log']; + + foreach ($wp_ms_tables as $table) { $wpdb->$table = $wpdb->base_prefix . $table; } + // Also set any additional tables registered in ms_global_tables (e.g. by addons). + foreach ($wpdb->ms_global_tables as $table) { + if (! isset($wpdb->$table)) { + $wpdb->$table = $wpdb->base_prefix . $table; + } + } + install_network(); $result = populate_network( diff --git a/inc/integrations/capabilities/interface-domain-selling-capability.php b/inc/integrations/capabilities/interface-domain-selling-capability.php index 88f9fca5d..f30320a10 100644 --- a/inc/integrations/capabilities/interface-domain-selling-capability.php +++ b/inc/integrations/capabilities/interface-domain-selling-capability.php @@ -19,6 +19,8 @@ */ interface Domain_Selling_Capability { + public const ID = 'domain-selling'; + /** * Search for available domains. * diff --git a/inc/integrations/capabilities/interface-node-management-capability.php b/inc/integrations/capabilities/interface-node-management-capability.php new file mode 100644 index 000000000..119e8269a --- /dev/null +++ b/inc/integrations/capabilities/interface-node-management-capability.php @@ -0,0 +1,139 @@ +, + * message: string + * } + */ + public function detect_node(): array; + + /** + * Register/create a Node.js application. + * + * @since 2.5.0 + * + * @param array $config { + * Application configuration. + * + * @type string $app_root Absolute path to the application root directory. + * @type string $app_url URL path where the application will be accessible. + * @type string $startup Startup file (e.g., 'app.js', 'server.js'). + * @type string $node_version Node.js version to use (e.g., '22'). + * @type int $port Port number for the application (if applicable). + * } + * @return array{success: bool, message: string, app_id?: string} + */ + public function create_app(array $config): array; + + /** + * Start a Node.js application. + * + * @since 2.5.0 + * + * @param string $app_id Application identifier (path, name, or ID). + * @return array{success: bool, message: string} + */ + public function start_app(string $app_id): array; + + /** + * Stop a running Node.js application. + * + * @since 2.5.0 + * + * @param string $app_id Application identifier. + * @return array{success: bool, message: string} + */ + public function stop_app(string $app_id): array; + + /** + * Restart a Node.js application. + * + * @since 2.5.0 + * + * @param string $app_id Application identifier. + * @return array{success: bool, message: string} + */ + public function restart_app(string $app_id): array; + + /** + * Remove/unregister a Node.js application. + * + * @since 2.5.0 + * + * @param string $app_id Application identifier. + * @return array{success: bool, message: string} + */ + public function destroy_app(string $app_id): array; + + /** + * Get the status of a Node.js application. + * + * @since 2.5.0 + * + * @param string $app_id Application identifier. + * @return array{ + * success: bool, + * running: bool, + * message: string, + * pid?: int, + * uptime?: string, + * memory?: string + * } + */ + public function get_app_status(string $app_id): array; + + /** + * List all registered Node.js applications. + * + * @since 2.5.0 + * @return array{ + * success: bool, + * apps: array', 'ultimate-multisite'), + '' . esc_html($payment_info['brand']) . '', + '' . esc_html($payment_info['last4']) . '' + ) . $description; + } + $fields = [ - 'membership' => [ - 'type' => 'hidden', - 'value' => wu_request('membership'), - ], - 'redirect_url' => [ - 'type' => 'hidden', - 'value' => wu_request('redirect_url'), - ], - 'confirm' => [ - 'type' => 'toggle', - 'title' => __('Confirm Payment Method Cancellation', 'ultimate-multisite'), - 'desc' => __('This action can not be undone.', 'ultimate-multisite'), - 'html_attr' => [ - 'v-model' => 'confirmed', - ], - ], - 'wu-when' => [ - 'type' => 'hidden', - 'value' => base64_encode('init'), // phpcs:ignore + 'description' => [ + 'type' => 'note', + 'desc' => $description, ], 'submit_button' => [ - 'type' => 'submit', - 'title' => __('Cancel Payment Method', 'ultimate-multisite'), - 'placeholder' => __('Cancel Payment Method', 'ultimate-multisite'), - 'value' => 'save', - 'classes' => 'button button-primary wu-w-full', + 'type' => 'link', + 'display_value' => __('Change Payment Method', 'ultimate-multisite'), + 'classes' => 'button button-primary wu-w-full wu-text-center', 'wrapper_classes' => 'wu-items-end', 'html_attr' => [ - 'v-bind:disabled' => '!confirmed', + 'href' => $change_url, + 'target' => '_top', ], ], ]; $form = new \WP_Ultimo\UI\Form( - 'cancel_payment_method', + 'change_payment_method', $fields, [ 'views' => 'admin-pages/fields', 'classes' => 'wu-modal-form wu-widget-list wu-striped wu-m-0 wu-mt-0', 'field_wrapper_classes' => 'wu-w-full wu-box-border wu-items-center wu-flex wu-justify-between wu-p-4 wu-m-0 wu-border-t wu-border-l-0 wu-border-r-0 wu-border-b-0 wu-border-gray-300 wu-border-solid', - 'html_attr' => [ - 'data-wu-app' => 'cancel_payment_method', - 'data-state' => wu_convert_to_state( - [ - 'confirmed' => false, - ] - ), - ], ] ); @@ -1099,55 +1110,14 @@ public function render_cancel_payment_method(): void { } /** - * Handles the payment method cancellation. + * Handles the change payment method form. * - * @since 2.1.2 + * This is a no-op since the modal just redirects via a link button. + * + * @since 2.5.0 * @return void */ - public function handle_cancel_payment_method(): void { - - $membership = wu_get_membership_by_hash(wu_request('membership')); - - if ( ! $membership) { - $error = new \WP_Error('error', __('An unexpected error happened.', 'ultimate-multisite')); - - wp_send_json_error($error); - - return; - } - - $customer = wu_get_current_customer(); - - if ( ! is_super_admin() && (! $customer || $customer->get_id() !== $membership->get_customer_id())) { - $error = new \WP_Error('error', __('You are not allowed to do this.', 'ultimate-multisite')); - - wp_send_json_error($error); - - return; - } - - $membership->set_gateway(''); - $membership->set_gateway_subscription_id(''); - $membership->set_gateway_customer_id(''); - $membership->set_auto_renew(false); - - $membership->save(); - - $redirect_url = wu_request('redirect_url'); - - $redirect_url = add_query_arg( - [ - 'payment_gateway_cancelled' => true, - ], - $redirect_url ?? user_admin_url() - ); - - wp_send_json_success( - [ - 'redirect_url' => $redirect_url, - ] - ); - } + public function handle_change_payment_method(): void {} /** * Renders the cancel payment method modal. @@ -1330,6 +1300,22 @@ public function handle_cancel_membership(): void { $reason = wu_get_isset($cancellation_options, wu_request('cancellation_reason'), ''); try { + /* + * Cancel the subscription on the payment gateway before + * cancelling the membership. This ensures the external + * subscription (e.g., WooCommerce Subscriptions, Stripe) + * is properly cancelled and won't continue to charge. + */ + $gateway_id = $membership->get_gateway(); + + if ( ! empty($gateway_id)) { + $gateway = wu_get_gateway($gateway_id); + + if ($gateway) { + $gateway->process_cancellation($membership, $customer); + } + } + $membership->cancel($reason); } catch (\Exception $e) { wp_send_json_error( diff --git a/inc/ui/class-tours.php b/inc/ui/class-tours.php index 7abf87e06..068e01be0 100644 --- a/inc/ui/class-tours.php +++ b/inc/ui/class-tours.php @@ -76,7 +76,7 @@ public function register_scripts(): void { WP_Ultimo()->scripts->register_script_module('shepherd.js', wu_get_asset('lib/shepherd.js', 'js')); WP_Ultimo()->scripts->register_style('shepherd', wu_get_asset('lib/shepherd.css', 'css')); - WP_Ultimo()->scripts->register_script_module('wu-tours', wu_get_asset('tours.js', 'js'), ['shepherd.js', 'underscore']); + WP_Ultimo()->scripts->register_script_module('wu-tours', wu_get_asset('tours.js', 'js'), ['shepherd.js']); } /** @@ -104,6 +104,7 @@ public function enqueue_scripts(): void { ] ); + wp_enqueue_script('underscore'); wp_enqueue_script_module('wu-tours'); wp_enqueue_style('shepherd'); } diff --git a/patches/mpdf-psr-log-aware-trait-void-return.patch b/patches/mpdf-psr-log-aware-trait-void-return.patch new file mode 100644 index 000000000..20d1672bd --- /dev/null +++ b/patches/mpdf-psr-log-aware-trait-void-return.patch @@ -0,0 +1,11 @@ +--- /dev/null ++++ ../src/MpdfPsrLogAwareTrait.php +@@ -12,7 +12,7 @@ + */ + protected $logger; + +- public function setLogger(LoggerInterface $logger) ++ public function setLogger(LoggerInterface $logger): void + { + $this->logger = $logger; + if (property_exists($this, 'services') && is_array($this->services)) { \ No newline at end of file diff --git a/readme.txt b/readme.txt index 66a8aacd3..b320bea61 100644 --- a/readme.txt +++ b/readme.txt @@ -1,15 +1,15 @@ === Ultimate Multisite – WordPress Multisite SaaS & WaaS Platform === Contributors: aanduque, superdav42, vvwb, surferking Donate link: https://github.com/sponsors/superdav42/ -Tags: ultimate multisite, wordpress multisite, multisite plugin, multisite saas, waas, domain mapping, wp ultimo +Tags: multisite, domain mapping, wordpress multisite, multisite saas, waas Requires at least: 5.3 Requires PHP: 7.4.30 Tested up to: 6.9 -Stable tag: 2.4.11 +Stable tag: 2.4.12 License: GPLv2 License URI: http://www.gnu.org/licenses/gpl-2.0.html -Ultimate Multisite is a WordPress Multisite plugin that turns your network into a complete Website-as-a-Service (WaaS) platform with subscriptions, site provisioning, domain mapping, and customer management. +Ultimate Multisite turns your WordPress network into a WaaS platform with subscriptions, site provisioning, and domain mapping. == Description == @@ -225,6 +225,30 @@ Data collected includes: No personal data, domains, IP addresses, or payment information are collected. == Changelog == +Version [2.4.12] - Released on 2026-XX-XX +- New: Send Invoice and Resend Invoice workflows for payments. +- New: Standalone "Pay Invoice" checkout form for invoice payments without a membership. +- New: Payment Methods element displaying current card info and change payment method flow via Stripe Billing Portal. +- New: System events for invoice sent, recurring payment failure, and membership expired with email notifications. +- New: Checkout form debug autofill button when WP_ULTIMO_DEBUG is enabled. +- New: Domain meta table for storing metadata on domain records. +- New: Extensibility hooks on domain mapping widget and domain list table. +- New: Node Management capability interface for hosting integrations. +- Fix: Password strength validation no longer blocks checkout when the meter element is absent. +- Fix: %2F being stripped from SSO redirect URLs breaking some WooCommerce URLs. +- Fix: Stripe Checkout gateway updated to current API — uses price_data format, proper subscription/payment mode, and skips zero-amount items. +- Fix: Removed deprecated Stripe API version pin and product type parameter. +- Fix: Membership cancellation now properly cancels the gateway subscription before the local membership. +- Fix: Payments no longer require a membership, enabling standalone invoices. +- Fix: Cart no longer overrides duration for products with independent billing cycles. +- Fix: Network installer correctly sets core multisite table names. +- Fix: Admin page save handlers now return proper bool values. +- Improved: "Change Payment Method" replaces the destructive "Cancel Payment Method" flow. +- Improved: Integration wizard API key fields use password input type to prevent browser autofill. +- Improved: Integration wizard shows error state on test failure and improved navigation. +- Improved: Addon settings grouped under dedicated admin bar submenu. +- Improved: Select2 multi-select preserves saved option ordering. +- Improved: PayPal fires payment_failed event on IPN failures. Version [2.4.11] - Released on 2026-02-16 - New: Settings API for remote settings management. diff --git a/tests/WP_Ultimo/Admin_Pages/Payment_List_Admin_Page_Test.php b/tests/WP_Ultimo/Admin_Pages/Payment_List_Admin_Page_Test.php index 0d7a0d595..95d9f5568 100644 --- a/tests/WP_Ultimo/Admin_Pages/Payment_List_Admin_Page_Test.php +++ b/tests/WP_Ultimo/Admin_Pages/Payment_List_Admin_Page_Test.php @@ -97,7 +97,7 @@ public function test_action_links(): void { $links = $this->page->action_links(); $this->assertIsArray($links); - $this->assertCount(1, $links); + $this->assertCount(2, $links); } /** diff --git a/tests/WP_Ultimo/Update_Check_Test.php b/tests/WP_Ultimo/Update_Check_Test.php new file mode 100644 index 000000000..3ed3d2127 --- /dev/null +++ b/tests/WP_Ultimo/Update_Check_Test.php @@ -0,0 +1,263 @@ +plugin_file); + + $this->assertEmpty( + $plugin_data['UpdateURI'], + 'Plugin must NOT set Update URI header. Setting it to a non-WordPress.org URL would prevent WordPress.org update checks and active install tracking.' + ); + } + + /** + * Test that the plugin text domain matches the expected WordPress.org slug. + */ + public function test_text_domain_matches_slug(): void { + + $plugin_data = get_plugin_data(WP_PLUGIN_DIR . '/' . $this->plugin_file); + + $this->assertSame( + 'ultimate-multisite', + $plugin_data['TextDomain'], + 'Text domain must match the WordPress.org slug.' + ); + } + + /** + * Test that the plugin directory name matches the WordPress.org slug. + * + * The directory name (first segment of the plugin basename) must match + * the WordPress.org SVN slug for update checks to work. + */ + public function test_plugin_directory_matches_slug(): void { + + $dir = dirname($this->plugin_file); + + $this->assertSame('ultimate-multisite', $dir); + } + + /** + * Test that the plugin appears in the data WordPress sends to api.wordpress.org. + * + * This simulates what wp_update_plugins() builds as the request body. + * The plugin must be present in the plugins array for WordPress.org to + * count it as an active install. + */ + public function test_plugin_included_in_update_check_payload(): void { + + $plugins = get_plugins(); + + $this->assertArrayHasKey( + $this->plugin_file, + $plugins, + 'Plugin must be discoverable by get_plugins().' + ); + + // Simulate the Update URI filtering that wp_update_plugins() performs. + $plugin_data = $plugins[ $this->plugin_file ]; + $update_uri = $plugin_data['UpdateURI'] ?? ''; + + if ($update_uri) { + $hostname = wp_parse_url($update_uri, PHP_URL_HOST); + $excluded = $hostname && ! in_array($hostname, ['wordpress.org', 'w.org'], true); + } else { + $excluded = false; + } + + $this->assertFalse( + $excluded, + 'Plugin must NOT be excluded from WordPress.org update checks by Update URI header.' + ); + } + + /** + * Test that http_request_args filters do not block api.wordpress.org requests. + * + * Runs all registered http_request_args filters against a simulated + * WordPress.org update check URL and verifies the request is not blocked. + */ + public function test_http_request_args_do_not_block_wporg(): void { + + $url = 'https://api.wordpress.org/plugins/update-check/1.1/'; + $args = [ + 'timeout' => 30, + 'body' => [ + 'plugins' => wp_json_encode( + [ + 'plugins' => [ + $this->plugin_file => [ + 'Name' => 'Ultimate Multisite', + 'Version' => '2.4.11', + ], + ], + 'active' => [$this->plugin_file], + ] + ), + ], + ]; + + $filtered_args = apply_filters('http_request_args', $args, $url); + + // The request args should not be fundamentally changed + $this->assertIsArray($filtered_args, 'http_request_args must return an array.'); + $this->assertArrayHasKey('body', $filtered_args, 'Request body must still exist after filtering.'); + + // Verify the plugins data is still intact + $body = $filtered_args['body']; + $plugins = json_decode($body['plugins'], true); + + $this->assertArrayHasKey( + $this->plugin_file, + $plugins['plugins'], + 'Plugin must still be in the request body after http_request_args filters.' + ); + } + + /** + * Test that pre_http_request filters do not block api.wordpress.org requests. + * + * The pre_http_request filter can short-circuit HTTP requests. We verify + * that no filter blocks WordPress.org update check requests. + */ + public function test_pre_http_request_does_not_block_wporg(): void { + + $url = 'https://api.wordpress.org/plugins/update-check/1.1/'; + $args = [ + 'timeout' => 30, + 'body' => [], + ]; + + $result = apply_filters('pre_http_request', false, $args, $url); + + $this->assertFalse( + $result, + 'pre_http_request must return false for api.wordpress.org requests, allowing them to proceed. A non-false return would block the update check.' + ); + } + + /** + * Test that the beta update filter does not remove WordPress.org data. + * + * The maybe_inject_beta_update method on site_transient_update_plugins + * should only ADD beta data when enabled, not remove WordPress.org entries. + * When beta updates are disabled (the default), the transient should pass + * through unchanged. + */ + public function test_beta_update_filter_does_not_remove_wporg_data(): void { + + // Create a mock transient with WordPress.org data + $transient = new \stdClass(); + $transient->last_checked = time(); + $transient->checked = [$this->plugin_file => '2.4.10']; + $transient->response = []; + $transient->no_update = []; + $transient->no_update[ $this->plugin_file ] = (object) [ + 'id' => 'w.org/plugins/ultimate-multisite', + 'slug' => 'ultimate-multisite', + 'plugin' => $this->plugin_file, + 'new_version' => '2.4.10', + 'url' => 'https://wordpress.org/plugins/ultimate-multisite/', + 'package' => 'https://downloads.wordpress.org/plugin/ultimate-multisite.2.4.10.zip', + ]; + + // Ensure beta updates are disabled (the default) + wu_save_setting('enable_beta_updates', false); + + $filtered = apply_filters('site_transient_update_plugins', $transient); + + $this->assertIsObject($filtered, 'Transient must remain an object after filtering.'); + $this->assertArrayHasKey( + $this->plugin_file, + (array) $filtered->checked, + 'Plugin must remain in the checked array.' + ); + + // When WordPress.org says there's an update, verify it's preserved + $transient_with_update = clone $transient; + unset($transient_with_update->no_update[ $this->plugin_file ]); + $transient_with_update->response[ $this->plugin_file ] = (object) [ + 'id' => 'w.org/plugins/ultimate-multisite', + 'slug' => 'ultimate-multisite', + 'plugin' => $this->plugin_file, + 'new_version' => '2.4.12', + 'url' => 'https://wordpress.org/plugins/ultimate-multisite/', + 'package' => 'https://downloads.wordpress.org/plugin/ultimate-multisite.2.4.12.zip', + ]; + + $filtered2 = apply_filters('site_transient_update_plugins', $transient_with_update); + + $this->assertArrayHasKey( + $this->plugin_file, + (array) $filtered2->response, + 'WordPress.org update response must not be removed by filters when beta updates are disabled.' + ); + + $this->assertSame( + '2.4.12', + $filtered2->response[ $this->plugin_file ]->new_version, + 'WordPress.org update version must be preserved when beta updates are disabled.' + ); + } + + /** + * Test that no update_plugins_{hostname} filter hijacks our plugin. + * + * WordPress 5.8+ fires update_plugins_{hostname} for plugins with a custom + * Update URI. Since our plugin has no Update URI, this filter should not + * exist for our hostname. + */ + public function test_no_custom_update_hostname_filter(): void { + + global $wp_filter; + + // Check there's no filter for ultimatemultisite.com that could intercept core plugin updates + $filter_name = 'update_plugins_ultimatemultisite.com'; + + $has_filter = isset($wp_filter[ $filter_name ]) && $wp_filter[ $filter_name ]->has_filters(); + + $this->assertFalse( + $has_filter, + "Filter '$filter_name' should not be registered. This would only apply if the plugin had Update URI set to ultimatemultisite.com." + ); + } +} diff --git a/views/dashboard-widgets/domain-mapping.php b/views/dashboard-widgets/domain-mapping.php index bceb56f97..dd9e7773a 100644 --- a/views/dashboard-widgets/domain-mapping.php +++ b/views/dashboard-widgets/domain-mapping.php @@ -32,6 +32,17 @@ + + @@ -86,6 +97,52 @@ 'url' => $domain['delete_link'], ]; + /** + * Filters the action links for a domain row in the domain mapping widget. + * + * Allows addons to add extra actions (e.g. Manage DNS, Renew) for domain rows. + * + * @since 2.4.0 + * + * @param array $second_row_actions The action items for the row. + * @param object $item The domain object. + */ + $second_row_actions = apply_filters('wu_domain_mapping_row_actions', $second_row_actions, $item); + + $first_row = [ + 'primary' => [ + 'wrapper_classes' => $item->is_primary_domain() ? 'wu-text-blue-600' : '', + 'icon' => $item->is_primary_domain() ? 'dashicons-wu-filter_1 wu-align-text-bottom wu-mr-1' : 'dashicons-wu-plus-square wu-align-text-bottom wu-mr-1', + 'label' => '', + 'value' => function () use ($item) { + if ($item->is_primary_domain()) { + esc_html_e('Primary', 'ultimate-multisite'); + wu_tooltip(__('All other mapped domains will redirect to the primary domain.', 'ultimate-multisite'), 'dashicons-editor-help wu-align-middle wu-ml-1'); + } else { + esc_html_e('Alias', 'ultimate-multisite'); + } + }, + ], + 'secure' => [ + 'wrapper_classes' => $item->is_secure() ? 'wu-text-green-500' : '', + 'icon' => $item->is_secure() ? 'dashicons-wu-lock1 wu-align-text-bottom wu-mr-1' : 'dashicons-wu-lock1 wu-align-text-bottom wu-mr-1', + 'label' => '', + 'value' => $item->is_secure() ? __('Secure (HTTPS)', 'ultimate-multisite') : __('Not Secure (HTTP)', 'ultimate-multisite'), + ], + ]; + + /** + * Filters the info columns for a domain row in the domain mapping widget. + * + * Allows addons to add extra info (e.g. expiry date) for domain rows. + * + * @since 2.4.0 + * + * @param array $first_row The info columns for the row. + * @param object $item The domain object. + */ + $first_row = apply_filters('wu_domain_mapping_row_info', $first_row, $item); + wu_responsive_table_row( [ 'id' => false, @@ -93,27 +150,7 @@ 'url' => false, 'status' => $status, ], - [ - 'primary' => [ - 'wrapper_classes' => $item->is_primary_domain() ? 'wu-text-blue-600' : '', - 'icon' => $item->is_primary_domain() ? 'dashicons-wu-filter_1 wu-align-text-bottom wu-mr-1' : 'dashicons-wu-plus-square wu-align-text-bottom wu-mr-1', - 'label' => '', - 'value' => function () use ($item) { - if ($item->is_primary_domain()) { - esc_html_e('Primary', 'ultimate-multisite'); - wu_tooltip(__('All other mapped domains will redirect to the primary domain.', 'ultimate-multisite'), 'dashicons-editor-help wu-align-middle wu-ml-1'); - } else { - esc_html_e('Alias', 'ultimate-multisite'); - } - }, - ], - 'secure' => [ - 'wrapper_classes' => $item->is_secure() ? 'wu-text-green-500' : '', - 'icon' => $item->is_secure() ? 'dashicons-wu-lock1 wu-align-text-bottom wu-mr-1' : 'dashicons-wu-lock1 wu-align-text-bottom wu-mr-1', - 'label' => '', - 'value' => $item->is_secure() ? __('Secure (HTTPS)', 'ultimate-multisite') : __('Not Secure (HTTP)', 'ultimate-multisite'), - ], - ], + $first_row, $second_row_actions ); diff --git a/views/dashboard-widgets/payment-methods.php b/views/dashboard-widgets/payment-methods.php new file mode 100644 index 000000000..5db3c77c6 --- /dev/null +++ b/views/dashboard-widgets/payment-methods.php @@ -0,0 +1,90 @@ + +
+
+
+
+
diff --git a/views/dashboard-widgets/thank-you.php b/views/dashboard-widgets/thank-you.php
index a7965d94d..1854ab593 100644
--- a/views/dashboard-widgets/thank-you.php
+++ b/views/dashboard-widgets/thank-you.php
@@ -250,11 +250,11 @@
-
+
); ?>)
diff --git a/views/emails/admin/membership-expired.php b/views/emails/admin/membership-expired.php
new file mode 100644
index 000000000..1f8769096
--- /dev/null
+++ b/views/emails/admin/membership-expired.php
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/views/emails/admin/payment-failed.php b/views/emails/admin/payment-failed.php
new file mode 100644
index 000000000..1e98de666
--- /dev/null
+++ b/views/emails/admin/payment-failed.php
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/views/emails/customer/membership-expired.php b/views/emails/customer/membership-expired.php
new file mode 100644
index 000000000..9286b6a04
--- /dev/null
+++ b/views/emails/customer/membership-expired.php
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/views/emails/customer/payment-failed.php b/views/emails/customer/payment-failed.php
new file mode 100644
index 000000000..bdc535469
--- /dev/null
+++ b/views/emails/customer/payment-failed.php
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/views/settings/fields/field-select2.php b/views/settings/fields/field-select2.php
index 24a6003ca..c3e4fe7d4 100644
--- a/views/settings/fields/field-select2.php
+++ b/views/settings/fields/field-select2.php
@@ -22,8 +22,18 @@
diff --git a/views/wizards/host-integrations/configuration.php b/views/wizards/host-integrations/configuration.php
index 51728d590..ea2715d4f 100644
--- a/views/wizards/host-integrations/configuration.php
+++ b/views/wizards/host-integrations/configuration.php
@@ -5,6 +5,10 @@
* @since 2.0.0
*/
defined('ABSPATH') || exit;
+
+/** @var \WP_Ultimo\Admin_Pages\Wizard_Admin_Page $page */
+$back_url = $page->get_prev_section_link();
+/** @var \WP_Ultimo\UI\Form $form */
?>
+ +
| + | + {{membership_description}} + | +
| + | + {{membership_id}} + | +
| + | + {{membership_reference_code}} + | +
| + | {{membership_date_expiration}} | +
| + | + + | +
+ +
| + | + {{customer_name}} + | +
| + | + {{customer_user_email}} + | +
| + | + + | +
+ +
| + | + {{membership_description}} + | +
| + | + {{membership_id}} + | +
| + | + {{membership_reference_code}} + | +
| + | {{payment_gateway}} | +
| + | {{membership_date_expiration}} | +
| + | + + | +
+ +
| + | + {{customer_name}} + | +
| + | + {{customer_user_email}} + | +
| + | + + | +
+ +
| + | + {{membership_description}} + | +
| + | + {{membership_reference_code}} + | +
| + | {{membership_date_expiration}} | +
+ +
| + | + {{membership_description}} + | +
| + | {{membership_date_expiration}} | +
| + | {{payment_gateway}} | +