diff --git a/constants.php b/constants.php index 41cdf1e..01f3e9d 100644 --- a/constants.php +++ b/constants.php @@ -1,6 +1,6 @@ page_hook", array($this, 'add_admin_body_classes'), 20); /* - * Add the page to WP Ultimo branding (aka top-bar and footer) + * Add the page to WP Multisite WaaS branding (aka top-bar and footer) */ if (is_network_admin()) { diff --git a/inc/admin-pages/class-broadcast-edit-admin-page.php b/inc/admin-pages/class-broadcast-edit-admin-page.php index 0c8fbef..ab27ea3 100644 --- a/inc/admin-pages/class-broadcast-edit-admin-page.php +++ b/inc/admin-pages/class-broadcast-edit-admin-page.php @@ -1,6 +1,6 @@ array( 'title' => __('Custom Meta', 'wp-ultimo'), - 'desc' => __('Custom data collected via WP Ultimo forms.', 'wp-ultimo'), + 'desc' => __('Custom data collected via WP Multisite WaaS forms.', 'wp-ultimo'), 'icon' => 'dashicons-wu-database wu-pt-px', 'fields' => $this->generate_customer_meta_fields(), 'state' => array( diff --git a/inc/admin-pages/class-customer-list-admin-page.php b/inc/admin-pages/class-customer-list-admin-page.php index 04fa3fd..dcd2cf1 100644 --- a/inc/admin-pages/class-customer-list-admin-page.php +++ b/inc/admin-pages/class-customer-list-admin-page.php @@ -1,6 +1,6 @@ tab}_widgets", $this->tab, $screen, $this); @@ -230,7 +230,7 @@ class Dashboard_Admin_Page extends Base_Admin_Page { * * @param string $tab The current tab. * @param \WP_Screen $screen The screen object. - * @param \WP_Ultimo\Admin_Pages\Dashboard_Admin_Page $page WP Ultimo admin page instance. + * @param \WP_Ultimo\Admin_Pages\Dashboard_Admin_Page $page WP Multisite WaaS admin page instance. */ do_action('wu_dashboard_widgets', $this->tab, $screen, $this); @@ -241,14 +241,14 @@ class Dashboard_Admin_Page extends Base_Admin_Page { 'id' => 'your-dashboard', 'title' => __('Our dashboard', 'wp-ultimo'), 'text' => array( - __('This is the WP Ultimo Dashboard, where you will find most of the important information you will need regarding your business\' performance.', 'wp-ultimo'), + __('This is the WP Multisite WaaS Dashboard, where you will find most of the important information you will need regarding your business\' performance.', 'wp-ultimo'), ), ), array( 'id' => 'documentation', 'title' => __('Learning more', 'wp-ultimo'), 'text' => array( - __('Most of the WP Ultimo admin pages will contain a link like this one at the top. These will link directly to the relevant knowledge base page on the WP Ultimo site.', 'wp-ultimo'), + __('Most of the WP Multisite WaaS admin pages will contain a link like this one at the top. These will link directly to the relevant knowledge base page on the WP Multisite WaaS site.', 'wp-ultimo'), ), 'attachTo' => array( 'element' => '#wp-ultimo-wrap > h1 > a:last-child', @@ -554,7 +554,7 @@ class Dashboard_Admin_Page extends Base_Admin_Page { */ public function get_menu_title() { - return __('WP Ultimo', 'wp-ultimo'); + return __('Multisite WaaS', 'wp-ultimo'); } // end get_menu_title; diff --git a/inc/admin-pages/class-discount-code-edit-admin-page.php b/inc/admin-pages/class-discount-code-edit-admin-page.php index 48867bb..f74c9b4 100644 --- a/inc/admin-pages/class-discount-code-edit-admin-page.php +++ b/inc/admin-pages/class-discount-code-edit-admin-page.php @@ -1,6 +1,6 @@ WP Ultimo: Domain Seller add-on.', 'wp-ultimo'), $addon_url); + $note_desc = sprintf(__('To activate this feature you need to install the WP Multisite WaaS: Domain Seller add-on.', 'wp-ultimo'), $addon_url); $fields = array( 'type' => array( @@ -130,7 +130,7 @@ class Domain_List_Admin_Page extends List_Admin_Page { 'type' => 'select', 'title' => __('Stage', 'wp-ultimo'), 'placeholder' => __('Select Stage', 'wp-ultimo'), - 'desc' => __('The stage in the domain check lifecycle. Leave "Checking DNS" to have the domain go through WP Ultimo\'s automated tests.', 'wp-ultimo'), + 'desc' => __('The stage in the domain check lifecycle. Leave "Checking DNS" to have the domain go through WP Multisite WaaS\'s automated tests.', 'wp-ultimo'), 'options' => Domain_Stage::to_array(), 'value' => Domain_Stage::CHECKING_DNS, ), diff --git a/inc/admin-pages/class-edit-admin-page.php b/inc/admin-pages/class-edit-admin-page.php index 590b4c6..bf63e45 100644 --- a/inc/admin-pages/class-edit-admin-page.php +++ b/inc/admin-pages/class-edit-admin-page.php @@ -4,7 +4,7 @@ * * Abstract class that makes it easy to create new admin pages. * - * Most of WP Ultimo pages are implemented using this class, which means that the filters and hooks + * Most of WP Multisite WaaS pages are implemented using this class, which means that the filters and hooks * listed below can be used to append content to all of our pages at once. * * @package WP_Ultimo diff --git a/inc/admin-pages/class-email-edit-admin-page.php b/inc/admin-pages/class-email-edit-admin-page.php index ff15dcd..a75fb52 100644 --- a/inc/admin-pages/class-email-edit-admin-page.php +++ b/inc/admin-pages/class-email-edit-admin-page.php @@ -1,6 +1,6 @@ 'toggle', 'title' => __('Import System Emails', 'wp-ultimo'), - 'desc' => __('Add new system emails based on WP Ultimo presets.'), + 'desc' => __('Add new system emails based on WP Multisite WaaS presets.'), 'tooltip' => '', 'value' => 0, 'html_attr' => array( diff --git a/inc/admin-pages/class-email-template-customize-admin-page.php b/inc/admin-pages/class-email-template-customize-admin-page.php index aadc01c..8d1f05a 100644 --- a/inc/admin-pages/class-email-template-customize-admin-page.php +++ b/inc/admin-pages/class-email-template-customize-admin-page.php @@ -1,6 +1,6 @@ is_loaded() ? __('WP Ultimo Migration Alert', 'wp-ultimo') : __('WP Ultimo', 'wp-ultimo'); + return WP_Ultimo()->is_loaded() ? __('WP Multisite WaaS Migration Alert', 'wp-ultimo') : __('WP Multisite WaaS', 'wp-ultimo'); } // end get_menu_title; diff --git a/inc/admin-pages/class-payment-edit-admin-page.php b/inc/admin-pages/class-payment-edit-admin-page.php index 3255cb6..fb21edc 100644 --- a/inc/admin-pages/class-payment-edit-admin-page.php +++ b/inc/admin-pages/class-payment-edit-admin-page.php @@ -1,6 +1,6 @@ array( 'type' => 'note', - 'desc' => __('Confirming the refund might not immediately change the status of the payment, as each gateway handles refunds differently and WP Ultimo relies on the gateway reporting a successful refund before changing the status.', 'wp-ultimo'), + 'desc' => __('Confirming the refund might not immediately change the status of the payment, as each gateway handles refunds differently and WP Multisite WaaS relies on the gateway reporting a successful refund before changing the status.', 'wp-ultimo'), 'classes' => 'wu-p-2 wu-bg-yellow-200 wu-text-yellow-700 wu-rounded wu-w-full', 'wrapper_html_attr' => array( 'v-show' => 'step === 2', diff --git a/inc/admin-pages/class-payment-list-admin-page.php b/inc/admin-pages/class-payment-list-admin-page.php index 9528d4b..99400e0 100644 --- a/inc/admin-pages/class-payment-list-admin-page.php +++ b/inc/admin-pages/class-payment-list-admin-page.php @@ -1,6 +1,6 @@ 'new-product-warning', 'title' => __('On adding a new product...', 'wp-ultimo'), 'text' => array( - __("You just successfully added a new product to your WP Ultimo network and that's awesome!", 'wp-ultimo'), + __("You just successfully added a new product to your WP Multisite WaaS network and that's awesome!", 'wp-ultimo'), __('Keep in mind that newly created products do not appear automatically in your checkout forms.', 'wp-ultimo'), __('To make a product available on registration, you will need to manually add it to the pricing table field of your checkout forms.', 'wp-ultimo'), ), @@ -641,7 +641,7 @@ class Product_Edit_Admin_Page extends Edit_Admin_Page { ), 'modules[customer_user_role][limit]' => array( 'title' => __('Customer Role', 'wp-ultimo'), - 'desc' => __('Select the role WP Ultimo should use when adding the user to their newly created site.', 'wp-ultimo'), + 'desc' => __('Select the role WP Multisite WaaS should use when adding the user to their newly created site.', 'wp-ultimo'), 'type' => 'select', 'value' => $this->get_object()->get_customer_role(), 'default' => 'administrator', diff --git a/inc/admin-pages/class-product-list-admin-page.php b/inc/admin-pages/class-product-list-admin-page.php index 5dee818..fff2ea7 100644 --- a/inc/admin-pages/class-product-list-admin-page.php +++ b/inc/admin-pages/class-product-list-admin-page.php @@ -1,6 +1,6 @@ - +
- <?php esc_attr_e('WP Ultimo Add-ons', 'wp-ultimo'); ?> + <?php esc_attr_e('WP Multisite WaaS Add-ons', 'wp-ultimo'); ?>

- +

@@ -249,14 +249,14 @@ class Settings_Admin_Page extends Wizard_Admin_Page {
- +
- - + +
@@ -281,7 +281,7 @@ class Settings_Admin_Page extends Wizard_Admin_Page { "> secret_key, str_repeat('*', 16), 4, 24); ?> @@ -535,7 +535,7 @@ class Settings_Admin_Page extends Wizard_Admin_Page {

- +

diff --git a/inc/admin-pages/class-setup-wizard-admin-page.php b/inc/admin-pages/class-setup-wizard-admin-page.php index cabab2e..1ecbdd1 100644 --- a/inc/admin-pages/class-setup-wizard-admin-page.php +++ b/inc/admin-pages/class-setup-wizard-admin-page.php @@ -1,6 +1,6 @@ is_loaded() ? __('WP Ultimo Install', 'wp-ultimo') : __('WP Ultimo', 'wp-ultimo'); + return WP_Ultimo()->is_loaded() ? __('WP Multisite WaaS Install', 'wp-ultimo') : __('WP Multisite WaaS', 'wp-ultimo'); } // end get_menu_title; @@ -360,8 +360,8 @@ class Setup_Wizard_Admin_Page extends Wizard_Admin_Page { 'welcome' => array( 'title' => __('Welcome', 'wp-ultimo'), 'description' => implode('

', array( - __('...and thanks for choosing WP Ultimo!', 'wp-ultimo'), - __('This quick setup wizard will make sure your server is correctly setup, help you configure your new network, and migrate data from previous WP Ultimo versions if necessary.', 'wp-ultimo'), + __('...and thanks for choosing WP Multisite WaaS!', 'wp-ultimo'), + __('This quick setup wizard will make sure your server is correctly setup, help you configure your new network, and migrate data from previous WP Multisite WaaS versions if necessary.', 'wp-ultimo'), __('You will also have the option of importing default content. It should take 10 minutes or less!', 'wp-ultimo') )), 'next_label' => __('Get Started →', 'wp-ultimo'), @@ -369,7 +369,7 @@ class Setup_Wizard_Admin_Page extends Wizard_Admin_Page { ), 'checks' => array( 'title' => __('Pre-install Checks', 'wp-ultimo'), - 'description' => __('Now it is time to see if this machine has what it takes to run WP Ultimo well!', 'wp-ultimo'), + 'description' => __('Now it is time to see if this machine has what it takes to run WP Multisite WaaS well!', 'wp-ultimo'), 'next_label' => \WP_Ultimo\Requirements::met() ? __('Go to the Next Step →', 'wp-ultimo') : __('Check Again', 'wp-ultimo'), 'handler' => array($this, 'handle_checks'), 'back' => false, @@ -380,40 +380,9 @@ class Setup_Wizard_Admin_Page extends Wizard_Admin_Page { ) ), ), - 'activation' => array( - 'title' => __('License Activation', 'wp-ultimo'), - 'description' => __('Let\'s make sure you are able to keep your copy up-to-date with our latest updates via admin panel notifications and more.', 'wp-ultimo'), - 'handler' => array($this, 'handle_activation'), - 'next_label' => __('Agree & Activate →', 'wp-ultimo'), - 'back' => false, - 'skip' => $allowed, - 'fields' => array( - 'terms' => array( - 'type' => 'note', - 'desc' => array($this, '_terms_of_support'), - ), - 'license_key' => array( - 'type' => 'text', - 'title' => __('License Key', 'wp-ultimo'), - 'placeholder' => __('E.g. sk_***********', 'wp-ultimo'), - 'tooltip' => __('Your WP Ultimo License Key', 'wp-ultimo'), - 'desc' => array($this, '_desc_and_validation_error'), - 'wrapper_classes' => $allowed ? 'wu-hidden' : '', - 'html_attr' => array( - $allowed ? 'disabled' : 'data-none' => 'disabled', - ), - ), - 'license' => array( - 'wrapper_classes' => $allowed ? 'sm:wu-w-auto sm:wu-block' : 'sm:wu-w-auto wu-hidden', - 'classes' => 'sm:wu--mx-6 sm:wu--mt-4 sm:wu--mb-6', - 'type' => 'note', - 'desc' => array($this, '_current_license'), - ), - ), - ), 'installation' => array( 'title' => __('Installation', 'wp-ultimo'), - 'description' => __('Now, let\'s update your database and install the Sunrise.php file, which are necessary for the correct functioning of WP Ultimo.', 'wp-ultimo'), + 'description' => __('Now, let\'s update your database and install the Sunrise.php file, which are necessary for the correct functioning of WP Multisite WaaS.', 'wp-ultimo'), 'next_label' => Core_Installer::get_instance()->all_done() ? __('Go to the Next Step →', 'wp-ultimo') : __('Install', 'wp-ultimo'), 'fields' => array( 'terms' => array( @@ -445,7 +414,7 @@ class Setup_Wizard_Admin_Page extends Wizard_Admin_Page { $next_label = __('Run Check', 'wp-ultimo'); - $description = __('It seems that you were running WP Ultimo 1.X on this network. This migrator will convert the data from the old version to the new one.', 'wp-ultimo') . '

' . __('First, let\'s run a test migration to see if we can spot any potential errors.', 'wp-ultimo'); + $description = __('It seems that you were running WP Multisite WaaS 1.X on this network. This migrator will convert the data from the old version to the new one.', 'wp-ultimo') . '

' . __('First, let\'s run a test migration to see if we can spot any potential errors.', 'wp-ultimo'); } // end if; @@ -771,7 +740,7 @@ class Setup_Wizard_Admin_Page extends Wizard_Admin_Page { 'pass_requirements' => is_multisite(), ), 'wp-ultimo' => array( - 'name' => __('WP Ultimo', 'wp-ultimo'), + 'name' => __('WP Multisite WaaS', 'wp-ultimo'), 'help' => wu_get_documentation_url('wp-ultimo-requirements'), 'condition' => apply_filters('wp_ultimo_skip_network_active_check', false) ? __('Bypassed via filter', 'wp-ultimo') : __('Network Activated', 'wp-ultimo'), 'pass_requirements' => \WP_Ultimo\Requirements::is_network_active(), @@ -917,43 +886,6 @@ class Setup_Wizard_Admin_Page extends Wizard_Admin_Page { } // end handle_migration; - /** - * Handles the activation of a given integration. - * - * @since 2.0.0 - * @return void|WP_Error - */ - public function handle_activation() { - - $license = License::get_instance(); - - /* - * Already activated. - */ - if ($license->allowed()) { - - wp_redirect($this->get_next_section_link()); - - exit; - - } // end if; - - $activation_results = $license->activate(wu_request('license_key')); - - if (is_wp_error($activation_results)) { - - $_REQUEST['error'] = $activation_results->get_error_message(); - - } else { - - wp_redirect($this->get_next_section_link()); - - exit; - - } // end if; - - } // end handle_activation; - /** * Handles the configuration of a given integration. * @@ -996,7 +928,7 @@ class Setup_Wizard_Admin_Page extends Wizard_Admin_Page { } // end section_test; /** - * Adds the necessary missing scripts if WP Ultimo was not loaded. + * Adds the necessary missing scripts if WP Multisite WaaS was not loaded. * * @since 2.0.0 * @return void diff --git a/inc/admin-pages/class-shortcodes-admin-page.php b/inc/admin-pages/class-shortcodes-admin-page.php index f8d19ee..ea90eef 100644 --- a/inc/admin-pages/class-shortcodes-admin-page.php +++ b/inc/admin-pages/class-shortcodes-admin-page.php @@ -1,6 +1,6 @@ 'new-site-template-warning', 'title' => __('On adding a new Site Template...', 'wp-ultimo'), 'text' => array( - __("You just successfully added a new site template to your WP Ultimo network and that's awesome!", 'wp-ultimo'), + __("You just successfully added a new site template to your WP Multisite WaaS network and that's awesome!", 'wp-ultimo'), __('Keep in mind that newly created site templates do not appear automatically in your checkout forms.', 'wp-ultimo'), __('To make a site template available on registration, you will need to manually add it to the template selection field of your checkout forms.', 'wp-ultimo'), ), @@ -541,7 +541,7 @@ class Site_Edit_Admin_Page extends Edit_Admin_Page { ), 'scraper_message' => array( 'type' => 'note', - 'desc' => sprintf('%s', __('We detected that this network might be running locally. If that\'s the case, WP Ultimo will not be able to take a screenshot of the site. A site needs to be publicly available to the outside world in order for this feature to work.', 'wp-ultimo')), + 'desc' => sprintf('%s', __('We detected that this network might be running locally. If that\'s the case, WP Multisite WaaS will not be able to take a screenshot of the site. A site needs to be publicly available to the outside world in order for this feature to work.', 'wp-ultimo')), 'wrapper_classes' => \WP_Ultimo\Domain_Mapping\Helper::is_development_mode() ? '' : 'wu-hidden', ), 'scraper' => array( diff --git a/inc/admin-pages/class-site-list-admin-page.php b/inc/admin-pages/class-site-list-admin-page.php index 95b0c5f..36a41ad 100644 --- a/inc/admin-pages/class-site-list-admin-page.php +++ b/inc/admin-pages/class-site-list-admin-page.php @@ -1,6 +1,6 @@ array( 'wp-ultimo-version' => array( - 'tooltip' => 'WP Ultimo current version installed locally', - 'title' => 'WP Ultimo Version', + 'tooltip' => 'WP Multisite WaaS current version installed locally', + 'title' => 'WP Multisite WaaS Version', 'value' => wu_get_version(), ), 'wordpress-version' => array( @@ -578,9 +578,9 @@ class System_Info_Admin_Page extends Base_Admin_Page { 'Active Plugins' => $array_active_plugins, 'Active Plugins on Main Site' => $array_active_plugins_main_site, - 'WP Ultimo Database Status' => $array_wu_tables, + 'WP Multisite WaaS Database Status' => $array_wu_tables, - 'WP Ultimo Core Settings' => array_merge( + 'WP Multisite WaaS Core Settings' => array_merge( array( 'logs-directory' => array( 'tooltip' => '', @@ -799,7 +799,7 @@ class System_Info_Admin_Page extends Base_Admin_Page { } // end get_all_options; /** - * Return all the desired WP Ultimo Settings + * Return all the desired WP Multisite WaaS Settings * * @since 1.1.5 * @return array diff --git a/inc/admin-pages/class-tax-rates-admin-page.php b/inc/admin-pages/class-tax-rates-admin-page.php index e98ef35..f8cb085 100644 --- a/inc/admin-pages/class-tax-rates-admin-page.php +++ b/inc/admin-pages/class-tax-rates-admin-page.php @@ -1,6 +1,6 @@ array( 'type' => 'text', 'title' => __('URL Parameter', 'wp-ultimo'), - 'desc' => __('This is the URL parameter WP Ultimo will use to generate the template preview URLs.', 'wp-ultimo'), + 'desc' => __('This is the URL parameter WP Multisite WaaS will use to generate the template preview URLs.', 'wp-ultimo'), 'value' => Template_Previewer::get_instance()->get_setting('preview_url_parameter', 'template-preview'), ), 'enabled' => array( diff --git a/inc/admin-pages/class-top-admin-nav-menu.php b/inc/admin-pages/class-top-admin-nav-menu.php index 49dc5ff..aad915d 100644 --- a/inc/admin-pages/class-top-admin-nav-menu.php +++ b/inc/admin-pages/class-top-admin-nav-menu.php @@ -4,7 +4,7 @@ * * Adds the shortcuts menu to the admin bar. * - * @category WP Ultimo + * @category WP Multisite WaaS * @package WP_Ultimo * @author Gustavo Modesto * @since 2.0.0 @@ -37,7 +37,7 @@ class Top_Admin_Nav_Menu { } // end __construct; /** - * Adds the WP Ultimo top-bar shortcut menu + * Adds the WP Multisite WaaS top-bar shortcut menu * * @since 1.1.0 * @param \WP_Admin_Bar $wp_admin_bar The admin bar identifier. @@ -55,7 +55,7 @@ class Top_Admin_Nav_Menu { // Add Parent element $parent = array( 'id' => 'wp-ultimo', - 'title' => __('WP Ultimo', 'wp-ultimo'), + 'title' => __('Multisite Waas', 'wp-ultimo'), 'href' => current_user_can('wu_read_dashboard') ? network_admin_url('admin.php?page=wp-ultimo') : '#', 'meta' => array( 'class' => 'wp-ultimo-top-menu', diff --git a/inc/admin-pages/class-view-logs-admin-page.php b/inc/admin-pages/class-view-logs-admin-page.php index ec74fe4..406d1cf 100644 --- a/inc/admin-pages/class-view-logs-admin-page.php +++ b/inc/admin-pages/class-view-logs-admin-page.php @@ -1,6 +1,6 @@
name="_wu_force_elements_loading" /> @@ -629,7 +629,7 @@ class Checkout_Pages { } // end filter_login_url; /** - * Returns the ID of the pages being used for each WP Ultimo purpose. + * Returns the ID of the pages being used for each WP Multisite WaaS purpose. * * @since 2.0.0 * @return array @@ -691,7 +691,7 @@ class Checkout_Pages { } // end get_page_url; /** - * Tags the WP Ultimo pages on the main site. + * Tags the WP Multisite WaaS pages on the main site. * * @since 2.0.0 * @@ -708,11 +708,11 @@ class Checkout_Pages { } // end if; $labels = array( - 'register' => __('WP Ultimo - Register Page', 'wp-ultimo'), - 'login' => __('WP Ultimo - Login Page', 'wp-ultimo'), - 'block_frontend' => __('WP Ultimo - Site Blocked Page', 'wp-ultimo'), - 'update' => __('WP Ultimo - Membership Update Page', 'wp-ultimo'), - 'new_site' => __('WP Ultimo - New Site Page', 'wp-ultimo'), + 'register' => __('WP Multisite WaaS - Register Page', 'wp-ultimo'), + 'login' => __('WP Multisite WaaS - Login Page', 'wp-ultimo'), + 'block_frontend' => __('WP Multisite WaaS - Site Blocked Page', 'wp-ultimo'), + 'update' => __('WP Multisite WaaS - Membership Update Page', 'wp-ultimo'), + 'new_site' => __('WP Multisite WaaS - New Site Page', 'wp-ultimo'), ); $pages = array_map('absint', $this->get_signup_pages()); diff --git a/inc/checkout/class-checkout.php b/inc/checkout/class-checkout.php index 61c3712..650cbe8 100644 --- a/inc/checkout/class-checkout.php +++ b/inc/checkout/class-checkout.php @@ -1196,7 +1196,7 @@ class Checkout { * * @since 2.0.0 * @param array $meta_repository The list of meta fields, key => value structured. - * @param Customer $customer The WP Ultimo customer object. + * @param Customer $customer The WP Multisite WaaS customer object. * @param Checkout $this The checkout class. */ do_action('wu_handle_customer_meta_fields', $meta_repository, $customer, $this); @@ -1230,7 +1230,7 @@ class Checkout { * @since 2.0.4 * @param array $meta_repository The list of meta fields, key => value structured. * @param \WP_User $user The WordPress user object. - * @param Customer $customer The WP Ultimo customer object. + * @param Customer $customer The WP Multisite WaaS customer object. * @param Checkout $this The checkout class. */ do_action('wu_handle_user_meta_fields', $user_meta_repository, $user, $customer, $this); @@ -2089,7 +2089,7 @@ class Checkout { /* * Checks if we are in the last step. * - * WP Ultimo supports multi-step checkout + * WP Multisite WaaS supports multi-step checkout * flows. That means that we do different * things on the intermediary steps (mostly * add things to the session) and on the final, @@ -2295,7 +2295,7 @@ class Checkout { * * The gateway takes in the info about the transaction * and perform the necessary steps to make sure the - * data on the gateway correctly reflects the data on WP Ultimo. + * data on the gateway correctly reflects the data on WP Multisite WaaS. */ $status = $gateway->process_checkout($payment, $membership, $customer, $this->order, $type); diff --git a/inc/checkout/class-legacy-checkout.php b/inc/checkout/class-legacy-checkout.php index e840448..2f01fc3 100644 --- a/inc/checkout/class-legacy-checkout.php +++ b/inc/checkout/class-legacy-checkout.php @@ -95,7 +95,7 @@ class Legacy_Checkout { $this->session = wu_get_session('signup'); $this->templates = array( - 'signup-main.php' => __('WP Ultimo Legacy Signup', 'wp-ultimo'), + 'signup-main.php' => __('WP Multisite WaaS Legacy Signup', 'wp-ultimo'), ); // add_filter('request', array($this, 'maybe_render_legacy_signup')); @@ -1240,7 +1240,7 @@ class Legacy_Checkout { * * @since 1.7.2 * @param string Default domain being used right now, useful for manipulations - * @param array List of all the domain options entered in the WP Ultimo Settings -> Network Settings -> Domain Options + * @param array List of all the domain options entered in the WP Multisite WaaS Settings -> Network Settings -> Domain Options * @return string New domain to be used */ return apply_filters('get_site_url_for_previewer', $domain, $domain_options); // phpcs:ignore diff --git a/inc/checkout/signup-fields/class-signup-field-shortcode.php b/inc/checkout/signup-fields/class-signup-field-shortcode.php index cd86697..1ac5906 100644 --- a/inc/checkout/signup-fields/class-signup-field-shortcode.php +++ b/inc/checkout/signup-fields/class-signup-field-shortcode.php @@ -68,7 +68,7 @@ class Signup_Field_Shortcode extends Base_Signup_Field { */ public function get_description() { - return __('Displays the content of a given WordPress shortcode. Can be useful to inset content from other plugins inside a WP Ultimo checkout form.', 'wp-ultimo'); + return __('Displays the content of a given WordPress shortcode. Can be useful to inset content from other plugins inside a WP Multisite WaaS checkout form.', 'wp-ultimo'); } // end get_description; @@ -82,7 +82,7 @@ class Signup_Field_Shortcode extends Base_Signup_Field { */ public function get_tooltip() { - return __('Displays the content of a given WordPress shortcode. Can be useful to insert content from other plugins inside a WP Ultimo checkout form.', 'wp-ultimo'); + return __('Displays the content of a given WordPress shortcode. Can be useful to insert content from other plugins inside a WP Multisite WaaS checkout form.', 'wp-ultimo'); } // end get_tooltip; /** diff --git a/inc/checkout/signup-fields/field-templates/period-selection/class-legacy-period-selection-field-template.php b/inc/checkout/signup-fields/field-templates/period-selection/class-legacy-period-selection-field-template.php index d390845..946fbc9 100644 --- a/inc/checkout/signup-fields/field-templates/period-selection/class-legacy-period-selection-field-template.php +++ b/inc/checkout/signup-fields/field-templates/period-selection/class-legacy-period-selection-field-template.php @@ -79,7 +79,7 @@ class Legacy_Period_Selection_Field_Template extends Base_Field_Template { */ public function get_description() { - return __('Implementation of the layout that shipped with WP Ultimo < 1.10.X.', 'wp-ultimo'); + return __('Implementation of the layout that shipped with WP Multisite WaaS < 1.10.X.', 'wp-ultimo'); } // end get_description; diff --git a/inc/class-admin-notices.php b/inc/class-admin-notices.php index 0519eb2..9086e07 100644 --- a/inc/class-admin-notices.php +++ b/inc/class-admin-notices.php @@ -1,6 +1,6 @@ __('API & Webhooks', 'wp-ultimo'), @@ -157,13 +157,13 @@ class API { wu_register_settings_field('api', 'api_header', array( 'title' => __('API Settings', 'wp-ultimo'), - 'desc' => __('Options related to WP Ultimo API endpoints.', 'wp-ultimo'), + 'desc' => __('Options related to WP Multisite WaaS API endpoints.', 'wp-ultimo'), 'type' => 'header', )); wu_register_settings_field('api', 'enable_api', array( 'title' => __('Enable API', 'wp-ultimo'), - 'desc' => __('Tick this box if you want WP Ultimo to add its own endpoints to the WordPress REST API. This is required for some integrations to work, most notabily, Zapier.', 'wp-ultimo'), + 'desc' => __('Tick this box if you want WP Multisite WaaS to add its own endpoints to the WordPress REST API. This is required for some integrations to work, most notabily, Zapier.', 'wp-ultimo'), 'type' => 'toggle', 'default' => 1, )); @@ -235,7 +235,7 @@ class API { wu_register_settings_field('api', 'api_log_calls', array( 'title' => __('Log API calls (Advanced)', 'wp-ultimo'), - 'desc' => __('Tick this box if you want to log all calls received via WP Ultimo API endpoints. You can access the logs on WP Ultimo → System Info → Logs.', 'wp-ultimo'), + 'desc' => __('Tick this box if you want to log all calls received via WP Multisite WaaS API endpoints. You can access the logs on WP Multisite WaaS → System Info → Logs.', 'wp-ultimo'), 'type' => 'toggle', 'default' => 0, 'require' => array( @@ -245,13 +245,13 @@ class API { wu_register_settings_field('api', 'webhook_header', array( 'title' => __('Webhook Settings', 'wp-ultimo'), - 'desc' => __('Options related to WP Ultimo API webhooks.', 'wp-ultimo'), + 'desc' => __('Options related to WP Multisite WaaS API webhooks.', 'wp-ultimo'), 'type' => 'header', )); wu_register_settings_field('api', 'webhook_calls_blocking', array( 'title' => __('Wait for Response (Advanced)', 'wp-ultimo'), - 'desc' => __('Tick this box if you want the WP Ultimo\'s webhook calls to wait for the remote server to respond. Keeping this option enabled can have huge effects on your network\'s performance, only enable it if you know what you are doing and need to debug webhook calls.', 'wp-ultimo'), + 'desc' => __('Tick this box if you want the WP Multisite WaaS\'s webhook calls to wait for the remote server to respond. Keeping this option enabled can have huge effects on your network\'s performance, only enable it if you know what you are doing and need to debug webhook calls.', 'wp-ultimo'), 'type' => 'toggle', 'default' => 0, )); diff --git a/inc/class-async-calls.php b/inc/class-async-calls.php index 2aa56b3..151e8fa 100644 --- a/inc/class-async-calls.php +++ b/inc/class-async-calls.php @@ -1,6 +1,6 @@ version = class_exists(\WP_Ultimo::class) ? \WP_Ultimo::VERSION : ''; /** - * As WP Ultimo needs to load in wp-ultimo/ directory to work with Sunrise + * As WP Multisite WaaS needs to load in wp-ultimo/ directory to work with Sunrise * we can assume the plugin as wp-ultimo/wp-ultimo.php. if it's a mu-plugin * we will assume as wp-ultimo.php. * @@ -78,7 +78,7 @@ class Core_Updates { $this->plugin_slug = 'wp-multisite-waas/wp-multisite-waas.php'; /** - * Check for a WP Ultimo Core Updates. + * Check for a WP Multisite WaaS Core Updates. */ add_action('upgrader_process_complete', array($this, 'maybe_add_core_update_hooks'), 10, 2); @@ -92,7 +92,7 @@ class Core_Updates { } // end init; /** - * Checks if a WP Ultimo core update is being performed and triggers an action if that's the case. + * Checks if a WP Multisite WaaS core update is being performed and triggers an action if that's the case. * * @since 2.0.0 * @@ -120,7 +120,7 @@ class Core_Updates { if ($is_a_wp_ultimo_update) { - function_exists('wu_log_add') && wu_log_add('wp-ultimo-core', __('Updating WP Ultimo Core...', 'wp-ultimo')); + function_exists('wu_log_add') && wu_log_add('wp-ultimo-core', __('Updating WP Multisite WaaS Core...', 'wp-ultimo')); try { diff --git a/inc/class-cron.php b/inc/class-cron.php index efd11b2..ec93328 100644 --- a/inc/class-cron.php +++ b/inc/class-cron.php @@ -70,7 +70,7 @@ class Cron { } // end init; /** - * Creates the recurring schedules for WP Ultimo. + * Creates the recurring schedules for WP Multisite WaaS. * * By default, we create a hourly, daily, and monthly schedules. * diff --git a/inc/class-current.php b/inc/class-current.php index 3c3b031..d59de97 100644 --- a/inc/class-current.php +++ b/inc/class-current.php @@ -1,6 +1,6 @@ screen_id, 'normal', 'high'); + add_meta_box('wp-ultimo-setup', __('WP Multisite WaaS - First Steps', 'wp-ultimo'), array($this, 'output_widget_first_steps'), $this->screen_id, 'normal', 'high'); - add_meta_box('wp-ultimo-news', __('WP Ultimo - News & Discussions', 'wp-ultimo'), array($this, 'output_widget_news'), $this->screen_id, 'side', 'low'); + add_meta_box('wp-ultimo-news', __('WP Multisite WaaS - News & Discussions', 'wp-ultimo'), array($this, 'output_widget_news'), $this->screen_id, 'side', 'low'); - add_meta_box('wp-ultimo-summary', __('WP Ultimo - Summary', 'wp-ultimo'), array($this, 'output_widget_summary'), $this->screen_id, 'normal', 'high'); + add_meta_box('wp-ultimo-summary', __('WP Multisite WaaS - Summary', 'wp-ultimo'), array($this, 'output_widget_summary'), $this->screen_id, 'normal', 'high'); - add_meta_box('wp-ultimo-activity-stream', __('WP Ultimo - Activity Stream', 'wp-ultimo'), array($this, 'output_widget_activity_stream'), $this->screen_id, 'normal', 'high'); + add_meta_box('wp-ultimo-activity-stream', __('WP Multisite WaaS - Activity Stream', 'wp-ultimo'), array($this, 'output_widget_activity_stream'), $this->screen_id, 'normal', 'high'); \WP_Ultimo\UI\Tours::get_instance()->create_tour('dashboard', array( array( @@ -105,7 +105,7 @@ class Dashboard_Widgets { 'title' => __('Welcome!', 'wp-ultimo'), 'text' => array( __('Welcome to your new network dashboard!', 'wp-ultimo'), - __('You will notice that WP Ultimo adds a couple of useful widgets here so you can keep an eye on how your network is doing.', 'wp-ultimo'), + __('You will notice that WP Multisite WaaS adds a couple of useful widgets here so you can keep an eye on how your network is doing.', 'wp-ultimo'), ), ), array( @@ -123,7 +123,7 @@ class Dashboard_Widgets { 'id' => 'wp-ultimo-menu', 'title' => __('Our home', 'wp-ultimo'), 'text' => array( - __('You can always find WP Ultimo settings and other pages under our menu item, here on the Network-level dashboard. 😃', 'wp-ultimo'), + __('You can always find WP Multisite WaaS settings and other pages under our menu item, here on the Network-level dashboard. 😃', 'wp-ultimo'), ), 'attachTo' => array( 'element' => '.toplevel_page_wp-ultimo', diff --git a/inc/class-documentation.php b/inc/class-documentation.php index 9b509c2..dafe27c 100644 --- a/inc/class-documentation.php +++ b/inc/class-documentation.php @@ -47,7 +47,7 @@ class Documentation { $links = array(); - // WP Ultimo Dashboard + // WP Multisite WaaS Dashboard $links['wp-ultimo'] = 'https://help.wpultimo.com/en/articles/4803213-understanding-the-wp-ultimo-dashboard'; // Settings Page diff --git a/inc/class-domain-mapping.php b/inc/class-domain-mapping.php index 7c8d087..850e5c6 100644 --- a/inc/class-domain-mapping.php +++ b/inc/class-domain-mapping.php @@ -1,6 +1,6 @@ notices->add(__('WP Ultimo successfully activated!', 'wp-ultimo'), 'success', 'network-admin', false, array()); + WP_Ultimo()->notices->add(__('WP Multisite WaaS successfully activated!', 'wp-ultimo'), 'success', 'network-admin', false, array()); } // end if; diff --git a/inc/class-light-ajax.php b/inc/class-light-ajax.php index 527ee67..9be94fc 100644 --- a/inc/class-light-ajax.php +++ b/inc/class-light-ajax.php @@ -16,7 +16,7 @@ namespace WP_Ultimo; defined('ABSPATH') || exit; /** - * Adds a lighter ajax option to WP Ultimo. + * Adds a lighter ajax option to WP Multisite WaaS. * * @since 1.9.14 */ diff --git a/inc/class-logger.php b/inc/class-logger.php index 1af5771..11eaad1 100644 --- a/inc/class-logger.php +++ b/inc/class-logger.php @@ -1,6 +1,6 @@ %2$s. Please, contact your hosting company support to upgrade your PHP version. If you want maximum performance consider upgrading your PHP to version 7.0 or later.', 'wp-ultimo'), self::$php_version, phpversion()); + $message = sprintf(__('WP Multisite WaaS requires at least PHP version %1$s to run. Your current PHP version is %2$s. Please, contact your hosting company support to upgrade your PHP version. If you want maximum performance consider upgrading your PHP to version 7.0 or later.', 'wp-ultimo'), self::$php_version, phpversion()); printf('

%s

', $message); @@ -326,7 +326,7 @@ class Requirements { global $wp_version; // translators: the %1$s placeholder is the required WP version, while the %2$s is the current WP version. - $message = sprintf(__('WP Ultimo requires at least WordPress version %1$s to run. Your current WordPress version is %2$s.', 'wp-ultimo'), self::$wp_version, $wp_version); + $message = sprintf(__('WP Multisite WaaS requires at least WordPress version %1$s to run. Your current WordPress version is %2$s.', 'wp-ultimo'), self::$wp_version, $wp_version); printf('

%s

', $message); @@ -340,14 +340,14 @@ class Requirements { */ public static function notice_not_multisite() { - $message = __('WP Ultimo requires a multisite install to run properly. To know more about WordPress Networks, visit this link: Create a Network →', 'wp-ultimo'); + $message = __('WP Multisite WaaS requires a multisite install to run properly. To know more about WordPress Networks, visit this link: Create a Network →', 'wp-ultimo'); printf('

%s

', $message); } // end notice_not_multisite; /** - * Adds a network admin notice about the WP Ultimo not being network-active + * Adds a network admin notice about the WP Multisite WaaS not being network-active * * @since 2.0.0 * @return void @@ -355,7 +355,7 @@ class Requirements { public static function notice_not_network_active() { // translators: %s is a placeholder for the Network Admin plugins page URL. - $message = sprintf(__('WP Ultimo needs to be network active to run properly. You can "Network Activate" it here', 'wp-ultimo'), network_admin_url('plugins.php')); + $message = sprintf(__('WP Multisite WaaS needs to be network active to run properly. You can "Network Activate" it here', 'wp-ultimo'), network_admin_url('plugins.php')); printf('

%s

', $message); diff --git a/inc/class-scripts.php b/inc/class-scripts.php index fd5029a..ab89881 100644 --- a/inc/class-scripts.php +++ b/inc/class-scripts.php @@ -1,6 +1,6 @@ $time_format, 'LTS' => str_replace(':i', ':i:s', (string) $time_format), - /* translators: the day/month/year date format used by WP Ultimo. You can changed it to localize this date format to your language. the default value is d/m/Y, which is the format 31/12/2021. */ + /* translators: the day/month/year date format used by WP Multisite WaaS. You can changed it to localize this date format to your language. the default value is d/m/Y, which is the format 31/12/2021. */ 'L' => __('d/m/Y', 'wp-ultimo'), 'LL' => $date_format, 'LLL' => sprintf('%s %s', $date_format, $time_format), @@ -272,7 +272,7 @@ class Scripts { } // end localize_moment; /** - * Registers the default WP Ultimo styles. + * Registers the default WP Multisite WaaS styles. * * @since 2.0.0 * @return void diff --git a/inc/class-settings.php b/inc/class-settings.php index f919367..185d072 100644 --- a/inc/class-settings.php +++ b/inc/class-settings.php @@ -1,6 +1,6 @@ get_all(); - - add_action('wp_ultimo_load', array($this, 'default_sections'), 1); - add_action('init', array($this, 'handle_legacy_filters'), 2); add_action('wu_render_settings', array($this, 'handle_legacy_scripts')); @@ -149,7 +145,7 @@ class Settings { } // end force_plugins_menu; /** - * Get all the settings from WP Ultimo + * Get all the settings from WP Multisite WaaS * * @param bool $check_caps If we should remove the settings the user does not have rights to see. * @return array Array containing all the settings @@ -231,7 +227,7 @@ class Settings { } // end save_setting; /** - * Save WP Ultimo Settings + * Save WP Multisite WaaS Settings * * This function loops through the settings sections and saves the settings * after validating them. @@ -239,7 +235,7 @@ class Settings { * @since 2.0.0 * * @param array $settings_to_save Array containing the settings to save. - * @param boolean $reset If true, WP Ultimo will override the saved settings with the default values. + * @param boolean $reset If true, WP Multisite WaaS will override the saved settings with the default values. * @return array */ public function save_settings($settings_to_save = array(), $reset = false) { @@ -288,7 +284,7 @@ class Settings { } // end foreach; /** - * Allow developers to filter settings before save by WP Ultimo. + * Allow developers to filter settings before save by WP Multisite WaaS. * * @since 2.0.18 * @@ -318,6 +314,10 @@ class Settings { */ public function get_sections() { + if ( $this->sections ) { + return $this->sections; + } + $this->default_sections(); $this->sections = apply_filters('wu_settings_get_sections', array( /* @@ -522,10 +522,11 @@ class Settings { }); + $settings = $this->get_all(); /* * Makes sure we install the default value if it is not set yet. */ - if (isset($atts['default']) && $atts['default'] !== null && !isset($this->settings[$field_slug])) { + if (isset($atts['default']) && $atts['default'] !== null && !isset($settings[$field_slug])) { $this->save_setting($field_slug, $atts['default']); @@ -534,7 +535,7 @@ class Settings { } // end add_field; /** - * Register the WP Ultimo default sections and fields. + * Register the WP Multisite WaaS default sections and fields. * * @since 2.0.0 * @return void @@ -542,7 +543,7 @@ class Settings { public function default_sections() { /* * General Settings - * This section holds the General settings of the WP Ultimo Plugin. + * This section holds the General settings of the WP Multisite WaaS Plugin. */ // Comma separated string of page ids that are already being used as default option @@ -607,7 +608,7 @@ class Settings { $this->add_field('general', 'currency_symbol', array( 'title' => __('Currency', 'wp-ultimo'), - 'desc' => __('Select the currency to be used in WP Ultimo.', 'wp-ultimo'), + 'desc' => __('Select the currency to be used in WP Multisite WaaS.', 'wp-ultimo'), 'type' => 'select', 'default' => 'USD', 'options' => 'wu_get_currencies', @@ -652,7 +653,7 @@ class Settings { /* * Login & Registration - * This section holds the Login & Registration settings of the WP Ultimo Plugin. + * This section holds the Login & Registration settings of the WP Multisite WaaS Plugin. */ $this->add_section('login-and-registration', array( @@ -774,7 +775,7 @@ class Settings { $this->add_field('login-and-registration', 'main_site_default_role', array( 'title' => __('Add to Main Site with Role...', 'wp-ultimo'), - 'desc' => __('Select the role WP Ultimo should use when adding the user to the main site of your network. Be careful.', 'wp-ultimo'), + 'desc' => __('Select the role WP Multisite WaaS should use when adding the user to the main site of your network. Be careful.', 'wp-ultimo'), 'type' => 'select', 'default' => 'subscriber', 'options' => 'wu_get_roles_as_options', @@ -787,7 +788,7 @@ class Settings { /* * Memberships - * This section holds the Membership settings of the WP Ultimo Plugin. + * This section holds the Membership settings of the WP Multisite WaaS Plugin. */ $this->add_section('memberships', array( @@ -823,7 +824,7 @@ class Settings { $this->add_field('memberships', 'block_frontend_grace_period', array( 'title' => __('Frontend Block Grace Period', 'wp-ultimo'), - 'desc' => __('Select the number of days WP Ultimo should wait after the membership goes inactive before blocking the frontend access. Leave 0 to block immediately after the membership becomes inactive.', 'wp-ultimo'), + 'desc' => __('Select the number of days WP Multisite WaaS should wait after the membership goes inactive before blocking the frontend access. Leave 0 to block immediately after the membership becomes inactive.', 'wp-ultimo'), 'type' => 'number', 'default' => 0, 'min' => 0, @@ -865,7 +866,7 @@ class Settings { $this->add_field('memberships', 'block_sites_on_downgrade', array( 'title' => __('Block Sites on Downgrade', 'wp-ultimo'), - 'desc' => __('Choose how WP Ultimo should handle client sites above their plan quota on downgrade.', 'wp-ultimo'), + 'desc' => __('Choose how WP Multisite WaaS should handle client sites above their plan quota on downgrade.', 'wp-ultimo'), 'type' => 'select', 'default' => 'none', 'options' => array( @@ -899,7 +900,7 @@ class Settings { $this->add_field('memberships', 'emulated_post_types_explanation', array( 'type' => 'note', - 'desc' => __('By default, WP Ultimo only allows super admins to limit post types that are registered on the main site. This makes sense from a technical stand-point but it also forces you to have plugins network-activated in order to be able to set limitations for their custom post types. Using this option, you can emulate the registering of a post type. This will register them on the main site and allow you to create limits for them on your products.', 'wp-ultimo'), + 'desc' => __('By default, WP Multisite WaaS only allows super admins to limit post types that are registered on the main site. This makes sense from a technical stand-point but it also forces you to have plugins network-activated in order to be able to set limitations for their custom post types. Using this option, you can emulate the registering of a post type. This will register them on the main site and allow you to create limits for them on your products.', 'wp-ultimo'), 'classes' => '', 'wrapper_classes' => '', )); @@ -977,7 +978,7 @@ class Settings { /* * Site Templates - * This section holds the Site Templates settings of the WP Ultimo Plugin. + * This section holds the Site Templates settings of the WP Multisite WaaS Plugin. */ $this->add_section('sites', array( @@ -1018,7 +1019,7 @@ class Settings { $this->add_field('sites', 'enable_screenshot_generator', array( 'title' => __('Enable Screenshot Generator', 'wp-ultimo'), - 'desc' => __('With this option is enabled, WP Ultimo will take a screenshot for every newly created site on your network and set the resulting image as that site\'s featured image. This features requires a valid license key to work and it is not supported for local sites.', 'wp-ultimo'), + 'desc' => __('With this option is enabled, WP Multisite WaaS will take a screenshot for every newly created site on your network and set the resulting image as that site\'s featured image. This features requires a valid license key to work and it is not supported for local sites.', 'wp-ultimo'), 'type' => 'toggle', 'default' => 1, )); @@ -1086,7 +1087,7 @@ class Settings { /* * Payment Gateways - * This section holds the Payment Gateways settings of the WP Ultimo Plugin. + * This section holds the Payment Gateways settings of the WP Multisite WaaS Plugin. */ $this->add_section('payment-gateways', array( @@ -1112,7 +1113,7 @@ class Settings { $this->add_field('payment-gateways', 'allow_trial_without_payment_method', array( 'title' => __('Allow Trials without Payment Method', 'wp-ultimo'), - 'desc' => __('By default, WP Ultimo asks customers to add a payment method on sign-up even if a trial period is present. Enable this option to only ask for a payment method when the trial period is over.', 'wp-ultimo'), + 'desc' => __('By default, WP Multisite WaaS asks customers to add a payment method on sign-up even if a trial period is present. Enable this option to only ask for a payment method when the trial period is over.', 'wp-ultimo'), 'tooltip' => '', 'type' => 'toggle', 'default' => 0, @@ -1128,7 +1129,7 @@ class Settings { $this->add_field('payment-gateways', 'invoice_numbering_scheme', array( 'title' => __('Invoice Numbering Scheme', 'wp-ultimo'), - 'desc' => __('What should WP Ultimo use as the invoice number?', 'wp-ultimo'), + 'desc' => __('What should WP Multisite WaaS use as the invoice number?', 'wp-ultimo'), 'type' => 'select', 'default' => 'reference_code', 'tooltip' => '', @@ -1172,7 +1173,7 @@ class Settings { /* * Emails - * This section holds the Email settings of the WP Ultimo Plugin. + * This section holds the Email settings of the WP Multisite WaaS Plugin. */ $this->add_section('emails', array( 'title' => __('Emails', 'wp-ultimo'), @@ -1184,7 +1185,7 @@ class Settings { /* * Domain Mapping - * This section holds the Domain Mapping settings of the WP Ultimo Plugin. + * This section holds the Domain Mapping settings of the WP Multisite WaaS Plugin. */ $this->add_section('domain-mapping', array( @@ -1210,7 +1211,7 @@ class Settings { /* * Integrations - * This section holds the Integrations settings of the WP Ultimo Plugin. + * This section holds the Integrations settings of the WP Multisite WaaS Plugin. */ $this->add_section('integrations', array( @@ -1230,7 +1231,7 @@ class Settings { /* * Other Options - * This section holds the Other Options settings of the WP Ultimo Plugin. + * This section holds the Other Options settings of the WP Multisite WaaS Plugin. */ $this->add_section('other', array( @@ -1250,7 +1251,7 @@ class Settings { $this->add_field('other', 'hide_tours', array( 'title' => __('Hide UI Tours', 'wp-ultimo') . $preview_image, - 'desc' => __('The UI tours showed by WP Ultimo should permanently hide themselves after being seen but if they persist for whatever reason, toggle this option to force them into their viewed state - which will prevent them from showing up again.', 'wp-ultimo'), + 'desc' => __('The UI tours showed by WP Multisite WaaS should permanently hide themselves after being seen but if they persist for whatever reason, toggle this option to force them into their viewed state - which will prevent them from showing up again.', 'wp-ultimo'), 'type' => 'toggle', 'default' => 0, )); @@ -1259,14 +1260,14 @@ class Settings { $this->add_field('other', 'disable_image_zoom', array( 'title' => __('Disable "Hover to Zoom"', 'wp-ultimo') . $preview_image_2, - 'desc' => __('By default, WP Ultimo adds a "hover to zoom" feature, allowing network admins to see larger version of site screenshots and other images across the UI in full-size when hovering over them. You can disable that feature here. Preview tags like the above are not affected.', 'wp-ultimo'), + 'desc' => __('By default, WP Multisite WaaS adds a "hover to zoom" feature, allowing network admins to see larger version of site screenshots and other images across the UI in full-size when hovering over them. You can disable that feature here. Preview tags like the above are not affected.', 'wp-ultimo'), 'type' => 'toggle', 'default' => 0, )); $this->add_field('other', 'error_reporting_header', array( 'title' => __('Logging', 'wp-ultimo'), - 'desc' => __('Log WP Ultimo data. This is useful for debugging purposes.', 'wp-ultimo'), + 'desc' => __('Log WP Multisite WaaS data. This is useful for debugging purposes.', 'wp-ultimo'), 'type' => 'header', )); @@ -1284,8 +1285,8 @@ class Settings { )); $this->add_field('other', 'enable_error_reporting', array( - 'title' => __('Send Error Data to WP Ultimo Developers', 'wp-ultimo'), - 'desc' => __('With this option enabled, every time your installation runs into an error related to WP Ultimo, that error data will be sent to us. No sensitive data gets collected, only environmental stuff (e.g. if this is this is a subdomain network, etc).', 'wp-ultimo'), + 'title' => __('Send Error Data to WP Multisite WaaS Developers', 'wp-ultimo'), + 'desc' => __('With this option enabled, every time your installation runs into an error related to WP Multisite WaaS, that error data will be sent to us. No sensitive data gets collected, only environmental stuff (e.g. if this is this is a subdomain network, etc).', 'wp-ultimo'), 'type' => 'toggle', 'default' => 1, )); @@ -1332,7 +1333,7 @@ class Settings { $this->add_field('other', 'security_mode', array( 'title' => __('Security Mode', 'wp-ultimo'), // Translators: Placeholder adds the security mode key and current site url with query string - 'desc' => sprintf(__('Only WP Ultimo and other must-use plugins will run on your WordPress install while this option is enabled.
Important: Copy the following URL to disable security mode if something goes wrong and this page becomes unavailable:%2$s
', 'wp-ultimo'), $security_mode_key, get_site_url() . $security_mode_key), + 'desc' => sprintf(__('Only WP Multisite WaaS and other must-use plugins will run on your WordPress install while this option is enabled.
Important: Copy the following URL to disable security mode if something goes wrong and this page becomes unavailable:%2$s
', 'wp-ultimo'), $security_mode_key, get_site_url() . $security_mode_key), 'type' => 'toggle', 'default' => 0, )); @@ -1341,7 +1342,7 @@ class Settings { $this->add_field('other', 'uninstall_wipe_tables', array( 'title' => __('Remove Data on Uninstall', 'wp-ultimo'), - 'desc' => __('Remove all saved data for WP Ultimo when the plugin is uninstalled.', 'wp-ultimo'), + 'desc' => __('Remove all saved data for WP Multisite WaaS when the plugin is uninstalled.', 'wp-ultimo'), 'type' => 'toggle', 'default' => 0, )); diff --git a/inc/class-sunrise.php b/inc/class-sunrise.php index e2a8bef..8895f4e 100644 --- a/inc/class-sunrise.php +++ b/inc/class-sunrise.php @@ -1,6 +1,6 @@ array()); @@ -369,7 +369,7 @@ class Sunrise { * Method for imputing Sunrise data at wp-ultimo-system-info table. * * @since 2.0.11 - * @param array $sys_info Array containing WP Ultimo installation info. + * @param array $sys_info Array containing WP Multisite WaaS installation info. * @return array Returns the array, modified with the sunrise data. */ public static function system_info($sys_info) { diff --git a/inc/class-unsupported.php b/inc/class-unsupported.php index 6779e5a..deec84f 100644 --- a/inc/class-unsupported.php +++ b/inc/class-unsupported.php @@ -1,6 +1,6 @@ ' . __('It seems that you have not run the WP Ultimo upgrader yet. That is the first thing we need to do.', 'wp-ultimo') . '

'; + $message[] = '

' . __('It seems that you have not run the WP Multisite WaaS upgrader yet. That is the first thing we need to do.', 'wp-ultimo') . '

'; $message[] = sprintf('%s', network_admin_url('admin.php?page=wp-ultimo-setup'), __('Visit the Installer to finish the upgrade →', 'wp-ultimo')); @@ -296,7 +296,7 @@ class Unsupported { } // end if; - $message = array_merge(array('

' . __('Thanks for updating to WP Ultimo version 2.0!', 'wp-ultimo') . '

'), $message); + $message = array_merge(array('

' . __('Thanks for updating to WP Multisite WaaS version 2.0!', 'wp-ultimo') . '

'), $message); $message = implode('', $message); @@ -313,7 +313,7 @@ class Unsupported { } // end maybe_add_notices; /** - * A fallback way to display admin notices when WP Ultimo is not fully loaded yet. + * A fallback way to display admin notices when WP Multisite WaaS is not fully loaded yet. * * @since 2.0.5 * @@ -344,7 +344,7 @@ class Unsupported { 'slug' => 'wp-ultimo-woocommerce', 'version' => '2.0.0', // translators: %s is a link to the plugins page. - 'desc' => __('A new version with full support for WP Ultimo 2.0 is already out. An update will appear on your %s page.', 'wp-ultimo'), + 'desc' => __('A new version with full support for WP Multisite WaaS 2.0 is already out. An update will appear on your %s page.', 'wp-ultimo'), ), '\WP_Ultimo_PTM' => array( 'name' => __('Plugin and Theme Manager', 'wp-ultimo'), @@ -352,20 +352,20 @@ class Unsupported { 'slug' => 'wp-ultimo-plugin-and-theme-manager', 'version' => '2.0.0', // translators: %s is a link to the plugins page. - 'desc' => __('Although still supported, a new version fully compatible with WP Ultimo 2.0 is available. An update will appear on your %s page.', 'wp-ultimo'), + 'desc' => __('Although still supported, a new version fully compatible with WP Multisite WaaS 2.0 is available. An update will appear on your %s page.', 'wp-ultimo'), ), '\WU_Multiple_Logins' => array( 'name' => __('Multiple Accounts', 'wp-ultimo'), 'replacement' => 'core', 'version' => '2.0.0', - 'desc' => __('Multiple Accounts is now part of WP Ultimo core. It needs to be activated on WP Ultimo → Settings → Login and Registration, though. You can safely remove this add-on after turning the new option on.', 'wp-ultimo'), + 'desc' => __('Multiple Accounts is now part of WP Multisite WaaS core. It needs to be activated on WP Multisite WaaS → Settings → Login and Registration, though. You can safely remove this add-on after turning the new option on.', 'wp-ultimo'), ), '\WP_Ultimo_Blocks' => array( 'name' => __('Blocks', 'wp-ultimo'), 'replacement' => 'core', 'version' => '2.0.0', // translators: %s is a link to the plugins page. - 'desc' => __('Blocks are now part of WP Ultimo core, although with different blocks available. You can safely delete this add-on on your %s page.', 'wp-ultimo'), + 'desc' => __('Blocks are now part of WP Multisite WaaS core, although with different blocks available. You can safely delete this add-on on your %s page.', 'wp-ultimo'), ), '\WU_Ultimo_Domain_Seller' => array( 'name' => __('Domain Seller', 'wp-ultimo'), diff --git a/inc/class-user-switching.php b/inc/class-user-switching.php index cdcc399..d646649 100644 --- a/inc/class-user-switching.php +++ b/inc/class-user-switching.php @@ -1,6 +1,6 @@ __('Hide Sites Admin Menu', 'wp-ultimo'), - 'desc' => __('We recommend that you manage all of your sites using the WP Ultimo → Sites page. To avoid confusion, you can hide the default "Sites" item from the WordPress admin menu by toggling this option.', 'wp-ultimo'), + 'desc' => __('We recommend that you manage all of your sites using the WP Multisite WaaS → Sites page. To avoid confusion, you can hide the default "Sites" item from the WordPress admin menu by toggling this option.', 'wp-ultimo'), 'type' => 'toggle', 'default' => 0, )); diff --git a/inc/compat/class-discount-code-compat.php b/inc/compat/class-discount-code-compat.php index 0f198da..8679726 100644 --- a/inc/compat/class-discount-code-compat.php +++ b/inc/compat/class-discount-code-compat.php @@ -2,7 +2,7 @@ /** * Discount Code Compatibility Layer * - * Handles discount code compatibility back-ports to WP Ultimo 1.X builds. + * Handles discount code compatibility back-ports to WP Multisite WaaS 1.X builds. * * @package WP_Ultimo * @subpackage Compat/Discount_Code_Compat @@ -15,7 +15,7 @@ namespace WP_Ultimo\Compat; defined('ABSPATH') || exit; /** - * Handles discount code compatibility back-ports to WP Ultimo 1.X builds. + * Handles discount code compatibility back-ports to WP Multisite WaaS 1.X builds. * * @since 2.0.0 */ diff --git a/inc/compat/class-general-compat.php b/inc/compat/class-general-compat.php index 2c2dd6f..5d2ac8e 100644 --- a/inc/compat/class-general-compat.php +++ b/inc/compat/class-general-compat.php @@ -227,7 +227,7 @@ class General_Compat { * * This plugin has a setting that replaces quotes on the content. * This breaks our moment configuration strings, and is generally - * not compatible with WP Ultimo vue templates. + * not compatible with WP Multisite WaaS vue templates. * * Here on this filter, we manually disable the smart quotes * settings to prevent that kind of processing, as well as add @@ -255,7 +255,7 @@ class General_Compat { */ public function add_wp_typography_warning_message() { - WP_Ultimo()->notices->add(__('WP Typography "Smart Quotes" replacement is not compatible with WP Ultimo and will be automatically disabled.', 'wp-ultimo'), 'warning'); + WP_Ultimo()->notices->add(__('WP Typography "Smart Quotes" replacement is not compatible with WP Multisite WaaS and will be automatically disabled.', 'wp-ultimo'), 'warning'); } // end add_wp_typography_warning_message; diff --git a/inc/compat/class-gutenberg-support.php b/inc/compat/class-gutenberg-support.php index 788ba83..e0961c0 100644 --- a/inc/compat/class-gutenberg-support.php +++ b/inc/compat/class-gutenberg-support.php @@ -2,7 +2,7 @@ /** * Gutenberg Support * - * Allows WP Ultimo to filter Gutenberg thingys. + * Allows WP Multisite WaaS to filter Gutenberg thingys. * * @since 1.9.14 * @author Arindo Duque diff --git a/inc/compat/class-legacy-shortcodes.php b/inc/compat/class-legacy-shortcodes.php index 17cee69..d0d56d5 100644 --- a/inc/compat/class-legacy-shortcodes.php +++ b/inc/compat/class-legacy-shortcodes.php @@ -2,7 +2,7 @@ /** * Legacy Shortcodes * - * Handles WP Ultimo 1.X Legacy Shortcodes + * Handles WP Multisite WaaS 1.X Legacy Shortcodes * * @package WP_Ultimo * @subpackage Compat @@ -17,7 +17,7 @@ defined('ABSPATH') || exit; use WP_Ultimo\Database\Memberships\Membership_Status; /** - * Handles WP Ultimo 1.X Legacy Shortcodes + * Handles WP Multisite WaaS 1.X Legacy Shortcodes * * @since 2.0.0 */ diff --git a/inc/compat/class-product-compat.php b/inc/compat/class-product-compat.php index 66fb696..0102173 100644 --- a/inc/compat/class-product-compat.php +++ b/inc/compat/class-product-compat.php @@ -2,7 +2,7 @@ /** * Products Compatibility Layer * - * Handles product compatibility back-ports to WP Ultimo 1.X builds. + * Handles product compatibility back-ports to WP Multisite WaaS 1.X builds. * * @package WP_Ultimo * @subpackage Compat/Product_Compat @@ -15,7 +15,7 @@ namespace WP_Ultimo\Compat; defined('ABSPATH') || exit; /** - * Handles product compatibility back-ports to WP Ultimo 1.X builds. + * Handles product compatibility back-ports to WP Multisite WaaS 1.X builds. * * @since 2.0.0 */ diff --git a/inc/database/engine/class-enum.php b/inc/database/engine/class-enum.php index 1d1469a..21e1c34 100644 --- a/inc/database/engine/class-enum.php +++ b/inc/database/engine/class-enum.php @@ -1,6 +1,6 @@ array( 'title' => __('Only reset generated data.', 'wp-ultimo'), - 'desc' => __('Toggle this option to only remove data that was added by the generator previously. Untoggling this option will reset ALL data in WP Ultimo tables.', 'wp-ultimo'), + 'desc' => __('Toggle this option to only remove data that was added by the generator previously. Untoggling this option will reset ALL data in WP Multisite WaaS tables.', 'wp-ultimo'), 'type' => 'toggle', 'value' => true, 'html_attr' => array( @@ -502,7 +502,7 @@ class Debug { $fields = array( 'reset_note' => array( 'type' => 'note', - 'desc' => __('This action will drop the WP Ultimo database tables and is irreversable.', 'wp-ultimo'), + 'desc' => __('This action will drop the WP Multisite WaaS database tables and is irreversable.', 'wp-ultimo'), ), 'submit_button' => array( 'title' => __('Drop Database Tables →', 'wp-ultimo'), @@ -603,7 +603,7 @@ class Debug { } // end load; /** - * Add a WP Ultimo page to the registry. + * Add a WP Multisite WaaS page to the registry. * * @since 2.0.0 * @@ -1007,7 +1007,7 @@ class Debug { $the_prefix = 'wp-ultimo_'; /* - * List of WP Ultimo options. + * List of WP Multisite WaaS options. * Format: $option_name => $should_use_prefix */ $options = array( diff --git a/inc/deprecated/deprecated.php b/inc/deprecated/deprecated.php index 89b163b..3a70efa 100644 --- a/inc/deprecated/deprecated.php +++ b/inc/deprecated/deprecated.php @@ -447,7 +447,7 @@ class WU_Multi_Network { * There is plans to re-add something like this in the future. * For now, this is deprecated and declaring it have no side-effects. * This class is here to prevent fatal errors when plugin developers - * used it on their WP Ultimo extensions. + * used it on their WP Multisite WaaS extensions. * * @deprecated 2.0.0 */ diff --git a/inc/development/class-toolkit.php b/inc/development/class-toolkit.php index 278df77..56d8f58 100644 --- a/inc/development/class-toolkit.php +++ b/inc/development/class-toolkit.php @@ -374,7 +374,7 @@ class Toolkit { } // end add_overview_panel; /** - * Manually enqueues query monitor and WP Ultimo styles. + * Manually enqueues query monitor and WP Multisite WaaS styles. * * @since 2.0.11 * diff --git a/inc/development/query-monitor/collectors/class-collector-overview.php b/inc/development/query-monitor/collectors/class-collector-overview.php index a70823b..db0831e 100644 --- a/inc/development/query-monitor/collectors/class-collector-overview.php +++ b/inc/development/query-monitor/collectors/class-collector-overview.php @@ -1,6 +1,6 @@ $this->menu(array( - 'title' => esc_html__('WP Ultimo', 'wp-ultimo'), + 'title' => esc_html__('WP Multisite WaaS', 'wp-ultimo'), 'id' => 'wp-ultimo', )), ); diff --git a/inc/exception/class-runtime-exception.php b/inc/exception/class-runtime-exception.php index ea3b37e..a75c942 100644 --- a/inc/exception/class-runtime-exception.php +++ b/inc/exception/class-runtime-exception.php @@ -1,6 +1,6 @@ value pairs to be saved as meta fields on that site. diff --git a/inc/functions/settings.php b/inc/functions/settings.php index e1af6b1..5beba8b 100644 --- a/inc/functions/settings.php +++ b/inc/functions/settings.php @@ -15,7 +15,7 @@ defined('ABSPATH') || exit; require_once wu_path('inc/functions/options.php'); /** - * Returns an array with all the WP Ultimo settings. + * Returns an array with all the WP Multisite WaaS settings. * * @since 2.0.0 * @return array diff --git a/inc/functions/tax.php b/inc/functions/tax.php index b557daa..ea1f415 100644 --- a/inc/functions/tax.php +++ b/inc/functions/tax.php @@ -12,7 +12,7 @@ defined('ABSPATH') || exit; use \WP_Ultimo\Tax\Tax; /** - * Checks if WP Ultimo should collect taxes. + * Checks if WP Multisite WaaS should collect taxes. * * @since 2.0.0 * @return bool diff --git a/inc/functions/template.php b/inc/functions/template.php index e0f29fc..c6c6776 100644 --- a/inc/functions/template.php +++ b/inc/functions/template.php @@ -43,7 +43,7 @@ function wu_get_template($view, $args = array(), $default_view = false) { * Allows developers to add additional folders to the replaceable list. * * Be careful, as allowing additional folders might cause - * out-of-date copies to be loaded instead of the WP Ultimo versions. + * out-of-date copies to be loaded instead of the WP Multisite WaaS versions. * * @since 2.0.0 * @param array $replaceable_views List of allowed folders. diff --git a/inc/functions/url.php b/inc/functions/url.php index ca932b0..aa2d45c 100644 --- a/inc/functions/url.php +++ b/inc/functions/url.php @@ -46,11 +46,11 @@ function wu_replace_scheme($url, $new_scheme = '') { } // end wu_replace_scheme; /** - * Wrapper to the network_admin_url function for WP Ultimo admin urls. + * Wrapper to the network_admin_url function for WP Multisite WaaS admin urls. * * @since 2.0.0 * - * @param string $path WP Ultimo page. + * @param string $path WP Multisite WaaS page. * @param array $query URL query parameters. * @return string */ diff --git a/inc/functions/user.php b/inc/functions/user.php index 59f320d..782a7e8 100644 --- a/inc/functions/user.php +++ b/inc/functions/user.php @@ -28,7 +28,7 @@ function wu_get_roles_as_options($add_default_option = false) { if ($add_default_option) { - $roles['default'] = __('Use WP Ultimo default', 'wp-ultimo'); + $roles['default'] = __('Use WP Multisite WaaS default', 'wp-ultimo'); } // end if; diff --git a/inc/gateways/class-base-gateway.php b/inc/gateways/class-base-gateway.php index 6966f86..44be3f4 100644 --- a/inc/gateways/class-base-gateway.php +++ b/inc/gateways/class-base-gateway.php @@ -45,7 +45,7 @@ abstract class Base_Gateway { * that share the same base code, or that have code that is applicable * to other gateways. * - * A classical example is the way Stripe is setup on WP Ultimo now: + * A classical example is the way Stripe is setup on WP Multisite WaaS now: * - We have two stripe gateways - stripe and stripe-checkout; * - Both of those gateways inherit from class-base-stripe-gateway.php, * which deals with appending the remote gateway links to the admin panel, @@ -313,7 +313,7 @@ abstract class Base_Gateway { * Adds Settings. * * This method allows developers to use - * WP Ultimo apis to add settings to the settings + * WP Multisite WaaS apis to add settings to the settings * page. * * Gateways can use wu_register_settings_field @@ -364,11 +364,11 @@ abstract class Base_Gateway { /** * Declares support for free trials. * - * WP Ultimo offers to ways of dealing with free trials: + * WP Multisite WaaS offers to ways of dealing with free trials: * (1) By asking for a payment method upfront; or * (2) By not asking for a payment method until the trial is over. * - * If you go the second route, WP Ultimo uses + * If you go the second route, WP Multisite WaaS uses * the free gateway to deal with the first payment (which will be 0) * * If you go the first route, though, the payment gateway @@ -701,8 +701,8 @@ abstract class Base_Gateway { * * @param string $return_url the URL to redirect after process. * @param self $gateway the gateway instance. - * @param \WP_Ultimo\Models\Payment $payment the WP Ultimo payment instance. - * @param \WP_Ultimo\Checkout\Cart $cart the current WP Ultimo cart order. + * @param \WP_Ultimo\Models\Payment $payment the WP Multisite WaaS payment instance. + * @param \WP_Ultimo\Checkout\Cart $cart the current WP Multisite WaaS cart order. * @return string */ return apply_filters('wu_return_url', $return_url, $this, $this->payment, $this->order); diff --git a/inc/gateways/class-base-stripe-gateway.php b/inc/gateways/class-base-stripe-gateway.php index 272e585..e0fe688 100644 --- a/inc/gateways/class-base-stripe-gateway.php +++ b/inc/gateways/class-base-stripe-gateway.php @@ -137,7 +137,7 @@ class Base_Stripe_Gateway extends Base_Gateway { if (method_exists('Stripe', 'setAppInfo')) { - Stripe\Stripe::setAppInfo('WordPress WP Ultimo', wu_get_version(), esc_url(site_url())); + Stripe\Stripe::setAppInfo('WordPress WP Multisite WaaS', wu_get_version(), esc_url(site_url())); } // end if; @@ -595,7 +595,7 @@ class Base_Stripe_Gateway extends Base_Gateway { /** * Installs webhook urls onto Stripe. * - * WP Ultimo will call this whenever settings for this api changes. + * WP Multisite WaaS will call this whenever settings for this api changes. * That being said, it might be a good idea to check if the webhook already exists * before trying to re-create it. * @@ -681,7 +681,7 @@ class Base_Stripe_Gateway extends Base_Gateway { Stripe\WebhookEndpoint::create(array( 'enabled_events' => array('*'), 'url' => $webhook_url, - 'description' => 'Added by WP Ultimo. Required to correctly handle changes in subscription status.', + 'description' => 'Added by WP Multisite WaaS. Required to correctly handle changes in subscription status.', )); return true; @@ -910,7 +910,7 @@ class Base_Stripe_Gateway extends Base_Gateway { * * @since 2.0.0 * - * @param integer $customer_id WP Ultimo customer ID. + * @param integer $customer_id WP Multisite WaaS customer ID. * @param integer $user_id The WordPress user ID. * @param integer $stripe_customer_id The Stripe Customer ID. * @return \WP_Ultimo\Dependencies\Stripe\Customer|\WP_Error @@ -923,7 +923,7 @@ class Base_Stripe_Gateway extends Base_Gateway { $customer_exists = false; /* - * Use the WP Ultimo customer ID to search on the + * Use the WP Multisite WaaS customer ID to search on the * database for an existing Stripe customer id. */ if (empty($stripe_customer_id)) { @@ -1030,7 +1030,7 @@ class Base_Stripe_Gateway extends Base_Gateway { * * @since 2.0.11 * - * @param \WP_Ultimo\Objects\Billing_Address $billing_address The WP Ultimo billing address. + * @param \WP_Ultimo\Objects\Billing_Address $billing_address The WP Multisite WaaS billing address. * @return array */ public function convert_to_stripe_address($billing_address) { @@ -1531,7 +1531,7 @@ class Base_Stripe_Gateway extends Base_Gateway { } // end build_non_recurring_cart; /** - * Converts the WP Ultimo cart into Stripe Sub arguments. + * Converts the WP Multisite WaaS cart into Stripe Sub arguments. * * @since 2.0.0 * @@ -1644,7 +1644,7 @@ class Base_Stripe_Gateway extends Base_Gateway { } // end build_stripe_cart; /** - * Converts the Stripe invoice line items into WP Ultimo line items. + * Converts the Stripe invoice line items into WP Multisite WaaS line items. * * @since 2.0.19 * @@ -1821,7 +1821,7 @@ class Base_Stripe_Gateway extends Base_Gateway { $customer_id = (int) $subscription->metadata['customer_id']; - // Legacy WP Ultimo uses user_id + // Legacy WP Multisite WaaS uses user_id $user_id = (int) $subscription->metadata['user_id']; if ($customer_id === 0 && $user_id === 0) { @@ -2316,7 +2316,7 @@ class Base_Stripe_Gateway extends Base_Gateway { } // end if; /* - * Set the WP Ultimo customer. + * Set the WP Multisite WaaS customer. */ $customer = $membership->get_customer(); diff --git a/inc/gateways/class-manual-gateway.php b/inc/gateways/class-manual-gateway.php index 71f8446..7c990c1 100644 --- a/inc/gateways/class-manual-gateway.php +++ b/inc/gateways/class-manual-gateway.php @@ -6,7 +6,7 @@ * It doesn't do anything with the payments, * as they need to be manually approved by the super admin * but it serves as a good example of how - * to implement a custom gateway for WP Ultimo. + * to implement a custom gateway for WP Multisite WaaS. * * @package WP_Ultimo * @subpackage Gateways @@ -214,7 +214,7 @@ class Manual_Gateway extends Base_Gateway { * * If you wish to stop the process at any point * due to some error, API failure or such, - * simply throw a exception and WP Ultimo will + * simply throw a exception and WP Multisite WaaS will * catch it and rollback any changes. */ if ($type === 'new') { @@ -279,7 +279,7 @@ class Manual_Gateway extends Base_Gateway { * for a possible wp_error. * * If that happens, we need to throw an exception - * WP Ultimo will capture that exception and + * WP Multisite WaaS will capture that exception and * rollback database changes for us, * to avoid problems with data integrity. * @@ -305,7 +305,7 @@ class Manual_Gateway extends Base_Gateway { /* * You don't need to return anything, * but if you return false from this method, - * WP Ultimo will assume that you want to handle redirection + * WP Multisite WaaS will assume that you want to handle redirection * and such by yourself. * * This can be useful for some gateways that require diff --git a/inc/gateways/class-stripe-checkout-gateway.php b/inc/gateways/class-stripe-checkout-gateway.php index fec3ec1..1eb7639 100644 --- a/inc/gateways/class-stripe-checkout-gateway.php +++ b/inc/gateways/class-stripe-checkout-gateway.php @@ -140,7 +140,7 @@ class Stripe_Checkout_Gateway extends Base_Stripe_Gateway { ), )); - $webhook_message = sprintf('%s', __('Whenever you change your Stripe settings, WP Ultimo will automatically check the webhook URLs on your Stripe account to make sure we get notified about changes in subscriptions and payments.', 'wp-ultimo')); + $webhook_message = sprintf('%s', __('Whenever you change your Stripe settings, WP Multisite WaaS will automatically check the webhook URLs on your Stripe account to make sure we get notified about changes in subscriptions and payments.', 'wp-ultimo')); wu_register_settings_field('payment-gateways', 'stripe_checkout_webhook_listener_explanation', array( 'title' => __('Webhook Listener URL', 'wp-ultimo'), diff --git a/inc/gateways/class-stripe-gateway.php b/inc/gateways/class-stripe-gateway.php index 5f4c4f9..cc80ea4 100644 --- a/inc/gateways/class-stripe-gateway.php +++ b/inc/gateways/class-stripe-gateway.php @@ -163,7 +163,7 @@ class Stripe_Gateway extends Base_Stripe_Gateway { ), )); - $webhook_message = sprintf('%s', __('Whenever you change your Stripe settings, WP Ultimo will automatically check the webhook URLs on your Stripe account to make sure we get notified about changes in subscriptions and payments.', 'wp-ultimo')); + $webhook_message = sprintf('%s', __('Whenever you change your Stripe settings, WP Multisite WaaS will automatically check the webhook URLs on your Stripe account to make sure we get notified about changes in subscriptions and payments.', 'wp-ultimo')); wu_register_settings_field('payment-gateways', 'stripe_webhook_listener_explanation', array( 'title' => __('Webhook Listener URL', 'wp-ultimo'), diff --git a/inc/helpers/class-validator.php b/inc/helpers/class-validator.php index edc9d7a..2a16859 100644 --- a/inc/helpers/class-validator.php +++ b/inc/helpers/class-validator.php @@ -1,6 +1,6 @@ find_injected_line($config, $constant); - $content = str_pad(sprintf("define( '%s', '%s' );", $constant, $value), 50) . '// Automatically injected by WP Ultimo;'; + $content = str_pad(sprintf("define( '%s', '%s' );", $constant, $value), 50) . '// Automatically injected by WP Multisite WaaS;'; if ($line === false) { @@ -54,7 +54,7 @@ class WP_Config { if ($hook_line === false) { - return new \WP_Error('unknown-wpconfig', __("WP Ultimo can't recognize your wp-config.php, please revert it to original state for further process.", 'wp-ultimo')); + return new \WP_Error('unknown-wpconfig', __("WP Multisite WaaS can't recognize your wp-config.php, please revert it to original state for further process.", 'wp-ultimo')); } // end if; diff --git a/inc/installers/class-base-installer.php b/inc/installers/class-base-installer.php index d659a22..d8c19e4 100644 --- a/inc/installers/class-base-installer.php +++ b/inc/installers/class-base-installer.php @@ -1,6 +1,6 @@ $has_tables_installed, 'title' => __('Create Database Tables', 'wp-ultimo'), - 'description' => __('WP Ultimo uses custom tables for performance reasons. We need to create those tables and make sure they are setup properly before we can activate the plugin.', 'wp-ultimo'), + 'description' => __('WP Multisite WaaS uses custom tables for performance reasons. We need to create those tables and make sure they are setup properly before we can activate the plugin.', 'wp-ultimo'), 'pending' => __('Pending', 'wp-ultimo'), 'installing' => __('Creating default tables...', 'wp-ultimo'), 'success' => __('Success!', 'wp-ultimo'), @@ -152,7 +152,7 @@ class Core_Installer extends Base_Installer { /** * Allow host providers to install the constant differently. * - * Returning true will prevent WP Ultimo from trying to write to the wp-config file. + * Returning true will prevent WP Multisite WaaS from trying to write to the wp-config file. * * @since 2.0.0 * @param bool $short_circuit diff --git a/inc/installers/class-default-content-installer.php b/inc/installers/class-default-content-installer.php index 83d53ec..f5a5379 100644 --- a/inc/installers/class-default-content-installer.php +++ b/inc/installers/class-default-content-installer.php @@ -24,7 +24,7 @@ class Default_Content_Installer extends Base_Installer { use \WP_Ultimo\Traits\Singleton; /** - * Loads dependencies for when WP Ultimo is not yet loaded. + * Loads dependencies for when WP Multisite WaaS is not yet loaded. * * @since 2.0.0 * @return void @@ -192,7 +192,7 @@ class Default_Content_Installer extends Base_Installer { $steps['create_emails'] = array( 'done' => $this->done_creating_emails(), 'title' => __('Create the System Emails', 'wp-ultimo'), - 'description' => __('This action will create all emails sent by WP Ultimo.', 'wp-ultimo'), + 'description' => __('This action will create all emails sent by WP Multisite WaaS.', 'wp-ultimo'), 'pending' => __('Pending', 'wp-ultimo'), 'installing' => __('Creating System Emails...', 'wp-ultimo'), 'success' => __('Success!', 'wp-ultimo'), diff --git a/inc/installers/class-migrator.php b/inc/installers/class-migrator.php index 02da86f..e5fa804 100644 --- a/inc/installers/class-migrator.php +++ b/inc/installers/class-migrator.php @@ -1,6 +1,6 @@ get_title()), + sprintf('// WP Multisite WaaS - Domain Mapping - %s', $this->get_title()), ); /* @@ -577,7 +577,7 @@ abstract class Base_Host_Provider { /* * Adds the final line. */ - $content[] = sprintf('// WP Ultimo - Domain Mapping - %s - End', $this->get_title()); + $content[] = sprintf('// WP Multisite WaaS - Domain Mapping - %s - End', $this->get_title()); return implode(PHP_EOL, $content); diff --git a/inc/integrations/host-providers/class-cloudways-host-provider.php b/inc/integrations/host-providers/class-cloudways-host-provider.php index 98c2fc3..44d8214 100644 --- a/inc/integrations/host-providers/class-cloudways-host-provider.php +++ b/inc/integrations/host-providers/class-cloudways-host-provider.php @@ -172,7 +172,7 @@ class Cloudways_Host_Provider extends Base_Host_Provider { ), 'WU_CLOUDWAYS_EXTRA_DOMAINS' => array( 'title' => __('Cloudways Extra Domains', 'wp-ultimo'), - 'tooltip' => __('The Cloudways API is a bit strange in that it doesn’t offer a way to add or remove just one domain, only a way to update the whole domain list. That means that WP Ultimo will replace all domains you might have there with the list of mapped domains of the network every time a new domain is added.', 'wp-ultimo'), + 'tooltip' => __('The Cloudways API is a bit strange in that it doesn’t offer a way to add or remove just one domain, only a way to update the whole domain list. That means that WP Multisite WaaS will replace all domains you might have there with the list of mapped domains of the network every time a new domain is added.', 'wp-ultimo'), 'desc' => __('Comma-separated list of additional domains to add to Cloudways.', 'wp-ultimo'), 'placeholder' => __('e.g. *.test.com, test.com', 'wp-ultimo'), ), diff --git a/inc/limits/class-theme-limits.php b/inc/limits/class-theme-limits.php index b99a96d..b983675 100644 --- a/inc/limits/class-theme-limits.php +++ b/inc/limits/class-theme-limits.php @@ -57,7 +57,7 @@ class Theme_Limits { * We need to bail if we're inside the WP CLI context and the * `skip-plugins` flag is present. * - * This is due to the fact that without WP Ultimo being loaded, + * This is due to the fact that without WP Multisite WaaS being loaded, * the functions and classes we'll need to perform any kind of proper * checks won't be available. To validate if we're being loaded or not, * we check for the function `wu_get_product`. diff --git a/inc/list-tables/class-base-list-table.php b/inc/list-tables/class-base-list-table.php index 985a767..6ab1baf 100644 --- a/inc/list-tables/class-base-list-table.php +++ b/inc/list-tables/class-base-list-table.php @@ -23,7 +23,7 @@ if (!class_exists('WP_List_Table')) { /** * Base List Table class. Extends WP_List_Table. * - * All of WP Ultimo's list tables should extend this class. + * All of WP Multisite WaaS's list tables should extend this class. * It provides ajax-filtering and pagination out-of-the-box among other cool features. * * @since 2.0.0 @@ -1215,7 +1215,7 @@ class Base_List_Table extends \WP_List_Table { } // end _get_js_var_name; /** - * Overrides the parent method to include the custom ajax functionality for WP Ultimo. + * Overrides the parent method to include the custom ajax functionality for WP Multisite WaaS. * * @since 2.0.0 * @return void diff --git a/inc/list-tables/class-inside-events-list-table.php b/inc/list-tables/class-inside-events-list-table.php index 1faf203..c19fc37 100644 --- a/inc/list-tables/class-inside-events-list-table.php +++ b/inc/list-tables/class-inside-events-list-table.php @@ -62,7 +62,7 @@ class Inside_Events_List_Table extends Event_List_Table { if ($object_initiator === 'system') { - $value = sprintf('%s', __('Automatically processed by WP Ultimo', 'wp-ultimo')); + $value = sprintf('%s', __('Automatically processed by WP Multisite WaaS', 'wp-ultimo')); } elseif ($object_initiator === 'manual') { diff --git a/inc/list-tables/class-membership-list-table-widget.php b/inc/list-tables/class-membership-list-table-widget.php index 5d703f7..a4d9710 100644 --- a/inc/list-tables/class-membership-list-table-widget.php +++ b/inc/list-tables/class-membership-list-table-widget.php @@ -288,7 +288,7 @@ class Membership_List_Table_Widget extends Base_List_Table { } // end get_columns; /** - * Overrides the parent method to include the custom ajax functionality for WP Ultimo. + * Overrides the parent method to include the custom ajax functionality for WP Multisite WaaS. * * @since 2.0.0 * @return void diff --git a/inc/list-tables/class-payment-list-table-widget.php b/inc/list-tables/class-payment-list-table-widget.php index 5b2c3ab..8b8a629 100644 --- a/inc/list-tables/class-payment-list-table-widget.php +++ b/inc/list-tables/class-payment-list-table-widget.php @@ -243,7 +243,7 @@ class Payment_List_Table_Widget extends Base_List_Table { public function get_filters() {} // end get_filters; /** - * Overrides the parent method to include the custom ajax functionality for WP Ultimo. + * Overrides the parent method to include the custom ajax functionality for WP Multisite WaaS. * * @since 2.0.0 * @return void diff --git a/inc/managers/class-base-manager.php b/inc/managers/class-base-manager.php index d2649af..8649ecb 100644 --- a/inc/managers/class-base-manager.php +++ b/inc/managers/class-base-manager.php @@ -15,7 +15,7 @@ namespace WP_Ultimo\Managers; defined('ABSPATH') || exit; /** - * Adds a lighter ajax option to WP Ultimo. + * Adds a lighter ajax option to WP Multisite WaaS. * * @since 1.9.14 */ diff --git a/inc/managers/class-block-manager.php b/inc/managers/class-block-manager.php index 95f0b17..bfad902 100644 --- a/inc/managers/class-block-manager.php +++ b/inc/managers/class-block-manager.php @@ -55,7 +55,7 @@ class Block_Manager extends Base_Manager { return array_merge($categories, array( array( 'slug' => 'wp-ultimo', - 'title' => __('WP Ultimo', 'wp-ultimo'), + 'title' => __('Multisite WaaS', 'wp-ultimo'), ), )); diff --git a/inc/managers/class-customer-manager.php b/inc/managers/class-customer-manager.php index f9808aa..11fab65 100644 --- a/inc/managers/class-customer-manager.php +++ b/inc/managers/class-customer-manager.php @@ -55,8 +55,11 @@ class Customer_Manager extends Base_Manager { $this->enable_wp_cli(); - Event_Manager::register_model_events('customer', __('Customer', 'wp-ultimo'), array('created', 'updated')); - + add_action('init', function () { + Event_Manager::register_model_events( 'customer', + __( 'Customer', 'wp-ultimo' ), + array( 'created', 'updated' ) ); + }); add_action('wp_login', array($this, 'log_ip_and_last_login'), 10, 2); add_filter('heartbeat_send', array($this, 'on_heartbeat_send')); diff --git a/inc/managers/class-domain-manager.php b/inc/managers/class-domain-manager.php index f7bfc30..5cd3e44 100644 --- a/inc/managers/class-domain-manager.php +++ b/inc/managers/class-domain-manager.php @@ -331,7 +331,7 @@ class Domain_Manager extends Base_Manager { wu_register_settings_field('sso', 'sso_header', array( 'title' => __('Single Sign-On Settings', 'wp-ultimo'), - 'desc' => __('Settings to configure the Single Sign-On functionality of WP Ultimo, responsible for keeping customers and admins logged in across all network domains.', 'wp-ultimo'), + 'desc' => __('Settings to configure the Single Sign-On functionality of WP Multisite WaaS, responsible for keeping customers and admins logged in across all network domains.', 'wp-ultimo'), 'type' => 'header', )); diff --git a/inc/managers/class-email-manager.php b/inc/managers/class-email-manager.php index aa4ce43..10d3789 100644 --- a/inc/managers/class-email-manager.php +++ b/inc/managers/class-email-manager.php @@ -65,7 +65,9 @@ class Email_Manager extends Base_Manager { $this->enable_wp_cli(); - $this->register_all_default_system_emails(); + add_action('init', function () { + $this->register_all_default_system_emails(); + }); /* * Adds the Email fields @@ -226,7 +228,7 @@ class Email_Manager extends Base_Manager { wu_register_settings_field('emails', 'from_name', array( 'title' => __('"From" Name', 'wp-ultimo'), - 'desc' => __('How the sender name will appear in emails sent by WP Ultimo.', 'wp-ultimo'), + 'desc' => __('How the sender name will appear in emails sent by WP Multisite WaaS.', 'wp-ultimo'), 'type' => 'text', 'placeholder' => get_network_option(null, 'site_name'), 'default' => get_network_option(null, 'site_name'), @@ -237,7 +239,7 @@ class Email_Manager extends Base_Manager { wu_register_settings_field('emails', 'from_email', array( 'title' => __('"From" E-mail', 'wp-ultimo'), - 'desc' => __('How the sender email will appear in emails sent by WP Ultimo.', 'wp-ultimo'), + 'desc' => __('How the sender email will appear in emails sent by WP Multisite WaaS.', 'wp-ultimo'), 'type' => 'email', 'placeholder' => get_network_option(null, 'admin_email'), 'default' => get_network_option(null, 'admin_email'), diff --git a/inc/managers/class-event-manager.php b/inc/managers/class-event-manager.php index 0be201a..89d7dfa 100644 --- a/inc/managers/class-event-manager.php +++ b/inc/managers/class-event-manager.php @@ -71,7 +71,7 @@ class Event_Manager extends Base_Manager { $this->enable_wp_cli(); - add_action('plugins_loaded', array($this, 'register_all_events')); + add_action('init', array($this, 'register_all_events')); add_action('wp_ajax_wu_get_event_payload_preview', array($this, 'event_payload_preview')); @@ -476,7 +476,7 @@ class Event_Manager extends Base_Manager { */ wu_register_event_type('renewal_payment_created', array( 'name' => __('New Renewal Payment Created', 'wp-ultimo'), - 'desc' => __('This event is fired every time a new renewal payment is created by WP Ultimo.', 'wp-ultimo'), + 'desc' => __('This event is fired every time a new renewal payment is created by WP Multisite WaaS.', 'wp-ultimo'), 'payload' => fn() => array_merge( array( 'default_payment_url' => 'https://linktopayment.com', @@ -496,7 +496,7 @@ class Event_Manager extends Base_Manager { wu_register_event_type($model . '_' . $type, array( 'name' => sprintf(__('%1$s %2$s', 'wp-ultimo'), $params['label'], ucfirst($type)), - 'desc' => sprintf(__('This event is fired every time a %1$s is %2$s by WP Ultimo.', 'wp-ultimo'), $params['label'], $type), + 'desc' => sprintf(__('This event is fired every time a %1$s is %2$s by WP Multisite WaaS.', 'wp-ultimo'), $params['label'], $type), 'deprecated_args' => array(), 'payload' => fn() => $this->get_model_payload($model), )); diff --git a/inc/managers/class-gateway-manager.php b/inc/managers/class-gateway-manager.php index 18a9c6f..aec0d43 100644 --- a/inc/managers/class-gateway-manager.php +++ b/inc/managers/class-gateway-manager.php @@ -80,6 +80,12 @@ class Gateway_Manager extends Base_Manager { * Adds our own default gateways. */ add_action('wu_register_gateways', array($this, 'add_default_gateways'), 5); + /* + * Allow developers to add new gateways. + */ + add_action('init', function () { + do_action('wu_register_gateways'); + }); /* * Adds the Gateway selection fields @@ -103,11 +109,6 @@ class Gateway_Manager extends Base_Manager { */ add_action('admin_init', array($this, 'maybe_process_v1_webhooks'), 1); - /* - * Allow developers to add new gateways. - */ - do_action('wu_register_gateways'); - } // end on_load; /** diff --git a/inc/managers/class-limitation-manager.php b/inc/managers/class-limitation-manager.php index 85d8b9a..5ca73bc 100644 --- a/inc/managers/class-limitation-manager.php +++ b/inc/managers/class-limitation-manager.php @@ -835,7 +835,7 @@ class Limitation_Manager { } // end get_theme_selection_list; /** - * Returns a list of all plugins available as options, excluding WP Ultimo. + * Returns a list of all plugins available as options, excluding WP Multisite WaaS. * * We also exclude a couple more. * @@ -885,7 +885,7 @@ class Limitation_Manager { /** * Returns the exclusion list for plugins. * - * We don't want people forcing WP Ultimo to be deactivated, do we? + * We don't want people forcing WP Multisite WaaS to be deactivated, do we? * * @since 2.0.0 * @return array diff --git a/inc/managers/class-membership-manager.php b/inc/managers/class-membership-manager.php index 69495dd..0fcb8a5 100644 --- a/inc/managers/class-membership-manager.php +++ b/inc/managers/class-membership-manager.php @@ -55,7 +55,9 @@ class Membership_Manager extends Base_Manager { $this->enable_wp_cli(); - Event_Manager::register_model_events('membership', __('Membership', 'wp-ultimo'), array('created', 'updated')); + add_action('init', function (){ + Event_Manager::register_model_events('membership', __('Membership', 'wp-ultimo'), array('created', 'updated')); + }); add_action('wu_async_transfer_membership', array($this, 'async_transfer_membership'), 10, 2); diff --git a/inc/managers/class-notification-manager.php b/inc/managers/class-notification-manager.php index 1c834ea..2d98c3d 100644 --- a/inc/managers/class-notification-manager.php +++ b/inc/managers/class-notification-manager.php @@ -125,7 +125,7 @@ class Notification_Manager { } // end clear_callback_list; /** - * Filter the WP Ultimo settings to add Notifications Options + * Filter the WP Multisite WaaS settings to add Notifications Options * * @since 2.0.0 * @@ -135,7 +135,7 @@ class Notification_Manager { wu_register_settings_field('sites', 'hide_notifications_subsites', array( 'title' => __('Hide Admin Notices on Sites', 'wp-ultimo'), - 'desc' => __('Hide all admin notices on network sites, except for WP Ultimo broadcasts.', 'wp-ultimo'), + 'desc' => __('Hide all admin notices on network sites, except for WP Multisite WaaS broadcasts.', 'wp-ultimo'), 'type' => 'toggle', 'default' => 0, 'order' => 25, diff --git a/inc/managers/class-payment-manager.php b/inc/managers/class-payment-manager.php index 2e9a2ab..6b88250 100644 --- a/inc/managers/class-payment-manager.php +++ b/inc/managers/class-payment-manager.php @@ -59,8 +59,11 @@ class Payment_Manager extends Base_Manager { $this->register_forms(); - Event_Manager::register_model_events('payment', __('Payment', 'wp-ultimo'), array('created', 'updated')); - + add_action('init', function () { + Event_Manager::register_model_events( 'payment', + __( 'Payment', 'wp-ultimo' ), + array( 'created', 'updated' ) ); + }); add_action('wp_login', array($this, 'check_pending_payments'), 10); add_action('wp_enqueue_scripts', array($this, 'show_pending_payments'), 10); diff --git a/inc/managers/class-site-manager.php b/inc/managers/class-site-manager.php index 7e173d3..11cf2e2 100644 --- a/inc/managers/class-site-manager.php +++ b/inc/managers/class-site-manager.php @@ -435,7 +435,7 @@ class Site_Manager extends Base_Manager { } // end get_site_screenshot; /** - * Add the additional sizes required by WP Ultimo. + * Add the additional sizes required by WP Multisite WaaS. * * Add for the main site only. * @@ -464,7 +464,7 @@ class Site_Manager extends Base_Manager { if (wu_get_setting('stop_template_indexing', false)) { - add_meta_box('wu-warnings', __('WP Ultimo - Search Engines', 'wp-ultimo'), array($this, 'render_no_index_warning'), 'dashboard-network', 'normal', 'high'); + add_meta_box('wu-warnings', __('WP Multisite WaaS - Search Engines', 'wp-ultimo'), array($this, 'render_no_index_warning'), 'dashboard-network', 'normal', 'high'); } // end if; @@ -482,7 +482,7 @@ class Site_Manager extends Base_Manager {
-

prevent search engines such as Google from indexing your template sites.', 'wp-ultimo'); ?>

+

prevent search engines such as Google from indexing your template sites.', 'wp-ultimo'); ?>

here.', 'wp-ultimo'), wu_network_admin_url('wp-ultimo-settings', array('tab' => 'sites'))); ?>

@@ -596,18 +596,18 @@ class Site_Manager extends Base_Manager { } // end login_header_text; /** - * Add notices to default site page, recommending the WP Ultimo option. + * Add notices to default site page, recommending the WP Multisite WaaS option. * * @since 2.0.0 * @return void */ public function add_notices_to_default_site_page() { - $notice = __('Hey there! We highly recommend managing your network sites using the WP Ultimo → Sites page.
If you want to avoid confusion, you can also hide this page from the admin panel completely on the WP Ultimo → Settings → Whitelabel options.', 'wp-ultimo'); + $notice = __('Hey there! We highly recommend managing your network sites using the WP Multisite WaaS → Sites page.
If you want to avoid confusion, you can also hide this page from the admin panel completely on the WP Multisite WaaS → Settings → Whitelabel options.', 'wp-ultimo'); WP_Ultimo()->notices->add($notice, 'info', 'network-admin', 'wu-sites-use-wp-ultimo', array( array( - 'title' => __('Go to the WP Ultimo Sites page →', 'wp-ultimo'), + 'title' => __('Go to the WP Multisite WaaS Sites page →', 'wp-ultimo'), 'url' => wu_network_admin_url('wp-ultimo-sites'), ), array( diff --git a/inc/managers/class-webhook-manager.php b/inc/managers/class-webhook-manager.php index 512a070..5fb89af 100644 --- a/inc/managers/class-webhook-manager.php +++ b/inc/managers/class-webhook-manager.php @@ -310,7 +310,7 @@ class Webhook_Manager extends Base_Manager { if (!$is_error) { - $message .= empty($response) ? sprintf('Got response: %s', $response) : 'To debug the remote server response, turn the "Wait for Response" option on the WP Ultimo Settings > API & Webhooks Tab'; + $message .= empty($response) ? sprintf('Got response: %s', $response) : 'To debug the remote server response, turn the "Wait for Response" option on the WP Multisite WaaS Settings > API & Webhooks Tab'; } else { diff --git a/inc/models/class-checkout-form.php b/inc/models/class-checkout-form.php index 7c65036..f9bef98 100644 --- a/inc/models/class-checkout-form.php +++ b/inc/models/class-checkout-form.php @@ -830,7 +830,7 @@ class Checkout_Form extends Base_Model { } // end get_multi_step_template; /** - * Converts the steps from classic WP Ultimo 1.X to the 2.0 format. + * Converts the steps from classic WP Multisite WaaS 1.X to the 2.0 format. * * @since 2.0.0 * diff --git a/inc/models/class-event.php b/inc/models/class-event.php index 6611a77..8ad14dd 100644 --- a/inc/models/class-event.php +++ b/inc/models/class-event.php @@ -46,7 +46,7 @@ class Event extends Base_Model { /** * Initiator of this event. * - * Events can be run by WP Ultimo, saved as 'system', or + * Events can be run by WP Multisite WaaS, saved as 'system', or * by people (admins, customers), saved as 'manual'. * * @since 2.0.0 diff --git a/inc/models/class-payment.php b/inc/models/class-payment.php index bd4ba8c..747660c 100644 --- a/inc/models/class-payment.php +++ b/inc/models/class-payment.php @@ -1091,7 +1091,7 @@ class Payment extends Base_Model { * An example of how that would work: * 1. Admin issues a refund on the admin panel; * 2. PayPal (for example), process the refund request - * and sends back a IPN (webhook call) telling WP Ultimo + * and sends back a IPN (webhook call) telling WP Multisite WaaS * that the refund was issued successfully; * 3. The IPN handler listens for that event and calls this * to reflect the refund in the original WU payment. diff --git a/inc/rollback/class-quiet-plugin-upgrader-skin.php b/inc/rollback/class-quiet-plugin-upgrader-skin.php index 260f164..757f624 100644 --- a/inc/rollback/class-quiet-plugin-upgrader-skin.php +++ b/inc/rollback/class-quiet-plugin-upgrader-skin.php @@ -1,8 +1,8 @@ getMessage())); + $error = new \WP_Error('maybe-error', sprintf(__('Something might have gone wrong doing the rollback. Check to see if the WP Multisite WaaS version was downgraded or not on the plugins page. Error captured: %s.', 'wp-ultimo'), $e->getMessage())); Logger::add('rollback-errors', $e->getMessage()); diff --git a/inc/tax/class-dashboard-taxes-tab.php b/inc/tax/class-dashboard-taxes-tab.php index a3790f7..8d39e7d 100644 --- a/inc/tax/class-dashboard-taxes-tab.php +++ b/inc/tax/class-dashboard-taxes-tab.php @@ -1,6 +1,6 @@ __('You do not have tax support enabled yet...'), - 'sub_message' => __('If you need to collect taxes, you\'ll be glad to hear that WP Ultimo offers tax support!'), + 'sub_message' => __('If you need to collect taxes, you\'ll be glad to hear that WP Multisite WaaS offers tax support!'), 'link_label' => __('Enable Tax Support', 'wp-ultimo'), 'link_url' => wu_network_admin_url('wp-ultimo-settings', array( 'tab' => 'taxes', diff --git a/inc/tax/class-tax.php b/inc/tax/class-tax.php index fe8173a..92aecdc 100644 --- a/inc/tax/class-tax.php +++ b/inc/tax/class-tax.php @@ -1,6 +1,6 @@ __('Inclusive Tax', 'wp-ultimo'), - 'desc' => __('Enable this option if your prices include taxes. In that case, WP Ultimo will calculate the included tax instead of adding taxes to the price.', 'wp-ultimo'), + 'desc' => __('Enable this option if your prices include taxes. In that case, WP Multisite WaaS will calculate the included tax instead of adding taxes to the price.', 'wp-ultimo'), 'type' => 'toggle', 'default' => 0, 'require' => array( diff --git a/inc/ui/class-base-element.php b/inc/ui/class-base-element.php index a9babf4..ca428f0 100644 --- a/inc/ui/class-base-element.php +++ b/inc/ui/class-base-element.php @@ -167,7 +167,7 @@ abstract class Base_Element { * * e.g.: * return array( - * 'WP Ultimo', + * 'WP Multisite WaaS', * 'Checkout', * 'Form', * 'Cart', @@ -237,7 +237,9 @@ abstract class Base_Element { add_action('wu_element_preview', array($this, 'setup_preview')); - do_action('wu_element_loaded', $this); + add_action('init', function () { + do_action('wu_element_loaded', $this); + } ); if ($this->public) { diff --git a/inc/ui/class-billing-info-element.php b/inc/ui/class-billing-info-element.php index 7719611..7ce1954 100644 --- a/inc/ui/class-billing-info-element.php +++ b/inc/ui/class-billing-info-element.php @@ -191,7 +191,7 @@ class Billing_Info_Element extends Base_Element { * * e.g.: * return array( - * 'WP Ultimo', + * 'WP Multisite WaaS', * 'Billing Information', * 'Form', * 'Cart', @@ -204,6 +204,7 @@ class Billing_Info_Element extends Base_Element { return array( 'WP Ultimo', + 'WP Multisite WaaS', 'Billing Information', 'Form', 'Cart', diff --git a/inc/ui/class-checkout-element.php b/inc/ui/class-checkout-element.php index d080cf5..34e51f6 100644 --- a/inc/ui/class-checkout-element.php +++ b/inc/ui/class-checkout-element.php @@ -177,7 +177,7 @@ class Checkout_Element extends Base_Element { * * e.g.: * return array( - * 'WP Ultimo', + * 'WP Multisite WaaS', * 'Checkout', * 'Form', * 'Cart', @@ -190,6 +190,7 @@ class Checkout_Element extends Base_Element { return array( 'WP Ultimo', + 'WP Multisite WaaS', 'Checkout', 'Form', 'Cart', diff --git a/inc/ui/class-current-membership-element.php b/inc/ui/class-current-membership-element.php index b10d6dc..ed1c1ef 100644 --- a/inc/ui/class-current-membership-element.php +++ b/inc/ui/class-current-membership-element.php @@ -214,7 +214,7 @@ class Current_Membership_Element extends Base_Element { * * e.g.: * return array( - * 'WP Ultimo', + * 'WP Multisite WaaS', * 'Membership', * 'Form', * 'Cart', @@ -227,6 +227,7 @@ class Current_Membership_Element extends Base_Element { return array( 'WP Ultimo', + 'WP Multisite WaaS', 'Membership', 'Form', 'Cart', diff --git a/inc/ui/class-current-site-element.php b/inc/ui/class-current-site-element.php index 85d6c89..e3e4df2 100644 --- a/inc/ui/class-current-site-element.php +++ b/inc/ui/class-current-site-element.php @@ -253,7 +253,7 @@ class Current_Site_Element extends Base_Element { * * e.g.: * return array( - * 'WP Ultimo', + * 'WP Multisite WaaS', * 'Site', * 'Form', * 'Cart', @@ -266,6 +266,7 @@ class Current_Site_Element extends Base_Element { return array( 'WP Ultimo', + 'WP Multisite WaaS', 'Site', 'Form', 'Cart', diff --git a/inc/ui/class-domain-mapping-element.php b/inc/ui/class-domain-mapping-element.php index d5089db..616945f 100644 --- a/inc/ui/class-domain-mapping-element.php +++ b/inc/ui/class-domain-mapping-element.php @@ -165,7 +165,7 @@ class Domain_Mapping_Element extends Base_Element { * * e.g.: * return array( - * 'WP Ultimo', + * 'WP Multisite WaaS', * 'Checkout', * 'Form', * 'Cart', @@ -178,6 +178,7 @@ class Domain_Mapping_Element extends Base_Element { return array( 'WP Ultimo', + 'WP Multisite WaaS', 'Domain', ); diff --git a/inc/ui/class-invoices-element.php b/inc/ui/class-invoices-element.php index 41f1971..7005efb 100644 --- a/inc/ui/class-invoices-element.php +++ b/inc/ui/class-invoices-element.php @@ -162,7 +162,7 @@ class Invoices_Element extends Base_Element { * * e.g.: * return array( - * 'WP Ultimo', + * 'WP Multisite WaaS', * 'Invoices', * 'Form', * 'Cart', @@ -175,6 +175,7 @@ class Invoices_Element extends Base_Element { return array( 'WP Ultimo', + 'WP Multisite WaaS', 'Invoices', 'Form', 'Cart', diff --git a/inc/ui/class-jumper.php b/inc/ui/class-jumper.php index 45692e9..94125c1 100644 --- a/inc/ui/class-jumper.php +++ b/inc/ui/class-jumper.php @@ -211,11 +211,11 @@ class Jumper { } // end add_user_custom_links; /** - * Add WP Ultimo settings links to the Jumper menu. + * Add WP Multisite WaaS settings links to the Jumper menu. * * @since 2.0.0 * - * @param array $links WP Ultimo settings array. + * @param array $links WP Multisite WaaS settings array. * @return array */ public function add_wp_ultimo_extra_links($links) { @@ -516,7 +516,7 @@ class Jumper { } // end get_link_list; /** - * Filter the WP Ultimo settings to add Jumper options + * Filter the WP Multisite WaaS settings to add Jumper options * * @since 2.0.0 * diff --git a/inc/ui/class-limits-element.php b/inc/ui/class-limits-element.php index 3075065..540ddaf 100644 --- a/inc/ui/class-limits-element.php +++ b/inc/ui/class-limits-element.php @@ -163,7 +163,7 @@ class Limits_Element extends Base_Element { * * e.g.: * return array( - * 'WP Ultimo', + * 'WP Multisite WaaS', * 'Checkout', * 'Form', * 'Cart', @@ -176,6 +176,7 @@ class Limits_Element extends Base_Element { return array( 'WP Ultimo', + 'WP Multisite WaaS', 'Account', 'Limits', 'Quotas', diff --git a/inc/ui/class-login-form-element.php b/inc/ui/class-login-form-element.php index 5c5895b..29579b0 100644 --- a/inc/ui/class-login-form-element.php +++ b/inc/ui/class-login-form-element.php @@ -320,7 +320,7 @@ class Login_Form_Element extends Base_Element { * * e.g.: * return array( - * 'WP Ultimo', + * 'WP Multisite WaaS', * 'Billing_Address', * 'Form', * 'Cart', @@ -333,6 +333,7 @@ class Login_Form_Element extends Base_Element { return array( 'WP Ultimo', + 'WP Multisite WaaS', 'Login', 'Reset Password', ); diff --git a/inc/ui/class-my-sites-element.php b/inc/ui/class-my-sites-element.php index 3e9d5e9..42cd0ef 100644 --- a/inc/ui/class-my-sites-element.php +++ b/inc/ui/class-my-sites-element.php @@ -224,7 +224,7 @@ class My_Sites_Element extends Base_Element { * * e.g.: * return array( - * 'WP Ultimo', + * 'WP Multisite WaaS', * 'Site', * 'Form', * 'Cart', @@ -237,6 +237,7 @@ class My_Sites_Element extends Base_Element { return array( 'WP Ultimo', + 'WP Multisite WaaS', 'Site', 'Form', 'Cart', diff --git a/inc/ui/class-payment-methods-element.php b/inc/ui/class-payment-methods-element.php index c89cb99..d0796d5 100644 --- a/inc/ui/class-payment-methods-element.php +++ b/inc/ui/class-payment-methods-element.php @@ -146,7 +146,7 @@ class Payment_Methods_Element extends Base_Element { * * e.g.: * return array( - * 'WP Ultimo', + * 'WP Multisite WaaS', * 'Payment Methods', * 'Form', * 'Cart', @@ -159,6 +159,7 @@ class Payment_Methods_Element extends Base_Element { return array( 'WP Ultimo', + 'WP Multisite WaaS', 'Payment Methods', 'Form', 'Cart', diff --git a/inc/ui/class-simple-text-element.php b/inc/ui/class-simple-text-element.php index 1360b41..150a966 100644 --- a/inc/ui/class-simple-text-element.php +++ b/inc/ui/class-simple-text-element.php @@ -169,7 +169,7 @@ class Simple_Text_Element extends Base_Element { * * e.g.: * return array( - * 'WP Ultimo', + * 'WP Multisite WaaS', * 'Billing_Address', * 'Form', * 'Cart', @@ -182,6 +182,7 @@ class Simple_Text_Element extends Base_Element { return array( 'WP Ultimo', + 'WP Multisite WaaS', 'text', 'simple text', 'shortcode', diff --git a/inc/ui/class-site-actions-element.php b/inc/ui/class-site-actions-element.php index 72e1a6c..939ff34 100644 --- a/inc/ui/class-site-actions-element.php +++ b/inc/ui/class-site-actions-element.php @@ -214,7 +214,7 @@ class Site_Actions_Element extends Base_Element { * * e.g.: * return array( - * 'WP Ultimo', + * 'WP Multisite WaaS', * 'Actions', * 'Form', * 'Cart', @@ -227,6 +227,7 @@ class Site_Actions_Element extends Base_Element { return array( 'WP Ultimo', + 'WP Multisite WaaS', 'Actions', 'Form', 'Cart', diff --git a/inc/ui/class-site-maintenance-element.php b/inc/ui/class-site-maintenance-element.php index 90e2dfb..645c088 100644 --- a/inc/ui/class-site-maintenance-element.php +++ b/inc/ui/class-site-maintenance-element.php @@ -169,7 +169,7 @@ class Site_Maintenance_Element extends Base_Element { * * e.g.: * return array( - * 'WP Ultimo', + * 'WP Multisite WaaS', * 'Billing_Address', * 'Form', * 'Cart', @@ -182,6 +182,7 @@ class Site_Maintenance_Element extends Base_Element { return array( 'WP Ultimo', + 'WP Multisite WaaS', 'Login', 'Reset Password', ); diff --git a/inc/ui/class-template-previewer.php b/inc/ui/class-template-previewer.php index e4bf99e..8ea938b 100644 --- a/inc/ui/class-template-previewer.php +++ b/inc/ui/class-template-previewer.php @@ -375,6 +375,7 @@ class Template_Previewer { // Fix to issue on wp_get_attachment_url() inside core. // @todo report it. + $initial_pagenow = $GLOBALS['pagenow']; $GLOBALS['pagenow'] = ''; $default_settings = array( @@ -407,6 +408,7 @@ class Template_Previewer { $parsed_args['display_responsive_controls'] = wu_string_to_bool($parsed_args['display_responsive_controls']); $parsed_args['use_custom_logo'] = wu_string_to_bool($parsed_args['use_custom_logo']); + $GLOBALS['pagenow'] = $initial_pagenow; return $parsed_args; } // end get_settings; diff --git a/inc/ui/class-template-switching-element.php b/inc/ui/class-template-switching-element.php index 4bb38fd..10734c2 100644 --- a/inc/ui/class-template-switching-element.php +++ b/inc/ui/class-template-switching-element.php @@ -191,6 +191,7 @@ class Template_Switching_Element extends Base_Element { return array( 'WP Ultimo', + 'WP Multisite WaaS', 'Template', 'Template Switching', ); diff --git a/inc/ui/class-thank-you-element.php b/inc/ui/class-thank-you-element.php index f505970..b88e1ec 100644 --- a/inc/ui/class-thank-you-element.php +++ b/inc/ui/class-thank-you-element.php @@ -283,7 +283,7 @@ class Thank_You_Element extends Base_Element { * * e.g.: * return array( - * 'WP Ultimo', + * 'WP Multisite WaaS', * 'Billing Information', * 'Form', * 'Cart', @@ -296,6 +296,7 @@ class Thank_You_Element extends Base_Element { return array( 'WP Ultimo', + 'WP Multisite WaaS', 'Thank You', 'Form', 'Cart', diff --git a/sunrise.php b/sunrise.php index e24a381..bac4ef5 100644 --- a/sunrise.php +++ b/sunrise.php @@ -1,7 +1,7 @@

- WP Ultimo is deactivated, yet its sunrise.php file is still being loaded. If you have no intentions of continuing to use WP Ultimo and this was not a temporary deactivation, we recommend removing the define('SUNRISE', true); line from your wp-config.php file. Keeping WP Ultimo sunrise.php file active without WP Ultimo can lead to unexpected behaviors and it is not advised. + WP Multisite WaaS is deactivated, yet its sunrise.php file is still being loaded. If you have no intentions of continuing to use WP Multisite WaaS and this was not a temporary deactivation, we recommend removing the define('SUNRISE', true); line from your wp-config.php file. Keeping WP Multisite WaaS sunrise.php file active without WP Multisite WaaS can lead to unexpected behaviors and it is not advised.

diff --git a/uninstall.php b/uninstall.php index f6ffe33..0e8b6f9 100644 --- a/uninstall.php +++ b/uninstall.php @@ -1,6 +1,6 @@ diff --git a/views/base/edit.php b/views/base/edit.php index be93f34..2919ba6 100644 --- a/views/base/edit.php +++ b/views/base/edit.php @@ -47,7 +47,7 @@ * * @since 1.8.2 * @param object Object holding the information - * @param WU_Page WP Ultimo Page instance + * @param WU_Page WP Multisite WaaS Page instance */ do_action('wu_page_edit_after_title', $object, $page); ?> @@ -113,7 +113,7 @@ * * @since 1.8.2 * @param object Object holding the information - * @param WU_Page WP Ultimo Page instance + * @param WU_Page WP Multisite WaaS Page instance */ do_action('wu_edit_page_after_title_input', $object, $page); ?> @@ -241,7 +241,7 @@ * * @since 1.8.2 * @param object Object holding the information - * @param WU_Page WP Ultimo Page instance + * @param WU_Page WP Multisite WaaS Page instance */ do_action('wu_page_edit_footer', $object, $page); ?> diff --git a/views/base/list.php b/views/base/list.php index cd09307..f786c46 100644 --- a/views/base/list.php +++ b/views/base/list.php @@ -44,7 +44,7 @@ * Allow plugin developers to add additional buttons to list pages * * @since 1.8.2 - * @param WU_Page WP Ultimo Page instance + * @param WU_Page WP Multisite WaaS Page instance */ do_action('wu_page_list_after_title', $page); ?> @@ -109,7 +109,7 @@ * Allow plugin developers to add scripts to the bottom of the page * * @since 1.8.2 - * @param WU_Page WP Ultimo Page instance + * @param WU_Page WP Multisite WaaS Page instance */ do_action('wu_page_list_footer', $page); ?> diff --git a/views/base/settings.php b/views/base/settings.php index b493109..94e94e8 100644 --- a/views/base/settings.php +++ b/views/base/settings.php @@ -44,7 +44,7 @@ * Allow plugin developers to add additional buttons to list pages * * @since 1.8.2 - * @param WU_Page WP Ultimo Page instance + * @param WU_Page WP Multisite WaaS Page instance */ do_action('wu_page_wizard_after_title', $page); ?> @@ -296,7 +296,7 @@ * Allow plugin developers to add scripts to the bottom of the page * * @since 1.8.2 - * @param WU_Page WP Ultimo Page instance + * @param WU_Page WP Multisite WaaS Page instance */ do_action('wu_page_wizard_footer', $page); ?> diff --git a/views/base/wizard.php b/views/base/wizard.php index 09c3f41..9c83584 100644 --- a/views/base/wizard.php +++ b/views/base/wizard.php @@ -48,7 +48,7 @@ * Allow plugin developers to add additional buttons to list pages * * @since 1.8.2 - * @param WU_Page WP Ultimo Page instance + * @param WU_Page WP Multisite WaaS Page instance */ do_action('wu_page_wizard_after_title', $page); ?> @@ -162,7 +162,7 @@ * Allow plugin developers to add scripts to the bottom of the page * * @since 1.8.2 - * @param WU_Page WP Ultimo Page instance + * @param WU_Page WP Multisite WaaS Page instance */ do_action('wu_page_wizard_footer', $page); ?> diff --git a/views/broadcast/emails/plain.php b/views/broadcast/emails/plain.php index e180d99..99f3959 100644 --- a/views/broadcast/emails/plain.php +++ b/views/broadcast/emails/plain.php @@ -4,7 +4,7 @@ * * This template can be overridden by copying it to yourtheme/wp-ultimo/emails/plain.php. * - * HOWEVER, on occasion WP Ultimo will need to update template files and you + * HOWEVER, on occasion WP Multisite WaaS will need to update template files and you * (the theme developer) will need to copy the new files to your theme to * maintain compatibility. We try to do this as little as possible, but it does * happen. When this occurs the version of the template file will be bumped and diff --git a/views/checkout/templates/period-selection/clean.php b/views/checkout/templates/period-selection/clean.php index 723146c..29bba1e 100644 --- a/views/checkout/templates/period-selection/clean.php +++ b/views/checkout/templates/period-selection/clean.php @@ -4,7 +4,7 @@ * * This template can be overridden by copying it to yourtheme/wp-ultimo/signup/pricing-table/frequency-selector.php. * - * HOWEVER, on occasion WP Ultimo will need to update template files and you + * HOWEVER, on occasion WP Multisite WaaS will need to update template files and you * (the theme developer) will need to copy the new files to your theme to * maintain compatibility. We try to do this as little as possible, but it does * happen. When this occurs the version of the template file will be bumped and diff --git a/views/checkout/templates/period-selection/legacy.php b/views/checkout/templates/period-selection/legacy.php index cb5aafd..2172dfe 100644 --- a/views/checkout/templates/period-selection/legacy.php +++ b/views/checkout/templates/period-selection/legacy.php @@ -4,7 +4,7 @@ * * This template can be overridden by copying it to yourtheme/wp-ultimo/signup/pricing-table/frequency-selector.php. * - * HOWEVER, on occasion WP Ultimo will need to update template files and you + * HOWEVER, on occasion WP Multisite WaaS will need to update template files and you * (the theme developer) will need to copy the new files to your theme to * maintain compatibility. We try to do this as little as possible, but it does * happen. When this occurs the version of the template file will be bumped and diff --git a/views/checkout/templates/steps/clean.php b/views/checkout/templates/steps/clean.php index 56fb214..54154f6 100644 --- a/views/checkout/templates/steps/clean.php +++ b/views/checkout/templates/steps/clean.php @@ -4,7 +4,7 @@ * * This template can be overridden by copying it to yourtheme/wp-ultimo/signup/signup-steps-navigation.php. * - * HOWEVER, on occasion WP Ultimo will need to update template files and you + * HOWEVER, on occasion WP Multisite WaaS will need to update template files and you * (the theme developer) will need to copy the new files to your theme to * maintain compatibility. We try to do this as little as possible, but it does * happen. When this occurs the version of the template file will be bumped and diff --git a/views/checkout/templates/steps/legacy.php b/views/checkout/templates/steps/legacy.php index 5df26b6..1c31342 100644 --- a/views/checkout/templates/steps/legacy.php +++ b/views/checkout/templates/steps/legacy.php @@ -4,7 +4,7 @@ * * This template can be overridden by copying it to yourtheme/wp-ultimo/signup/signup-steps-navigation.php. * - * HOWEVER, on occasion WP Ultimo will need to update template files and you + * HOWEVER, on occasion WP Multisite WaaS will need to update template files and you * (the theme developer) will need to copy the new files to your theme to * maintain compatibility. We try to do this as little as possible, but it does * happen. When this occurs the version of the template file will be bumped and diff --git a/views/checkout/templates/steps/minimal.php b/views/checkout/templates/steps/minimal.php index 5e96e28..b463000 100644 --- a/views/checkout/templates/steps/minimal.php +++ b/views/checkout/templates/steps/minimal.php @@ -4,7 +4,7 @@ * * This template can be overridden by copying it to yourtheme/wp-ultimo/signup/signup-steps-navigation.php. * - * HOWEVER, on occasion WP Ultimo will need to update template files and you + * HOWEVER, on occasion WP Multisite WaaS will need to update template files and you * (the theme developer) will need to copy the new files to your theme to * maintain compatibility. We try to do this as little as possible, but it does * happen. When this occurs the version of the template file will be bumped and diff --git a/views/checkout/templates/template-selection/minimal.php b/views/checkout/templates/template-selection/minimal.php index b2e49f7..4978a06 100644 --- a/views/checkout/templates/template-selection/minimal.php +++ b/views/checkout/templates/template-selection/minimal.php @@ -4,7 +4,7 @@ * * This template can be overridden by copying it to yourtheme/wp-ultimo/signup/pricing-table/frequency-selector.php. * - * HOWEVER, on occasion WP Ultimo will need to update template files and you + * HOWEVER, on occasion WP Multisite WaaS will need to update template files and you * (the theme developer) will need to copy the new files to your theme to * maintain compatibility. We try to do this as little as possible, but it does * happen. When this occurs the version of the template file will be bumped and diff --git a/views/dashboard-widgets/news.php b/views/dashboard-widgets/news.php index a1e4b5d..54ffc20 100644 --- a/views/dashboard-widgets/news.php +++ b/views/dashboard-widgets/news.php @@ -45,7 +45,7 @@ const query_params = 'https://versions.nextpress.co/updates/news.php', 'action' => 'wu_fetch_rss', - 'title' => __('WP Ultimo Community', 'wp-ultimo'), + 'title' => __('WP Multisite WaaS Community', 'wp-ultimo'), 'items' => 3, 'show_summary' => 1, 'show_author' => 0, diff --git a/views/legacy/signup/pricing-table/frequency-selector.php b/views/legacy/signup/pricing-table/frequency-selector.php index 444193d..2699012 100644 --- a/views/legacy/signup/pricing-table/frequency-selector.php +++ b/views/legacy/signup/pricing-table/frequency-selector.php @@ -4,7 +4,7 @@ * * This template can be overridden by copying it to yourtheme/wp-ultimo/signup/pricing-table/frequency-selector.php. * - * HOWEVER, on occasion WP Ultimo will need to update template files and you + * HOWEVER, on occasion WP Multisite WaaS will need to update template files and you * (the theme developer) will need to copy the new files to your theme to * maintain compatibility. We try to do this as little as possible, but it does * happen. When this occurs the version of the template file will be bumped and diff --git a/views/legacy/signup/pricing-table/no-plans.php b/views/legacy/signup/pricing-table/no-plans.php index 20488e3..626afbc 100644 --- a/views/legacy/signup/pricing-table/no-plans.php +++ b/views/legacy/signup/pricing-table/no-plans.php @@ -4,7 +4,7 @@ * * This template can be overridden by copying it to yourtheme/wp-ultimo/signup/no-plan.php. * - * HOWEVER, on occasion WP Ultimo will need to update template files and you + * HOWEVER, on occasion WP Multisite WaaS will need to update template files and you * (the theme developer) will need to copy the new files to your theme to * maintain compatibility. We try to do this as little as possible, but it does * happen. When this occurs the version of the template file will be bumped and diff --git a/views/legacy/signup/pricing-table/plan.php b/views/legacy/signup/pricing-table/plan.php index 0804ce1..c0a7d04 100644 --- a/views/legacy/signup/pricing-table/plan.php +++ b/views/legacy/signup/pricing-table/plan.php @@ -4,7 +4,7 @@ * * This template can be overridden by copying it to yourtheme/wp-ultimo/signup/plan.php. * - * HOWEVER, on occasion WP Ultimo will need to update template files and you + * HOWEVER, on occasion WP Multisite WaaS will need to update template files and you * (the theme developer) will need to copy the new files to your theme to * maintain compatibility. We try to do this as little as possible, but it does * happen. When this occurs the version of the template file will be bumped and diff --git a/views/legacy/signup/pricing-table/pricing-table.php b/views/legacy/signup/pricing-table/pricing-table.php index 94f40d7..e5b51f0 100644 --- a/views/legacy/signup/pricing-table/pricing-table.php +++ b/views/legacy/signup/pricing-table/pricing-table.php @@ -4,7 +4,7 @@ * * This template can be overridden by copying it to yourtheme/wp-ultimo/signup/princing-table/princing-table.php. * - * HOWEVER, on occasion WP Ultimo will need to update template files and you + * HOWEVER, on occasion WP Multisite WaaS will need to update template files and you * (the theme developer) will need to copy the new files to your theme to * maintain compatibility. We try to do this as little as possible, but it does * happen. When this occurs the version of the template file will be bumped and diff --git a/views/legacy/signup/signup-main.php b/views/legacy/signup/signup-main.php index e89606a..3a4b21f 100644 --- a/views/legacy/signup/signup-main.php +++ b/views/legacy/signup/signup-main.php @@ -4,7 +4,7 @@ * * This template can be overridden by copying it to yourtheme/wp-ultimo/signup/signup-header.php. * - * HOWEVER, on occasion WP Ultimo will need to update template files and you + * HOWEVER, on occasion WP Multisite WaaS will need to update template files and you * (the theme developer) will need to copy the new files to your theme to * maintain compatibility. We try to do this as little as possible, but it does * happen. When this occurs the version of the template file will be bumped and diff --git a/views/legacy/signup/signup-nav-links.php b/views/legacy/signup/signup-nav-links.php index c27f21a..be8bae9 100644 --- a/views/legacy/signup/signup-nav-links.php +++ b/views/legacy/signup/signup-nav-links.php @@ -4,7 +4,7 @@ * * This template can be overridden by copying it to yourtheme/wp-ultimo/signup/signup-nav-links.php. * - * HOWEVER, on occasion WP Ultimo will need to update template files and you + * HOWEVER, on occasion WP Multisite WaaS will need to update template files and you * (the theme developer) will need to copy the new files to your theme to * maintain compatibility. We try to do this as little as possible, but it does * happen. When this occurs the version of the template file will be bumped and diff --git a/views/legacy/signup/signup-steps-navigation.php b/views/legacy/signup/signup-steps-navigation.php index 9bb699e..4708cd2 100644 --- a/views/legacy/signup/signup-steps-navigation.php +++ b/views/legacy/signup/signup-steps-navigation.php @@ -4,7 +4,7 @@ * * This template can be overridden by copying it to yourtheme/wp-ultimo/signup/signup-steps-navigation.php. * - * HOWEVER, on occasion WP Ultimo will need to update template files and you + * HOWEVER, on occasion WP Multisite WaaS will need to update template files and you * (the theme developer) will need to copy the new files to your theme to * maintain compatibility. We try to do this as little as possible, but it does * happen. When this occurs the version of the template file will be bumped and diff --git a/views/legacy/signup/steps/step-default.php b/views/legacy/signup/steps/step-default.php index c438a70..5a3c88d 100644 --- a/views/legacy/signup/steps/step-default.php +++ b/views/legacy/signup/steps/step-default.php @@ -4,7 +4,7 @@ * * This template can be overridden by copying it to yourtheme/wp-ultimo/signup/steps/step-default.php. * - * HOWEVER, on occasion WP Ultimo will need to update template files and you + * HOWEVER, on occasion WP Multisite WaaS will need to update template files and you * (the theme developer) will need to copy the new files to your theme to * maintain compatibility. We try to do this as little as possible, but it does * happen. When this occurs the version of the template file will be bumped and diff --git a/views/legacy/signup/steps/step-domain-url-preview.php b/views/legacy/signup/steps/step-domain-url-preview.php index 3c6301b..5b15f8a 100644 --- a/views/legacy/signup/steps/step-domain-url-preview.php +++ b/views/legacy/signup/steps/step-domain-url-preview.php @@ -4,7 +4,7 @@ * * This template can be overridden by copying it to yourtheme/wp-ultimo/signup/steps/step-domain-url-preview.php. * - * HOWEVER, on occasion WP Ultimo will need to update template files and you + * HOWEVER, on occasion WP Multisite WaaS will need to update template files and you * (the theme developer) will need to copy the new files to your theme to * maintain compatibility. We try to do this as little as possible, but it does * happen. When this occurs the version of the template file will be bumped and diff --git a/views/legacy/signup/steps/step-plans.php b/views/legacy/signup/steps/step-plans.php index b07fc79..9140700 100644 --- a/views/legacy/signup/steps/step-plans.php +++ b/views/legacy/signup/steps/step-plans.php @@ -4,7 +4,7 @@ * * This template can be overridden by copying it to yourtheme/wp-ultimo/signup/steps/step-plans.php. * - * HOWEVER, on occasion WP Ultimo will need to update template files and you + * HOWEVER, on occasion WP Multisite WaaS will need to update template files and you * (the theme developer) will need to copy the new files to your theme to * maintain compatibility. We try to do this as little as possible, but it does * happen. When this occurs the version of the template file will be bumped and diff --git a/views/rollback/rollback.php b/views/rollback/rollback.php index eee5f38..23cf3d4 100644 --- a/views/rollback/rollback.php +++ b/views/rollback/rollback.php @@ -44,7 +44,7 @@ * Allow plugin developers to add * * @since 1.8.2 - * @param WU_Page WP Ultimo Page instance + * @param WU_Page WP Multisite WaaS Page instance */ do_action('wu_page_rollback_after_title', $page); ?> diff --git a/views/settings/widget-settings-body.php b/views/settings/widget-settings-body.php index 0d24aaa..9e5aede 100644 --- a/views/settings/widget-settings-body.php +++ b/views/settings/widget-settings-body.php @@ -94,7 +94,7 @@

- Select the currency symbol to be used in WP Ultimo + Select the currency symbol to be used in WP Multisite WaaS

@@ -267,7 +267,7 @@

Error Reporting

-

Help us make WP Ultimo better by automatically reporting fatal errors and warnings so we can fix them as soon +

Help us make WP Multisite WaaS better by automatically reporting fatal errors and warnings so we can fix them as soon as possible.

@@ -278,15 +278,15 @@ - + + Send Error Data to WP Multisite WaaS Developers

- With this option enabled, every time your installation runs into an error related to WP Ultimo, that + With this option enabled, every time your installation runs into an error related to WP Multisite WaaS, that error data will be sent to us. That way we can review, debug, and fix issues without you having to manually report anything. No sensitive data gets collected, only environmental stuff (e.g. if this is this is a subdomain network, etc). @@ -320,7 +320,7 @@ Remove Data on Uninstall

- Remove all saved data for WP Ultimo when the plugin is uninstalled. + Remove all saved data for WP Multisite WaaS when the plugin is uninstalled.

diff --git a/views/ui/branding/header.php b/views/ui/branding/header.php index c839f62..b864368 100644 --- a/views/ui/branding/header.php +++ b/views/ui/branding/header.php @@ -24,7 +24,7 @@ * * @since 2.0.0 * - * @param \WP_Ultimo\Admin_Pages\Base_Admin_Page $page WP Ultimo admin page instance. + * @param \WP_Ultimo\Admin_Pages\Base_Admin_Page $page WP Multisite WaaS admin page instance. */ do_action('wu_header_left', $page); @@ -49,7 +49,7 @@ * * @since 2.0.0 * - * @param \WP_Ultimo\Admin_Pages\Base_Admin_Page $page WP Ultimo admin page instance. + * @param \WP_Ultimo\Admin_Pages\Base_Admin_Page $page WP Multisite WaaS admin page instance. */ do_action('wu_header_right', $page); diff --git a/views/wizards/host-integrations/cloudways-instructions.php b/views/wizards/host-integrations/cloudways-instructions.php index e564d05..9a1abf3 100644 --- a/views/wizards/host-integrations/cloudways-instructions.php +++ b/views/wizards/host-integrations/cloudways-instructions.php @@ -22,7 +22,7 @@

The same thing happens here: the URL takes the form of https://platform.cloudways.com/apps/YOUR_APP_ID_HERE/access_detail

Additional Step – Extra Domains

-

The Cloudways API is a bit strange in that it doesn’t offer a way to add or remove just one domain, only a way to update the whole domain list. That means that WP Ultimo will replace all domains you might have there with the list of mapped domains of the network every time a new domain is added.

+

The Cloudways API is a bit strange in that it doesn’t offer a way to add or remove just one domain, only a way to update the whole domain list. That means that WP Multisite WaaS will replace all domains you might have there with the list of mapped domains of the network every time a new domain is added.

If there are domains you want to keep on the list, use the WU_CLOUDWAYS_EXTRA_DOMAINS as demonstrated below, with a comma-separated list of the domains you wanna keep (this is useful if you need a wildcard setting, for example, that needs to be on that list at all times).

define('WU_CLOUDWAYS_EXTRA_DOMAINS', '*.yourdomain.com,extradomain1.com,extradomain2.com');

Here’s how it should look on your wp-config.php (fake values used below):

diff --git a/views/wizards/host-integrations/ready.php b/views/wizards/host-integrations/ready.php index a91dcb5..ed0219e 100644 --- a/views/wizards/host-integrations/ready.php +++ b/views/wizards/host-integrations/ready.php @@ -13,7 +13,7 @@

- get_title()); ?> + get_title()); ?>

diff --git a/views/wizards/host-integrations/runcloud-instructions.php b/views/wizards/host-integrations/runcloud-instructions.php index 419d38c..b3b0dda 100644 --- a/views/wizards/host-integrations/runcloud-instructions.php +++ b/views/wizards/host-integrations/runcloud-instructions.php @@ -34,7 +34,7 @@

-

, . , .

+

, . , .

diff --git a/views/wizards/setup/requirements_table.php b/views/wizards/setup/requirements_table.php index a895397..7b32818 100644 --- a/views/wizards/setup/requirements_table.php +++ b/views/wizards/setup/requirements_table.php @@ -8,7 +8,7 @@
- +
@@ -87,7 +87,7 @@
- Read More links on each item to see what steps you need to take to bring your environment up to the WP Ultimo current requirements.', 'wp-ultimo'); ?> + Read More links on each item to see what steps you need to take to bring your environment up to the WP Multisite WaaS current requirements.', 'wp-ultimo'); ?>
diff --git a/wp-multisite-waas.php b/wp-multisite-waas.php index c636601..8adae28 100644 --- a/wp-multisite-waas.php +++ b/wp-multisite-waas.php @@ -14,17 +14,17 @@ * Requires at least: 5.3 * Requires PHP: 7.4.30 * - * WP Ultimo is distributed under the terms of the GNU General Public License as published by + * WP Multisite WaaS is distributed under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 2 of the License, or * any later version. * - * WP Ultimo is distributed in the hope that it will be useful, + * WP Multisite WaaS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with WP Ultimo. If not, see . + * along with WP Multisite WaaS. If not, see . * * @author Arindo Duque and NextPress * @category Core @@ -49,7 +49,7 @@ if ( function_exists('is_plugin_active') && is_plugin_active( 'wp-ultimo/wp-ulti 'admin_notices', function() { echo '

'; - echo esc_html__( 'The WP Ultimo plugin has been deactivated as it has been renamed WP Multisite WaaS', 'wp-ultimo' ); + echo esc_html__( 'The WP Multisite WaaS plugin has been deactivated as it has been renamed WP Multisite WaaS', 'wp-ultimo' ); echo '

'; } );