beenull/simple-login
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

add "your domain" to user's owned domain

Browse source
This commit is contained in:
Son NK 2020-01-22 14:04:38 +01:00
parent 784c265cdf
commit 8e7f5e56d6
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/dashboard/templates/dashboard/custom_alias.html
View file

@ -36,13 +36,17 @@
{% if suffixes|length > 1 %} {% if suffixes|length > 1 %}
<select class="form-control" name="suffix"> <select class="form-control" name="suffix">
{% for suffix in suffixes %} {% for suffix in suffixes %}
<option value="{{ suffix }}"> <option value="{{ suffix[1] }}">
{{ suffix }} {% if suffix[0] %}
{{ suffix[1] }} (your domain)
{% else %}
{{ suffix[1] }}
{% endif %}
</option> </option>
{% endfor %} {% endfor %}
</select> </select>
{% else %} {% else %}
<span>{{ suffixes[0] }}</span> <span>{{ suffixes[0][1] }}</span>
{% endif %} {% endif %}
</div> </div>
</div> </div>

5
app/dashboard/views/custom_alias.py
View file

@ -25,16 +25,17 @@ def custom_alias():
return redirect(url_for("dashboard.index")) return redirect(url_for("dashboard.index"))
user_custom_domains = [cd.domain for cd in current_user.verified_custom_domains()] user_custom_domains = [cd.domain for cd in current_user.verified_custom_domains()]
# List of (is_custom_domain, alias-suffix)
suffixes = [] suffixes = []
# put custom domain first # put custom domain first
for alias_domain in user_custom_domains: for alias_domain in user_custom_domains:
suffixes.append("@" + alias_domain) suffixes.append((True, "@" + alias_domain))
# then default domain # then default domain
for domain in ALIAS_DOMAINS: for domain in ALIAS_DOMAINS:
suffixes.append( suffixes.append(
("" if DISABLE_ALIAS_SUFFIX else "." + random_word()) + "@" + domain (False, ("" if DISABLE_ALIAS_SUFFIX else "." + random_word()) + "@" + domain)
) )
if request.method == "POST": if request.method == "POST":