github
/
chevereto-free
mirror of https://github.com/rodber/chevereto-free
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

close #116

1.5
Rodolfo Berrios 2021-10-19 11:05:12 -03:00
parent d689f7aa58
commit d50b942f58
No known key found for this signature in database
GPG Key ID: D3AAC2481DBDD9FE
3 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/lib/classes/class.user.php
View File

@ -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)

5
app/routes/route.user.php
View File

@ -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);
}

13
app/themes/Peafowl/views/dashboard.php
View File

@ -2383,11 +2383,6 @@ function free_version_warning($wrap=true)
<div class="input-below"><?php _se('Routing for %s', G\get_base_url('album/&lt;id&gt;')); ?></div>
</div>
<hr class="line-separator">
<div class="c24 phablet-c1 highlight text-content padding-10 margin-bottom-0">
<h3 class="margin-top-10 margin-bottom-10 font-weight-bold">Subdomain wildcards</h3>
<p>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.</p>
<p><b>Don't ask us how to make this work for your installation.</b> 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.</p>
</div>
<div class="input-label">
<label for="hostname"><?php _se('Hostname'); ?></label>
<div class="c9 phablet-c1">
@ -2396,14 +2391,6 @@ function free_version_warning($wrap=true)
<div class="input-below input-warning red-warning"><?php echo get_input_errors()['hostname']; ?></div>
<div class="input-below"><?php _se('Hostname on which sub-domain wildcards will be added.'); ?> <?php _se('This setting may be overridden by %s.', '<code>app/settings.php</code>'); ?></div>
</div>
<div class="input-label">
<label for="user_subdomain_wildcard"><?php _se('Username subdomains'); ?></label>
<div class="c5 phablet-c1"><select type="text" name="user_subdomain_wildcard" id="user_subdomain_wildcard" class="text-input">
<?php
echo CHV\Render\get_select_options_html([1 => _s('Enabled'), 0 => _s('Disabled')], CHV\Settings::get('user_subdomain_wildcard')); ?>
</select></div>
<div class="input-below"><?php _se('Enable to use %s for %t.', ['%t' => _s('user profiles'), '%s' => G\str_replace_first(CHV_HTTP_HOST, 'username' . '.' . CHV_HTTP_HOST, CHV_ROOT_URL)]); ?></div>
</div>
<?php
} ?>