wp mcp-adapter serve --server=mcp-adapter-default-server --user=admin',
+ 'require' => [
+ 'enable_mcp' => 1,
+ ],
+ ]
+ );
+ }
+
+ /**
+ * Get the MCP adapter instance.
+ *
+ * @since 2.5.0
+ * @return McpAdapterCore|null
+ */
+ public function get_adapter(): ?McpAdapterCore {
+
+ return $this->adapter;
+ }
+
+ /**
+ * Checks if the MCP adapter is enabled.
+ *
+ * @since 2.5.0
+ * @return bool
+ */
+ public function is_mcp_enabled(): bool {
+
+ /**
+ * Allow plugin developers to force a given state for the MCP adapter.
+ *
+ * @since 2.5.0
+ * @param bool $enabled Whether the MCP adapter is enabled.
+ * @return bool
+ */
+ return apply_filters('wu_is_mcp_enabled', wu_get_setting('enable_mcp', false));
+ }
+
+
+ /**
+ * Get abilities for MCP server.
+ *
+ * Filters abilities to include only those with 'wu_' namespace by default,
+ * with a filter to allow inclusion of abilities from other namespaces.
+ *
+ * @return array Array of ability IDs for MCP server.
+ */
+ private function get_mcp_abilities(): array {
+
+ // Check if the abilities API is available.
+ if ( ! function_exists('wp_get_abilities') ) {
+ return array();
+ }
+
+ $all_abilities_ids = array_keys(wp_get_abilities());
+
+ // Filter abilities based on namespace and custom filter.
+ $mcp_abilities = array_filter(
+ $all_abilities_ids,
+ function ($ability_id) {
+ // Include Ultimate Multisite abilities by default.
+ $include = str_starts_with($ability_id, 'multisite-ultimate/');
+
+ // Allow filter to override inclusion decision.
+ /**
+ * Filter to override MCP ability inclusion decision.
+ *
+ * @since 2.4.8
+ * @param bool $include Whether to include the ability.
+ * @param string $ability_id The ability ID.
+ */
+ return apply_filters('wu_mcp_include_ability', $include, $ability_id);
+ }
+ );
+
+ // Re-index array.
+ return array_values($mcp_abilities);
+ }
+
+ /**
+ * Use API Key.
+ *
+ * @param \WP_REST_Request|null $request The Request.
+ *
+ * @return bool|\WP_Error
+ */
+ public function permission_callback(\WP_REST_Request $request = null) {
+ if ($request) {
+ $this->current_request = $request;
+ }
+ if (! $this->current_request) {
+ return new \WP_Error('no_request_object', 'Request Object lost', ['status' => 500]);
+ }
+
+ $result = API::get_instance()->check_authorization($this->current_request);
+
+ if ( ! $result) {
+ return new \WP_Error('invalid_api_key', 'Invalid API key', ['status' => 403]);
+ }
+
+ return $result;
+ }
+
+ /**
+ * For backwards compatibility we use pre dispatch to save the request object.
+ *
+ * @param \WP_REST_Response $result The result.
+ * @param \WP_REST_Server $server The server.
+ * @param \WP_REST_Request $request The request.
+ *
+ * @return mixed
+ */
+ public function rest_pre_dispatch_save_request($result, $server, $request) {
+ $this->current_request = $request;
+ return $result;
+ }
+}
diff --git a/inc/class-wp-ultimo.php b/inc/class-wp-ultimo.php
index 7cadbd4bb..ec2b1b9c3 100644
--- a/inc/class-wp-ultimo.php
+++ b/inc/class-wp-ultimo.php
@@ -438,6 +438,8 @@ protected function load_extra_components(): void {
*/
WP_Ultimo\SSO\SSO::get_instance();
+ WP_Ultimo\SSO\Magic_Link::get_instance();
+
/*
* Loads the debugger tools
*/
@@ -642,6 +644,8 @@ function () {
* Cron Schedules
*/
\WP_Ultimo\Cron::get_instance();
+
+ \WP_Ultimo\MCP_Adapter::get_instance();
}
/**
@@ -666,6 +670,11 @@ protected function load_admin_pages(): void {
*/
new WP_Ultimo\Admin_Pages\Top_Admin_Nav_Menu();
+ /*
+ * Initialize magic links for admin bar My Sites menu.
+ */
+ \WP_Ultimo\SSO\Admin_Bar_Magic_Links::get_instance();
+
/*
* Loads the Checkout Form admin page.
*/
diff --git a/inc/country/class-country.php b/inc/country/class-country.php
index aba3565d6..19db79d48 100644
--- a/inc/country/class-country.php
+++ b/inc/country/class-country.php
@@ -80,7 +80,7 @@ public function get_states() {
*
* @param array $states List of states in a XX => Name format.
* @param string $country_code Two-letter ISO code for the country.
- * @param WP_Ultimo\Country\Country $current_country Instance of the current class.
+ * @param \WP_Ultimo\Country\Country $current_country Instance of the current class.
* @return array The filtered list of states.
*/
return apply_filters('wu_country_get_states', $states, $this->country_code, $this);
@@ -140,7 +140,7 @@ public function get_cities($state_code = '') {
* @param array $cities List of state city names. No keys are present.
* @param string $country_code Two-letter ISO code for the country.
* @param string $state_code Two-letter ISO code for the state.
- * @param WP_Ultimo\Country\Country $current_country Instance of the current class.
+ * @param \WP_Ultimo\Country\Country $current_country Instance of the current class.
* @return array The filtered list of states.
*/
return apply_filters('wu_country_get_cities', $cities, $this->country_code, $state_code, $this);
@@ -238,14 +238,14 @@ public function get_administrative_division_name($state_code = null, $ucwords =
/**
* Returns nice name of the country administrative sub-divisions.
*
- * @since 2.0.11
- *
* @param string $name The division name. Usually something like state, province, region, etc.
* @param string $country_code Two-letter ISO code for the country.
* @param string $state_code Two-letter ISO code for the state.
- * @param WP_Ultimo\Country\Country $current_country Instance of the current class.
- * @param bool $current_country Instance of the current class.
+ * @param bool $ucwords if we uppercase the words.
+ * @param \WP_Ultimo\Country\Country $current_country Instance of the current class.
+ *
* @return string The modified division name.
+ *@since 2.0.11
*/
return apply_filters('wu_country_get_administrative_division_name', $name, $this->country_code, $state_code, $ucwords, $this);
}
diff --git a/inc/functions/domain.php b/inc/functions/domain.php
index 8cdf29dd7..7734326b3 100644
--- a/inc/functions/domain.php
+++ b/inc/functions/domain.php
@@ -30,7 +30,7 @@ function wu_get_domain($domain_id) {
* @since 2.0.0
*
* @param array $query Query arguments.
- * @return \WP_Ultimo\Models\Domain[]
+ * @return \WP_Ultimo\Models\Domain[]|string[]|int
*/
function wu_get_domains($query = []) {
diff --git a/inc/functions/settings.php b/inc/functions/settings.php
index 7dd0edcc5..fc5592859 100644
--- a/inc/functions/settings.php
+++ b/inc/functions/settings.php
@@ -6,8 +6,6 @@
* @since 2.0.0
*/
-use WP_Ultimo\Dependencies\Intervention\Image\ImageManagerStatic as Image;
-
// Exit if accessed directly
defined('ABSPATH') || exit;
@@ -33,12 +31,12 @@ function wu_get_all_settings() {
* @since 2.0.0
*
* @param string $setting Settings name to return.
- * @param mixed $default Default value for the setting if it doesn't exist.
+ * @param mixed $default_value Default value for the setting if it doesn't exist.
* @return mixed The value of that setting
*/
-function wu_get_setting($setting, $default = false) {
+function wu_get_setting($setting, $default_value = false) {
- return WP_Ultimo()->settings->get_setting($setting, $default);
+ return WP_Ultimo()->settings->get_setting($setting, $default_value);
}
/**
diff --git a/inc/functions/url.php b/inc/functions/url.php
index 96a7b0a0c..08de312b3 100644
--- a/inc/functions/url.php
+++ b/inc/functions/url.php
@@ -93,3 +93,70 @@ function wu_ajax_url($when = null, $query_args = [], $site_id = false, $scheme =
return apply_filters('wu_ajax_url', $url, $query_args, $when, $site_id);
}
+
+
+/**
+ * Adds a magic link if needed.
+ *
+ * @param ?int $blog_id Blog id.
+ * @param string $path Path.
+ * @param ?string $scheme Scheme.
+ *
+ * @return false|string
+ */
+function wu_get_admin_url($blog_id = null, $path = '', $scheme = 'admin') {
+ if (! $blog_id) {
+ return get_admin_url($blog_id, $path, $scheme);
+ }
+
+ $current_user_id = get_current_user_id();
+ $admin_url = get_admin_url($blog_id, $path, $scheme);
+
+ if ( ! $current_user_id ) {
+ return $admin_url;
+ }
+
+ $magic_link = \WP_Ultimo\SSO\Magic_Link::get_instance();
+
+ // Check if a magic link is needed.
+ if ( ! $magic_link->site_needs_magic_link($blog_id) ) {
+ return $admin_url;
+ }
+
+ $magic_link_url = $magic_link->generate_magic_link($current_user_id, $blog_id, $admin_url);
+
+ return $magic_link_url ?: get_admin_url($blog_id, $path, $scheme);
+}
+
+/**
+ * Adds a magic link if needed.
+ *
+ * @param ?int $blog_id Blog id.
+ *
+ * @return false|string
+ */
+function wu_get_home_url($blog_id = null) {
+ $site = wu_get_site($blog_id);
+
+ if (! $site) {
+ return get_home_url($blog_id);
+ }
+
+ $home_url = $site->get_active_site_url();
+ $current_user_id = get_current_user_id();
+
+ if ( ! $current_user_id) {
+ return $home_url;
+ }
+
+ $magic_link = \WP_Ultimo\SSO\Magic_Link::get_instance();
+
+ // Check if magic link is needed.
+ if ( ! $magic_link->site_needs_magic_link($blog_id) ) {
+ return $home_url;
+ }
+
+ $magic_link_url = $magic_link->generate_magic_link($current_user_id, $blog_id, $home_url);
+
+ return $magic_link_url ?: get_home_url($blog_id);
+}
diff --git a/inc/helpers/class-validator.php b/inc/helpers/class-validator.php
index 8f279eb57..48af911ba 100644
--- a/inc/helpers/class-validator.php
+++ b/inc/helpers/class-validator.php
@@ -36,7 +36,7 @@ class Validator {
* Holds an instance of the validator object.
*
* @since 2.0.0
- * @var Rakit\Validation\Validator
+ * @var \Rakit\Validation\Validator
*/
protected $validator;
@@ -44,7 +44,7 @@ class Validator {
* Holds an instance of the validation being performed.
*
* @since 2.0.0
- * @var Rakit\Validation\Validation
+ * @var \Rakit\Validation\Validation
*/
protected $validation;
@@ -181,7 +181,7 @@ protected function cast_to_wp_error($errors) {
* Get holds an instance of the validation being performed.
*
* @since 2.0.0
- * @return Rakit\Validation\Validation
+ * @return \Rakit\Validation\Validation
*/
public function get_validation() {
diff --git a/inc/integrations/host-providers/class-gridpane-host-provider.php b/inc/integrations/host-providers/class-gridpane-host-provider.php
index 9d5d8808b..8cb375dc6 100644
--- a/inc/integrations/host-providers/class-gridpane-host-provider.php
+++ b/inc/integrations/host-providers/class-gridpane-host-provider.php
@@ -9,8 +9,6 @@
namespace WP_Ultimo\Integrations\Host_Providers;
-use WP_Ultimo\Integrations\Host_Providers\Base_Host_Provider;
-
// Exit if accessed directly
defined('ABSPATH') || exit;
@@ -137,7 +135,7 @@ public function send_gridpane_api_request($endpoint, $data = [], $method = 'POST
* @since 2.0.0
* @param string $domain The domain name being mapped.
* @param int $site_id ID of the site that is receiving that mapping.
- * @return object\WP_Error
+ * @return object|\WP_Error
*/
public function on_add_domain($domain, $site_id) {
@@ -157,7 +155,7 @@ public function on_add_domain($domain, $site_id) {
* @since 2.0.0
* @param string $domain The domain name being removed.
* @param int $site_id ID of the site that is receiving that mapping.
- * @return object\WP_Error
+ * @return object|\WP_Error
*/
public function on_remove_domain($domain, $site_id) {
diff --git a/inc/list-tables/class-base-list-table.php b/inc/list-tables/class-base-list-table.php
index 29838ab69..86f86ee8f 100644
--- a/inc/list-tables/class-base-list-table.php
+++ b/inc/list-tables/class-base-list-table.php
@@ -223,7 +223,7 @@ public function get_label($label = 'singular') {
* @param integer $per_page Number of items to display per page.
* @param integer $page_number Current page.
* @param boolean $count If we should count records or return the actual records.
- * @return array
+ * @return array|int
*/
public function get_items($per_page = 5, $page_number = 1, $count = false) {
@@ -273,7 +273,7 @@ public function get_items($per_page = 5, $page_number = 1, $count = false) {
* @param array $query_args The query args.
* @return mixed
*/
- protected function _get_items($query_args) {
+ protected function _get_items($query_args) { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
$query_class = new $this->query_class();
@@ -518,10 +518,22 @@ public function display(): void {
}
}
+ /**
+ * Returns the filters for this page.
+ *
+ * @since 2.0.0
+ */
+ public function get_filters(): array {
+
+ return [
+ 'filters' => [],
+ 'date_filters' => [],
+ ];
+ }
+
/**
* Display the filters if they exist.
*
- * @todo: refator
* @since 2.0.0
* @return void
*/
@@ -635,7 +647,7 @@ public function process_single_action() {}
* Handles the bulk processing.
*
* @since 2.0.0
- * @return bool
+ * @return bool|\WP_Error
*/
public static function process_bulk_action() {
@@ -824,7 +836,7 @@ public function column_default($item, $column_name) {
* @param string $date Valid date to be used inside a strtotime call.
* @return string
*/
- public function _column_datetime($date) {
+ public function _column_datetime($date) { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
if ( ! wu_validate_date($date)) {
return __('--', 'ultimate-multisite');
@@ -1150,7 +1162,7 @@ public function column_cb($item) {
*
* @since 2.0.0
*/
- public function _get_js_var_name(): string {
+ public function _get_js_var_name(): string { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
return str_replace('-', '_', $this->id);
}
@@ -1161,7 +1173,7 @@ public function _get_js_var_name(): string {
* @since 2.0.0
* @return void
*/
- public function _js_vars(): void {
+ public function _js_vars(): void { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
/**
* Call the parent method for backwards compat.
@@ -1305,16 +1317,6 @@ public function get_sortable_columns() {
public function get_extra_fields() {
return [];
-
- $_filter_fields = [];
-
- if (isset($filters['filters'])) {
- foreach ($filters['filters'] as $field_name => $field) {
- $_filter_fields[ $field_name ] = wu_request($field_name, '');
- }
- }
-
- return $_filter_fields;
}
/**
diff --git a/inc/list-tables/class-checkout-form-list-table.php b/inc/list-tables/class-checkout-form-list-table.php
index 2311ca563..d254d5aaa 100644
--- a/inc/list-tables/class-checkout-form-list-table.php
+++ b/inc/list-tables/class-checkout-form-list-table.php
@@ -52,7 +52,7 @@ public function __construct() {
*
* @since 2.0.0
*
- * @param WP_Ultimo\Models\Checkout_Form $item Checkout Form object.
+ * @param \WP_Ultimo\Models\Checkout_Form $item Checkout Form object.
*/
public function column_name($item): string {
@@ -89,7 +89,7 @@ public function column_name($item): string {
*
* @since 2.0.0
*
- * @param WP_Ultimo\Models\Checkout_Form $item Checkout Form object.
+ * @param \WP_Ultimo\Models\Checkout_Form $item Checkout Form object.
* @return string
*/
public function column_slug($item) {
@@ -104,7 +104,7 @@ public function column_slug($item) {
*
* @since 2.0.0
*
- * @param WP_Ultimo\Models\Checkout_Form $item Checkout Form object.
+ * @param \WP_Ultimo\Models\Checkout_Form $item Checkout Form object.
*/
public function column_steps($item): string {
// translators: %1$d: number of steps, %2$d: number of fields
@@ -116,7 +116,7 @@ public function column_steps($item): string {
*
* @since 2.0.0
*
- * @param WP_Ultimo\Models\Checkout_Form $item Checkout Form object.
+ * @param \WP_Ultimo\Models\Checkout_Form $item Checkout Form object.
*/
public function column_shortcode($item): string {
@@ -128,7 +128,7 @@ public function column_shortcode($item): string {
__('Copy to the Clipboard', 'ultimate-multisite')
);
- return sprintf('', esc_attr($item->get_shortcode()), '');
+ return sprintf('', esc_attr($item->get_shortcode()));
}
/**
@@ -203,17 +203,4 @@ public function get_columns() {
return $columns;
}
-
- /**
- * Returns the filters for this page.
- *
- * @since 2.0.0
- */
- public function get_filters(): array {
-
- return [
- 'filters' => [],
- 'date_filters' => [],
- ];
- }
}
diff --git a/inc/list-tables/class-customers-site-list-table.php b/inc/list-tables/class-customers-site-list-table.php
index a151a11bd..827a80bc8 100644
--- a/inc/list-tables/class-customers-site-list-table.php
+++ b/inc/list-tables/class-customers-site-list-table.php
@@ -84,7 +84,7 @@ public function column_responsive($item): void {
'icon' => 'dashicons-wu-browser wu-align-middle wu-mr-1',
'label' => __('Go to the Dashboard', 'ultimate-multisite'),
'value' => __('Dashboard', 'ultimate-multisite'),
- 'url' => get_admin_url($item->get_id()),
+ 'url' => wu_get_admin_url($item->get_id()),
],
'membership' => [
'icon' => 'dashicons-wu-rotate-ccw wu-align-middle wu-mr-1',
diff --git a/inc/list-tables/class-discount-code-list-table.php b/inc/list-tables/class-discount-code-list-table.php
index a545e8967..5d5dee308 100644
--- a/inc/list-tables/class-discount-code-list-table.php
+++ b/inc/list-tables/class-discount-code-list-table.php
@@ -52,7 +52,7 @@ public function __construct() {
*
* @since 2.0.0
*
- * @param WP_Ultimo\Models\Discount_Code $item Discount_Code object.
+ * @param \WP_Ultimo\Models\Discount_Code $item Discount_Code object.
*/
public function column_name($item): string {
@@ -84,7 +84,7 @@ public function column_name($item): string {
*
* @since 2.0.0
*
- * @param WP_Ultimo\Models\Discount_Code $item Discount_Code object.
+ * @param \WP_Ultimo\Models\Discount_Code $item Discount_Code object.
*
* @return string
*/
@@ -109,7 +109,7 @@ public function column_value($item) {
*
* @since 2.0.0
*
- * @param WP_Ultimo\Models\Discount_Code $item Discount_Code object.
+ * @param \WP_Ultimo\Models\Discount_Code $item Discount_Code object.
*
* @return string
*/
@@ -134,7 +134,7 @@ public function column_setup_fee_value($item) {
*
* @since 2.0.0
*
- * @param WP_Ultimo\Models\Discount_Code $item Discount_Code object.
+ * @param \WP_Ultimo\Models\Discount_Code $item Discount_Code object.
* @return string
*/
public function column_uses($item) {
@@ -158,7 +158,7 @@ public function column_uses($item) {
*
* @since 2.0.0
*
- * @param WP_Ultimo\Models\Discount_Code $item Discount_Code object.
+ * @param \WP_Ultimo\Models\Discount_Code $item Discount_Code object.
* @return string
*/
public function column_coupon_code($item) {
@@ -196,17 +196,4 @@ public function get_columns() {
return $columns;
}
-
- /**
- * Returns the filters for this page.
- *
- * @since 2.0.0
- */
- public function get_filters(): array {
-
- return [
- 'filters' => [],
- 'date_filters' => [],
- ];
- }
}
diff --git a/inc/list-tables/class-domain-list-table.php b/inc/list-tables/class-domain-list-table.php
index f81bc3e73..199105ba5 100644
--- a/inc/list-tables/class-domain-list-table.php
+++ b/inc/list-tables/class-domain-list-table.php
@@ -9,7 +9,6 @@
namespace WP_Ultimo\List_Tables;
-use WP_Ultimo\Models\Domain;
use WP_Ultimo\Database\Domains\Domain_Stage;
// Exit if accessed directly
@@ -72,7 +71,7 @@ public function get_extra_query_fields() {
*
* @since 2.0.0
*
- * @param WP_Ultimo\Models\Domain $item Domain object.
+ * @param \WP_Ultimo\Models\Domain $item Domain object.
*/
public function column_domain($item): string {
@@ -98,7 +97,7 @@ public function column_domain($item): string {
*
* @since 2.0.0
*
- * @param WP_Ultimo\Models\Domain $item Domain object.
+ * @param \WP_Ultimo\Models\Domain $item Domain object.
* @return string
*/
public function column_active($item) {
@@ -111,7 +110,7 @@ public function column_active($item) {
*
* @since 2.0.0
*
- * @param WP_Ultimo\Models\Domain $item Domain object.
+ * @param \WP_Ultimo\Models\Domain $item Domain object.
* @return string
*/
public function column_primary_domain($item) {
@@ -124,7 +123,7 @@ public function column_primary_domain($item) {
*
* @since 2.0.0
*
- * @param WP_Ultimo\Models\Domain $item Domain object.
+ * @param \WP_Ultimo\Models\Domain $item Domain object.
* @return string
*/
public function column_secure($item) {
diff --git a/inc/list-tables/class-membership-list-table-widget.php b/inc/list-tables/class-membership-list-table-widget.php
index 58fc7421a..829bac26b 100644
--- a/inc/list-tables/class-membership-list-table-widget.php
+++ b/inc/list-tables/class-membership-list-table-widget.php
@@ -115,7 +115,7 @@ public function get_extra_query_fields() {
*
* @since 2.0.0
*
- * @param WP_Ultimo\Models\Membership $item Membership object.
+ * @param \WP_Ultimo\Models\Membership $item Membership object.
*/
public function column_hash($item): string {
@@ -199,7 +199,7 @@ public function column_amount($item) {
*
* @since 2.0.0
*
- * @param WP_Ultimo\Models\Membership $item Membership object.
+ * @param \WP_Ultimo\Models\Membership $item Membership object.
* @return string
*/
public function column_customer($item) {
@@ -274,5 +274,5 @@ public function get_columns() {
* @since 2.0.0
* @return void
*/
- public function _js_vars(): void {}
+ public function _js_vars(): void {} // phpcs:ignore PSR2
}
diff --git a/inc/list-tables/class-membership-list-table.php b/inc/list-tables/class-membership-list-table.php
index 00815e364..f0f7cad36 100644
--- a/inc/list-tables/class-membership-list-table.php
+++ b/inc/list-tables/class-membership-list-table.php
@@ -66,7 +66,7 @@ public function get_extra_query_fields() {
*
* @since 2.0.0
*
- * @param WP_Ultimo\Models\Membership $item Membership object.
+ * @param \WP_Ultimo\Models\Membership $item Membership object.
* @return string
*/
public function column_hash($item) {
@@ -101,7 +101,7 @@ public function column_hash($item) {
*
* @since 2.0.0
*
- * @param WP_Ultimo\Models\Membership $item Membership object.
+ * @param \WP_Ultimo\Models\Membership $item Membership object.
* @return string
*/
public function column_status($item) {
@@ -120,7 +120,7 @@ public function column_status($item) {
*
* @since 2.0.0
*
- * @param WP_Ultimo\Models\Membership $item Membership object.
+ * @param \WP_Ultimo\Models\Membership $item Membership object.
* @return string
*/
public function column_amount($item) {
diff --git a/inc/list-tables/class-payment-list-table-widget.php b/inc/list-tables/class-payment-list-table-widget.php
index b670fca95..cb9ccf71b 100644
--- a/inc/list-tables/class-payment-list-table-widget.php
+++ b/inc/list-tables/class-payment-list-table-widget.php
@@ -229,9 +229,11 @@ public function get_columns() {
* Returns the filters for this page.
*
* @since 2.0.0
- * @return void.
+ * @return array
*/
- public function get_filters() {}
+ public function get_filters(): array {
+ return [];
+ }
/**
* Overrides the parent method to include the custom ajax functionality for Ultimate Multisite.
@@ -239,5 +241,5 @@ public function get_filters() {}
* @since 2.0.0
* @return void
*/
- public function _js_vars(): void {}
+ public function _js_vars(): void {} // phpcs:ignore PSR2
}
diff --git a/inc/list-tables/class-payment-list-table.php b/inc/list-tables/class-payment-list-table.php
index f0ddd7d11..053109f7a 100644
--- a/inc/list-tables/class-payment-list-table.php
+++ b/inc/list-tables/class-payment-list-table.php
@@ -107,7 +107,7 @@ public function column_hash($item) {
*
* @since 2.0.0
*
- * @param WP_Ultimo\Models\Payment $item Payment object.
+ * @param \WP_Ultimo\Models\Payment $item Payment object.
* @return string
*/
public function column_status($item) {
diff --git a/inc/list-tables/class-product-list-table.php b/inc/list-tables/class-product-list-table.php
index a29fa8c91..01201992c 100644
--- a/inc/list-tables/class-product-list-table.php
+++ b/inc/list-tables/class-product-list-table.php
@@ -52,7 +52,7 @@ public function __construct() {
*
* @since 2.0.0
*
- * @param WP_Ultimo\Models\Product $item Product object.
+ * @param \WP_Ultimo\Models\Product $item Product object.
* @return string
*/
public function column_name($item) {
@@ -91,7 +91,7 @@ public function column_name($item) {
*
* @since 2.0.0
*
- * @param WP_Ultimo\Models\Product $item Product object.
+ * @param \WP_Ultimo\Models\Product $item Product object.
* @return string
*/
public function column_type($item) {
@@ -108,7 +108,7 @@ public function column_type($item) {
*
* @since 2.0.0
*
- * @param WP_Ultimo\Models\Product $item Product object.
+ * @param \WP_Ultimo\Models\Product $item Product object.
* @return string
*/
public function column_slug($item) {
@@ -123,7 +123,7 @@ public function column_slug($item) {
*
* @since 2.0.0
*
- * @param WP_Ultimo\Models\Product $item Product object.
+ * @param \WP_Ultimo\Models\Product $item Product object.
* @return string
*/
public function column_amount($item) {
@@ -169,7 +169,7 @@ public function column_amount($item) {
*
* @since 2.0.0
*
- * @param WP_Ultimo\Models\Product $item Product object.
+ * @param \WP_Ultimo\Models\Product $item Product object.
* @return string
*/
public function column_setup_fee($item) {
@@ -266,7 +266,7 @@ public function get_columns() {
*
* @since 2.0.0
*
- * @param WP_Ultimo\Models\Product $item The line item being displayed.
+ * @param \WP_Ultimo\Models\Product $item The line item being displayed.
* @return void
*/
public function single_row_grid($item): void {
diff --git a/inc/list-tables/class-site-list-table.php b/inc/list-tables/class-site-list-table.php
index 55cb7ffb3..8ed6f68f7 100644
--- a/inc/list-tables/class-site-list-table.php
+++ b/inc/list-tables/class-site-list-table.php
@@ -112,7 +112,7 @@ public function column_cb($item): string {
*
* @since 2.0.0
*
- * @param WP_Ultimo\Models\Site $item Site object.
+ * @param \WP_Ultimo\Models\Site $item Site object.
*/
public function column_path($item): string {
@@ -121,8 +121,6 @@ public function column_path($item): string {
'model' => 'site',
];
- $title = $item->get_title();
-
$title = sprintf('%s', wu_network_admin_url('wp-ultimo-edit-site', $url_atts), $item->get_title());
// Concatenate the two blocks
@@ -220,7 +218,7 @@ public function column_blog_id($item) {
*
* @since 2.0.0
*
- * @param WP_Ultimo\Models\Site $item Site object.
+ * @param \WP_Ultimo\Models\Site $item Site object.
* @return string
*/
public function column_type($item) {
diff --git a/inc/list-tables/class-webhook-list-table.php b/inc/list-tables/class-webhook-list-table.php
index adb841520..258821d43 100644
--- a/inc/list-tables/class-webhook-list-table.php
+++ b/inc/list-tables/class-webhook-list-table.php
@@ -181,17 +181,4 @@ public function get_columns() {
return $columns;
}
-
- /**
- * Returns the filters for this page.
- *
- * @since 2.0.0
- */
- public function get_filters(): array {
-
- return [
- 'filters' => [],
- 'date_filters' => [],
- ];
- }
}
diff --git a/inc/list-tables/customer-panel/class-product-list-table.php b/inc/list-tables/customer-panel/class-product-list-table.php
index ad2eb73ef..a4b026a1c 100644
--- a/inc/list-tables/customer-panel/class-product-list-table.php
+++ b/inc/list-tables/customer-panel/class-product-list-table.php
@@ -48,19 +48,6 @@ public function get_columns() {
return [];
}
- /**
- * Resets the filters.
- *
- * @since 2.0.0
- */
- public function get_filters(): array {
-
- return [
- 'filters' => [],
- 'date_filters' => [],
- ];
- }
-
/**
* Resets bulk actions.
*
diff --git a/inc/list-tables/customer-panel/class-site-list-table.php b/inc/list-tables/customer-panel/class-site-list-table.php
index 2b88113d2..a9457ec17 100644
--- a/inc/list-tables/customer-panel/class-site-list-table.php
+++ b/inc/list-tables/customer-panel/class-site-list-table.php
@@ -48,19 +48,6 @@ public function get_columns() {
return [];
}
- /**
- * Clears filters.
- *
- * @since 2.0.0
- */
- public function get_filters(): array {
-
- return [
- 'filters' => [],
- 'date_filters' => [],
- ];
- }
-
/**
* Clears views.
*
diff --git a/inc/managers/class-broadcast-manager.php b/inc/managers/class-broadcast-manager.php
index 9fb4e1d3c..6c46fecc4 100644
--- a/inc/managers/class-broadcast-manager.php
+++ b/inc/managers/class-broadcast-manager.php
@@ -27,6 +27,7 @@ class Broadcast_Manager extends Base_Manager {
use \WP_Ultimo\Apis\Rest_Api;
use \WP_Ultimo\Apis\WP_CLI;
+ use \WP_Ultimo\Apis\MCP_Abilities;
use \WP_Ultimo\Traits\Singleton;
/**
@@ -57,6 +58,8 @@ public function init(): void {
$this->enable_wp_cli();
+ $this->enable_mcp_abilities();
+
/**
* Add unseen broadcast notices to the panel.
*/
@@ -97,7 +100,7 @@ public function add_unseen_broadcast_notices(): void {
$targets = [$targets];
}
- $dismissed = get_user_meta(get_current_user_id(), 'wu_dismissed_admin_notices');
+ $dismissed = get_user_meta(get_current_user_id(), 'wu_dismissed_admin_notices', false);
if (in_array($current_customer->get_id(), $targets, true) && ! in_array($broadcast->get_id(), $dismissed, true)) {
$notice = '' . $broadcast->get_title() . ' ' . $broadcast->get_content() . '';
diff --git a/inc/managers/class-customer-manager.php b/inc/managers/class-customer-manager.php
index 7cfe793ac..c09ecb37e 100644
--- a/inc/managers/class-customer-manager.php
+++ b/inc/managers/class-customer-manager.php
@@ -27,6 +27,7 @@ class Customer_Manager extends Base_Manager {
use \WP_Ultimo\Apis\Rest_Api;
use \WP_Ultimo\Apis\WP_CLI;
+ use \WP_Ultimo\Apis\MCP_Abilities;
use \WP_Ultimo\Traits\Singleton;
/**
@@ -57,6 +58,8 @@ public function init(): void {
$this->enable_wp_cli();
+ $this->enable_mcp_abilities();
+
add_action(
'init',
function () {
@@ -118,8 +121,8 @@ public function handle_resend_verification_email(): void {
* @return array $response The Heartbeat response
*/
public function on_heartbeat_send($response) {
-
- $this->log_ip_and_last_login(wp_get_current_user());
+ $user = wp_get_current_user();
+ $this->log_ip_and_last_login($user->user_login, $user);
return $response;
}
@@ -127,15 +130,14 @@ public function on_heartbeat_send($response) {
/**
* Saves the IP address and last_login date onto the user.
*
- * @since 2.0.0
- *
+ * @param string $user_login The username of the user that logged in.
* @param \WP_User $user The WP User object of the user that logged in.
* @return void
*/
- public function log_ip_and_last_login($user): void {
+ public function log_ip_and_last_login($user_login, $user): void {
if ( ! is_a($user, '\WP_User')) {
- $user = get_user_by('login', $user);
+ $user = get_user_by('login', $user_login);
}
if ( ! $user) {
diff --git a/inc/managers/class-discount-code-manager.php b/inc/managers/class-discount-code-manager.php
index f2ca6f32b..ec0f2e96f 100644
--- a/inc/managers/class-discount-code-manager.php
+++ b/inc/managers/class-discount-code-manager.php
@@ -26,6 +26,7 @@ class Discount_Code_Manager extends Base_Manager {
use \WP_Ultimo\Apis\Rest_Api;
use \WP_Ultimo\Apis\WP_CLI;
+ use \WP_Ultimo\Apis\MCP_Abilities;
use \WP_Ultimo\Traits\Singleton;
/**
@@ -56,6 +57,8 @@ public function init(): void {
$this->enable_wp_cli();
+ $this->enable_mcp_abilities();
+
add_action('wu_gateway_payment_processed', [$this, 'maybe_add_use_on_payment_received']);
}
diff --git a/inc/managers/class-domain-manager.php b/inc/managers/class-domain-manager.php
index 4093977fb..6cc19a346 100644
--- a/inc/managers/class-domain-manager.php
+++ b/inc/managers/class-domain-manager.php
@@ -28,6 +28,7 @@ class Domain_Manager extends Base_Manager {
use \WP_Ultimo\Apis\Rest_Api;
use \WP_Ultimo\Apis\WP_CLI;
+ use \WP_Ultimo\Apis\MCP_Abilities;
use \WP_Ultimo\Traits\Singleton;
/**
@@ -132,6 +133,8 @@ public function init(): void {
$this->enable_wp_cli();
+ $this->enable_mcp_abilities();
+
$this->set_cookie_domain();
add_action('plugins_loaded', [$this, 'load_integrations']);
@@ -536,6 +539,17 @@ public function add_sso_settings(): void {
],
]
);
+
+ wu_register_settings_field(
+ 'sso',
+ 'enable_magic_links',
+ [
+ 'title' => __('Enable Magic Links', 'ultimate-multisite'),
+ 'desc' => __('Enables magic link authentication for custom domains. Magic links provide a fallback authentication method for browsers that don\'t support third-party cookies. When enabled, dashboard and site links will automatically log users in when accessing sites with custom domains. Tokens are cryptographically secure, one-time use, and expire after 10 minutes.', 'ultimate-multisite'),
+ 'type' => 'toggle',
+ 'default' => 1,
+ ]
+ );
}
/**
diff --git a/inc/managers/class-event-manager.php b/inc/managers/class-event-manager.php
index 050d555ef..3d6d25dd0 100644
--- a/inc/managers/class-event-manager.php
+++ b/inc/managers/class-event-manager.php
@@ -11,6 +11,7 @@
namespace WP_Ultimo\Managers;
+use Psr\Log\LogLevel;
use WP_Ultimo\Models\Base_Model;
use WP_Ultimo\Models\Event;
@@ -26,8 +27,10 @@ class Event_Manager extends Base_Manager {
use \WP_Ultimo\Apis\Rest_Api;
use \WP_Ultimo\Apis\WP_CLI;
+ use \WP_Ultimo\Apis\MCP_Abilities;
use \WP_Ultimo\Traits\Singleton;
+ const LOG_FILE_NAME = 'events';
/**
* The manager slug.
*
@@ -72,6 +75,8 @@ public function init(): void {
$this->enable_wp_cli();
+ $this->enable_mcp_abilities();
+
add_action('init', [$this, 'register_all_events']);
add_action('wp_ajax_wu_get_event_payload_preview', [$this, 'event_payload_preview']);
@@ -248,22 +253,24 @@ public function get_event_type_as_options() {
* @param string $slug The slug of the event. Something like payment_received.
* @param array $payload with the events information.
*
- * @return array with returns message for now.
+ * @return bool
*/
public function do_event($slug, $payload) {
$registered_event = $this->get_event($slug);
if ( ! $registered_event) {
- return ['error' => 'Event not found'];
+ wu_log_add(self::LOG_FILE_NAME, 'Event not found', LogLevel::ERROR);
+ return false;
}
$payload_diff = array_diff_key(wu_maybe_lazy_load_payload($registered_event['payload']), $payload);
- if (isset($payload_diff[0])) {
+ if (! empty($payload_diff[0])) {
foreach ($payload_diff[0] as $diff_key => $diff_value) {
- return ['error' => 'Param required:' . $diff_key];
+ wu_log_add(self::LOG_FILE_NAME, 'Param required:' . $diff_key, LogLevel::ERROR);
}
+ return false;
}
$payload['wu_version'] = wu_get_version();
@@ -275,7 +282,7 @@ public function do_event($slug, $payload) {
/**
* Saves in the database
*/
- $this->save_event($slug, $payload);
+ return $this->save_event($slug, $payload);
}
/**
@@ -334,9 +341,9 @@ public function get_event($slug) {
*
* @param string $slug of the event.
* @param array $payload with event params.
- * @return void.
+ * @return bool.
*/
- public function save_event($slug, $payload): void {
+ public function save_event($slug, $payload): bool {
$event = new Event(
[
@@ -349,7 +356,11 @@ public function save_event($slug, $payload): void {
]
);
- $event->save();
+ $return = $event->save();
+ if ( is_wp_error($return)) {
+ return false;
+ }
+ return (bool) $return;
}
/**
@@ -590,7 +601,7 @@ public function get_model_payload(string $model, ?object $model_object = null) {
*
* @since 2.0.0
*/
- public function clean_old_events(): bool {
+ public function clean_old_events(): void {
/*
* Add a filter setting this to 0 or false
* to prevent old events from being ever deleted.
@@ -598,7 +609,7 @@ public function clean_old_events(): bool {
$threshold_days = apply_filters('wu_events_threshold_days', 1);
if (empty($threshold_days)) {
- return false;
+ return;
}
$events_to_remove = wu_get_events(
@@ -624,8 +635,6 @@ public function clean_old_events(): bool {
// Translators: 1: Number of successfully removed events. 2: Number of failed events to remove.
wu_log_add('wu-cron', sprintf(__('Removed %1$d events successfully. Failed to remove %2$d events.', 'ultimate-multisite'), $success_count, count($events_to_remove) - $success_count));
-
- return true;
}
/**
diff --git a/inc/managers/class-membership-manager.php b/inc/managers/class-membership-manager.php
index ea4c4d922..fb5c416e6 100644
--- a/inc/managers/class-membership-manager.php
+++ b/inc/managers/class-membership-manager.php
@@ -26,8 +26,10 @@ class Membership_Manager extends Base_Manager {
use \WP_Ultimo\Apis\Rest_Api;
use \WP_Ultimo\Apis\WP_CLI;
+ use \WP_Ultimo\Apis\MCP_Abilities;
use \WP_Ultimo\Traits\Singleton;
+ const LOG_FILE_NAME = 'memberships';
/**
* The manager slug.
*
@@ -56,6 +58,8 @@ public function init(): void {
$this->enable_wp_cli();
+ $this->enable_mcp_abilities();
+
add_action(
'init',
function () {
@@ -120,14 +124,15 @@ public function publish_pending_site(): void {
* @since 2.0.0
*
* @param int $membership_id The membership id.
- * @return bool|\WP_Error
+ * @return void
*/
public function async_publish_pending_site($membership_id) {
$membership = wu_get_membership($membership_id);
if ( ! $membership) {
- return new \WP_Error('error', __('An unexpected error happened.', 'ultimate-multisite'));
+ wu_log_add(self::LOG_FILE_NAME, __('An unexpected error happened.', 'ultimate-multisite'), LogLevel::ERROR);
+ return;
}
$status = $membership->publish_pending_site();
@@ -135,8 +140,6 @@ public function async_publish_pending_site($membership_id) {
if (is_wp_error($status)) {
wu_log_add('site-errors', $status, LogLevel::ERROR);
}
-
- return $status;
}
/**
@@ -176,7 +179,7 @@ public function check_pending_site_created() {
* @since 2.0.0
*
* @param int $membership_id The membership id.
- * @return bool|\WP_Error
+ * @return void
*/
public function async_membership_swap($membership_id) {
@@ -185,13 +188,15 @@ public function async_membership_swap($membership_id) {
$membership = wu_get_membership($membership_id);
if ( ! $membership) {
- return new \WP_Error('error', __('An unexpected error happened.', 'ultimate-multisite'));
+ wu_log_add(self::LOG_FILE_NAME, __('An unexpected error happened.', 'ultimate-multisite'), LogLevel::ERROR);
+ return;
}
$scheduled_swap = $membership->get_scheduled_swap();
if (empty($scheduled_swap)) {
- return new \WP_Error('error', __('An unexpected error happened.', 'ultimate-multisite'));
+ wu_log_add(self::LOG_FILE_NAME, __('An unexpected error happened.', 'ultimate-multisite'), LogLevel::ERROR);
+ return;
}
$order = $scheduled_swap->order;
@@ -205,13 +210,14 @@ public function async_membership_swap($membership_id) {
if (is_wp_error($status)) {
$wpdb->query('ROLLBACK'); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
-
- return new \WP_Error('error', __('An unexpected error happened.', 'ultimate-multisite'));
+ wu_log_add(self::LOG_FILE_NAME, $status->get_error_message(), LogLevel::ERROR);
+ return;
}
} catch (\Throwable $exception) {
$wpdb->query('ROLLBACK'); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
- return new \WP_Error('error', __('An unexpected error happened.', 'ultimate-multisite'));
+ wu_log_add(self::LOG_FILE_NAME, $exception->getMessage(), LogLevel::ERROR);
+ return;
}
/*
@@ -220,8 +226,6 @@ public function async_membership_swap($membership_id) {
$membership->delete_scheduled_swap();
$wpdb->query('COMMIT'); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
-
- return true;
}
/**
@@ -292,7 +296,7 @@ public function mark_cancelled_date($old_value, $new_value, $item_id): void {
*
* @param int $membership_id The ID of the membership being transferred.
* @param int $target_customer_id The new owner.
- * @return mixed
+ * @return void
*/
public function async_transfer_membership($membership_id, $target_customer_id) {
@@ -303,7 +307,8 @@ public function async_transfer_membership($membership_id, $target_customer_id) {
$target_customer = wu_get_customer($target_customer_id);
if ( ! $membership || ! $target_customer || absint($membership->get_customer_id()) === absint($target_customer->get_id())) {
- return new \WP_Error('error', __('An unexpected error happened.', 'ultimate-multisite'));
+ wu_log_add(self::LOG_FILE_NAME, __('An unexpected error happened.', 'ultimate-multisite'), LogLevel::ERROR);
+ return;
}
$wpdb->query('START TRANSACTION'); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
@@ -330,8 +335,8 @@ public function async_transfer_membership($membership_id, $target_customer_id) {
if (is_wp_error($saved)) {
$wpdb->query('ROLLBACK'); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
-
- return $saved;
+ wu_log_add(self::LOG_FILE_NAME, $saved->get_error_message(), LogLevel::ERROR);
+ return;
}
}
@@ -345,19 +350,18 @@ public function async_transfer_membership($membership_id, $target_customer_id) {
if (is_wp_error($saved)) {
$wpdb->query('ROLLBACK'); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
- return $saved;
+ wu_log_add(self::LOG_FILE_NAME, $saved->get_error_message(), LogLevel::ERROR);
+ return;
}
} catch (\Throwable $e) {
$wpdb->query('ROLLBACK'); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
- return new \WP_Error('exception', $e->getMessage());
+ wu_log_add(self::LOG_FILE_NAME, $e->getMessage(), LogLevel::ERROR);
}
$wpdb->query('COMMIT'); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
$membership->unlock();
-
- return true;
}
/**
@@ -366,7 +370,7 @@ public function async_transfer_membership($membership_id, $target_customer_id) {
* @since 2.0.0
*
* @param int $membership_id The ID of the membership being deleted.
- * @return mixed
+ * @return void
*/
public function async_delete_membership($membership_id) {
@@ -375,7 +379,8 @@ public function async_delete_membership($membership_id) {
$membership = wu_get_membership($membership_id);
if ( ! $membership) {
- return new \WP_Error('error', __('An unexpected error happened.', 'ultimate-multisite'));
+ wu_log_add(self::LOG_FILE_NAME, __('An unexpected error happened.', 'ultimate-multisite'), LogLevel::ERROR);
+ return;
}
$wpdb->query('START TRANSACTION'); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
@@ -400,8 +405,8 @@ public function async_delete_membership($membership_id) {
if (is_wp_error($saved)) {
$wpdb->query('ROLLBACK'); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
-
- return $saved;
+ wu_log_add(self::LOG_FILE_NAME, $saved->get_error_message(), LogLevel::ERROR);
+ return;
}
}
@@ -412,17 +417,15 @@ public function async_delete_membership($membership_id) {
if (is_wp_error($saved)) {
$wpdb->query('ROLLBACK'); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
-
- return $saved;
+ wu_log_add(self::LOG_FILE_NAME, $saved->get_error_message(), LogLevel::ERROR);
+ return;
}
} catch (\Throwable $e) {
$wpdb->query('ROLLBACK'); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
-
- return new \WP_Error('exception', $e->getMessage());
+ wu_log_add(self::LOG_FILE_NAME, $e->getMessage(), LogLevel::ERROR);
+ return;
}
$wpdb->query('COMMIT'); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
-
- return true;
}
}
diff --git a/inc/managers/class-payment-manager.php b/inc/managers/class-payment-manager.php
index b2c30077a..ac2861a2a 100644
--- a/inc/managers/class-payment-manager.php
+++ b/inc/managers/class-payment-manager.php
@@ -11,6 +11,7 @@
namespace WP_Ultimo\Managers;
+use Psr\Log\LogLevel;
use WP_Ultimo\Managers\Base_Manager;
use WP_Ultimo\Models\Payment;
use WP_Ultimo\Logger;
@@ -29,8 +30,10 @@ class Payment_Manager extends Base_Manager {
use \WP_Ultimo\Apis\Rest_Api;
use \WP_Ultimo\Apis\WP_CLI;
+ use \WP_Ultimo\Apis\MCP_Abilities;
use \WP_Ultimo\Traits\Singleton;
+ const LOG_FILE_NAME = 'payments';
/**
* The manager slug.
*
@@ -59,6 +62,8 @@ public function init(): void {
$this->enable_wp_cli();
+ $this->enable_mcp_abilities();
+
$this->register_forms();
add_action(
@@ -317,7 +322,7 @@ public function invoice_viewer(): void {
*
* @param int $payment_id The ID of the payment being transferred.
* @param int $target_customer_id The new owner.
- * @return mixed
+ * @return void
*/
public function async_transfer_payment($payment_id, $target_customer_id) {
@@ -328,7 +333,8 @@ public function async_transfer_payment($payment_id, $target_customer_id) {
$target_customer = wu_get_customer($target_customer_id);
if ( ! $payment || ! $target_customer || $payment->get_customer_id() === $target_customer->get_id()) {
- return new \WP_Error('error', __('An unexpected error happened.', 'ultimate-multisite'));
+ wu_log_add(self::LOG_FILE_NAME, __('An unexpected error happened.', 'ultimate-multisite'), LogLevel::ERROR);
+ return;
}
$wpdb->query('START TRANSACTION'); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
@@ -344,18 +350,17 @@ public function async_transfer_payment($payment_id, $target_customer_id) {
if (is_wp_error($saved)) {
$wpdb->query('ROLLBACK'); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
-
- return $saved;
+ wu_log_add(self::LOG_FILE_NAME, $saved->get_error_message(), LogLevel::ERROR);
+ return;
}
} catch (\Throwable $e) {
$wpdb->query('ROLLBACK'); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+ wu_log_add(self::LOG_FILE_NAME, $e->getMessage(), LogLevel::ERROR);
- return new \WP_Error('exception', $e->getMessage());
+ return;
}
$wpdb->query('COMMIT'); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
-
- return true;
}
/**
@@ -364,7 +369,7 @@ public function async_transfer_payment($payment_id, $target_customer_id) {
* @since 2.0.0
*
* @param int $payment_id The ID of the payment being deleted.
- * @return mixed
+ * @return void
*/
public function async_delete_payment($payment_id) {
@@ -373,7 +378,8 @@ public function async_delete_payment($payment_id) {
$payment = wu_get_payment($payment_id);
if ( ! $payment) {
- return new \WP_Error('error', __('An unexpected error happened.', 'ultimate-multisite'));
+ wu_log_add(self::LOG_FILE_NAME, __('An unexpected error happened.', 'ultimate-multisite'), LogLevel::ERROR);
+ return;
}
$wpdb->query('START TRANSACTION'); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
@@ -387,18 +393,17 @@ public function async_delete_payment($payment_id) {
if (is_wp_error($saved)) {
$wpdb->query('ROLLBACK'); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
-
- return $saved;
+ wu_log_add(self::LOG_FILE_NAME, $saved->get_error_message(), LogLevel::ERROR);
+ return;
}
} catch (\Throwable $e) {
$wpdb->query('ROLLBACK'); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
- return new \WP_Error('exception', $e->getMessage());
+ wu_log_add(self::LOG_FILE_NAME, $e->getMessage(), LogLevel::ERROR);
+ return;
}
$wpdb->query('COMMIT'); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
-
- return true;
}
/**
diff --git a/inc/managers/class-product-manager.php b/inc/managers/class-product-manager.php
index 1a2a4389c..89151c45d 100644
--- a/inc/managers/class-product-manager.php
+++ b/inc/managers/class-product-manager.php
@@ -26,6 +26,7 @@ class Product_Manager extends Base_Manager {
use \WP_Ultimo\Apis\Rest_Api;
use \WP_Ultimo\Apis\WP_CLI;
+ use \WP_Ultimo\Apis\MCP_Abilities;
use \WP_Ultimo\Traits\Singleton;
/**
@@ -55,5 +56,7 @@ public function init(): void {
$this->enable_rest_api();
$this->enable_wp_cli();
+
+ $this->enable_mcp_abilities();
}
}
diff --git a/inc/managers/class-site-manager.php b/inc/managers/class-site-manager.php
index 5daf07baf..63233b380 100644
--- a/inc/managers/class-site-manager.php
+++ b/inc/managers/class-site-manager.php
@@ -14,6 +14,7 @@
use WP_Ultimo\Helpers\Screenshot;
use WP_Ultimo\Database\Sites\Site_Type;
use WP_Ultimo\Database\Memberships\Membership_Status;
+use WP_Ultimo\Models\Site;
// Exit if accessed directly
defined('ABSPATH') || exit;
@@ -27,6 +28,7 @@ class Site_Manager extends Base_Manager {
use \WP_Ultimo\Apis\Rest_Api;
use \WP_Ultimo\Apis\WP_CLI;
+ use \WP_Ultimo\Apis\MCP_Abilities;
use \WP_Ultimo\Traits\Singleton;
/**
@@ -57,6 +59,8 @@ public function init(): void {
$this->enable_wp_cli();
+ $this->enable_mcp_abilities();
+
add_action('after_setup_theme', [$this, 'additional_thumbnail_sizes']);
add_action('wp_ajax_wu_get_screenshot', [$this, 'get_site_screenshot']);
@@ -83,11 +87,11 @@ public function init(): void {
add_filter('mucd_string_to_replace', [$this, 'search_and_replace_on_duplication'], 10, 3);
- add_filter('wu_site_created', [$this, 'search_and_replace_for_new_site'], 10, 2);
+ add_action('wu_site_created', [$this, 'search_and_replace_for_new_site'], 10, 2);
add_action('wu_handle_bulk_action_form_site_delete-pending', [$this, 'handle_delete_pending_sites'], 100, 3);
- add_action('users_list_table_query_args', [$this, 'hide_super_admin_from_list'], 10, 1);
+ add_filter('users_list_table_query_args', [$this, 'hide_super_admin_from_list'], 10, 1);
add_action('wu_before_handle_order_submission', [$this, 'maybe_validate_add_new_site'], 15);
@@ -325,14 +329,14 @@ public function lock_site(): void {
* @since 2.0.0
*
* @param int $site_id The site ID.
- * @return mixed
+ * @return void
*/
public function async_get_site_screenshot($site_id) {
$site = wu_get_site($site_id);
if ( ! $site) {
- return false;
+ return;
}
$domain = $site->get_active_site_url();
@@ -340,12 +344,12 @@ public function async_get_site_screenshot($site_id) {
$attachment_id = Screenshot::take_screenshot($domain);
if ( ! $attachment_id) {
- return false;
+ return;
}
$site->set_featured_image_id($attachment_id);
- return $site->save();
+ $site->save();
}
/**
@@ -598,8 +602,8 @@ public function get_search_and_replace_settings() {
* Handles search and replace for new blogs from WordPress.
*
* @since 1.7.0
- * @param array $data The date being saved.
- * @param object $site The site object.
+ * @param array $data The date being saved.
+ * @param Site $site The site object.
* @return void
*/
public static function search_and_replace_for_new_site($data, $site): void {
diff --git a/inc/managers/class-webhook-manager.php b/inc/managers/class-webhook-manager.php
index eff77f94d..492eff177 100644
--- a/inc/managers/class-webhook-manager.php
+++ b/inc/managers/class-webhook-manager.php
@@ -26,6 +26,7 @@ class Webhook_Manager extends Base_Manager {
use \WP_Ultimo\Apis\Rest_Api;
use \WP_Ultimo\Apis\WP_CLI;
+ use \WP_Ultimo\Apis\MCP_Abilities;
use \WP_Ultimo\Traits\Singleton;
/**
@@ -72,6 +73,8 @@ public function init(): void {
$this->enable_wp_cli();
+ $this->enable_mcp_abilities();
+
add_action('init', [$this, 'register_webhook_listeners']);
add_action('wp_ajax_wu_send_test_event', [$this, 'send_test_event']);
diff --git a/inc/models/class-domain.php b/inc/models/class-domain.php
index f3a1bc15c..7465af4cf 100644
--- a/inc/models/class-domain.php
+++ b/inc/models/class-domain.php
@@ -236,14 +236,12 @@ public function get_site() {
*/
public function get_path() {
if (! isset($this->path)) {
- $site = $this->get_site();
+ // don't use $this->get_site() as it causes infinite loop and native is faster anyway.
+ $site = \WP_Site::get_instance($this->get_blog_id());
if ( ! $site) {
return null;
- } elseif ($site instanceof \WP_Site) {
- $this->path = $site->path;
- } elseif ($site instanceof Site) {
- $this->path = $site->get_path();
}
+ $this->path = $site->path;
}
return $this->path;
diff --git a/inc/models/class-event.php b/inc/models/class-event.php
index 3ef5ac302..01b938416 100644
--- a/inc/models/class-event.php
+++ b/inc/models/class-event.php
@@ -10,6 +10,7 @@
namespace WP_Ultimo\Models;
use WP_Ultimo\Models\Base_Model;
+use WP_User;
// Exit if accessed directly
defined('ABSPATH') || exit;
@@ -268,7 +269,7 @@ public function get_message() {
*/
public function interpolate_message($message, $payload): string {
- $payload = json_decode(json_encode($payload), true);
+ $payload = json_decode(json_encode($payload), true); // phpcs:ignore WordPress.WP.AlternativeFunctions.json_encode_json_encode
$interpolation_keys = [];
@@ -351,7 +352,7 @@ public function get_author_id() {
* Returns the user associated with this author.
*
* @since 2.0.0
- * @return WP_User
+ * @return ?WP_User
*/
public function get_author_user() {
@@ -377,6 +378,7 @@ public function get_author_display_name() {
if ($user) {
return $user->display_name;
}
+ return '';
}
/**
@@ -392,6 +394,7 @@ public function get_author_email_address() {
if ($user) {
return $user->user_email;
}
+ return '';
}
/**
@@ -623,8 +626,8 @@ public function to_array() {
/**
* Override to clear event count.
*
+ * @return bool|\WP_Error
* @since 2.0.0
- * @return int|false
*/
public function save() {
diff --git a/inc/models/class-site.php b/inc/models/class-site.php
index e53d4467d..c424bd3d3 100644
--- a/inc/models/class-site.php
+++ b/inc/models/class-site.php
@@ -1606,10 +1606,9 @@ public function save() {
* @since 2.0.0
*
* @param array $data The object data that will be stored.
- * @param \WP_Ultimo\Models\Base_Model $this The object instance.
+ * @param \WP_Ultimo\Models\Base_Model $site The object instance.
*/
- do_action('wu_site_created', $data, $this); // @phpstan-ignore-line
-
+ do_action('wu_site_created', $data, $this);
}
if ( ! is_wp_error($saved) && wu_get_setting('enable_screenshot_generator', true)) {
diff --git a/inc/sso/class-admin-bar-magic-links.php b/inc/sso/class-admin-bar-magic-links.php
new file mode 100644
index 000000000..598c311d1
--- /dev/null
+++ b/inc/sso/class-admin-bar-magic-links.php
@@ -0,0 +1,149 @@
+get_nodes() as $node) {
+ $parts = explode('-', $node->id);
+ if (count($parts) >= 3 && 'blog' === $parts[0] && is_numeric($parts[1]) && 'd' === $parts[2]) {
+ $site_id = (int) $parts[1];
+ } else {
+ continue;
+ }
+
+ // Generate magic link.
+ $magic_link = wu_get_admin_url($site_id);
+
+ if ( ! $magic_link ) {
+ continue;
+ }
+
+ // Update the node with the magic link.
+ $node->href = $magic_link;
+
+ $wp_admin_bar->add_node($node);
+ }
+ }
+
+ /**
+ * Show access denied splash screen with magic links.
+ *
+ * This replaces the WordPress core access denied splash screen
+ * with our own version that uses magic links for sites with custom domains.
+ *
+ * @since 2.0.0
+ * @return void
+ */
+ public function show_access_denied_with_magic_links(): void {
+
+ // Only run in multisite and if user is logged in.
+ if ( ! is_multisite() || ! is_user_logged_in() || is_network_admin() ) {
+ return;
+ }
+
+ $blogs = get_blogs_of_user(get_current_user_id());
+
+ // If user has blogs and current blog is not in their list, show our custom message.
+ if ( wp_list_filter($blogs, array('userblog_id' => get_current_blog_id())) ) {
+ return;
+ }
+
+ $blog_name = get_bloginfo('name');
+
+ if ( empty($blogs) ) {
+ wp_die(
+ sprintf(
+ /* translators: 1: Site title. */
+ __('You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.'), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+ $blog_name // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+ ),
+ 403
+ );
+ }
+
+ $output = '' . sprintf( + /* translators: 1: Site title. */ + __('You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.'), + $blog_name + ) . '
'; + $output .= '' . __('If you reached this screen by accident and meant to visit one of your own sites, here are some shortcuts to help you find your way.') . '
'; + + $output .= '| ' . esc_html($blog->blogname) . ' | '; + $output .= '' . __('Visit Dashboard') . ' | ' . + '' . __('View Site') . ' | '; + $output .= '