diff --git a/app/lib/classes/class.user.php b/app/lib/classes/class.user.php index 8c87faa..c68826a 100644 --- a/app/lib/classes/class.user.php +++ b/app/lib/classes/class.user.php @@ -144,11 +144,7 @@ class User if (is_array($handle) and getSetting('website_mode') == 'personal' and $id == getSetting('website_mode_personal_uid')) { $url = getSetting('website_mode_personal_routing') !== '/' ? getSetting('website_mode_personal_routing') : null; } - if (getSetting('user_subdomain_wildcard')) { - return get_base_url_wildcard(null, $username); - } else { - return G\get_base_url($url); - } + return G\get_base_url($url); } public static function getUrlAlbums($user_url) diff --git a/app/routes/route.user.php b/app/routes/route.user.php index 593e15b..f777097 100644 --- a/app/routes/route.user.php +++ b/app/routes/route.user.php @@ -349,11 +349,6 @@ $route = function ($handler) { "type" => $user_views['albums']['current'] ? "albums": "images" ]); } - - if (CHV\getSetting('user_subdomain_wildcard')) { - // TODO: Remove /username/ si aplica! // ?? - $handler::setVar('canonical', CHV\get_current_url_wildcard($user['username'])); - } } catch (Exception $e) { G\exception_to_error($e); } diff --git a/app/themes/Peafowl/views/dashboard.php b/app/themes/Peafowl/views/dashboard.php index 4c4af64..95b1339 100644 --- a/app/themes/Peafowl/views/dashboard.php +++ b/app/themes/Peafowl/views/dashboard.php @@ -2383,11 +2383,6 @@ function free_version_warning($wrap=true)

-
-

Subdomain wildcards

-

Both language and username subdomains are highly experimental features that require advanced server configurations. The alleged functionalities should be enabled only after setting up a subdomain wildcard pointing to your Chevereto installation. You also need to enable CORS for these subdomains. If you want to use HTTPS, you also need to bind the SSL certificate(s) for your subdomains.

-

Don't ask us how to make this work for your installation. These are experimental features, and we don't have any guidance on how to fulfill the server requirements listed above as we are still collecting feedback from pro users. We will publish instructions (if any) in the future.

-
@@ -2396,14 +2391,6 @@ function free_version_warning($wrap=true)
app/settings.php'); ?>
-
- -
-
_s('user profiles'), '%s' => G\str_replace_first(CHV_HTTP_HOST, 'username' . '.' . CHV_HTTP_HOST, CHV_ROOT_URL)]); ?>
-