external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2024-11-22 02:17:26 +00:00
Code Issues Releases Wiki Activity

Merge pull request #418 from dhpiggott/aliases-template-tweak

Browse Source 
Use lowercase h for consistency in aliases template - it reads better…
This commit is contained in:
Joshua Tauberer 2015-05-28 08:56:44 -04:00
commit b5269bb28e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
management/mailconfig.py
View File

@ -135,7 +135,7 @@ def get_mail_users_ex(env, with_archived=False, with_slow_info=False):
mbox = os.path.join(root, domain, user) mbox = os.path.join(root, domain, user)
if email in active_accounts: continue if email in active_accounts: continue
user = { user = {
"email": email, "email": email,
"privileges": "", "privileges": "",
"status": "inactive", "status": "inactive",
"mailbox": mbox, "mailbox": mbox,
@ -313,7 +313,7 @@ def add_mail_user(email, pw, privs, env):
def set_mail_password(email, pw, env): def set_mail_password(email, pw, env):
# validate that password is acceptable # validate that password is acceptable
validate_password(pw) validate_password(pw)
# hash the password # hash the password
pw = hash_password(pw) pw = hash_password(pw)
@ -416,7 +416,7 @@ def add_mail_alias(source, destination, env, update_if_exists=False, do_kick=Tru
# validate destination # validate destination
dests = [] dests = []
destination = destination.strip() destination = destination.strip()
# Postfix allows a single @domain.tld as the destination, which means # Postfix allows a single @domain.tld as the destination, which means
# the local part on the address is preserved in the rewrite. We must # the local part on the address is preserved in the rewrite. We must
# try to convert Unicode to IDNA first before validating that it's a # try to convert Unicode to IDNA first before validating that it's a
@ -511,7 +511,7 @@ def get_required_aliases(env):
def kick(env, mail_result=None): def kick(env, mail_result=None):
results = [] results = []
# Inclde the current operation's result in output. # Include the current operation's result in output.
if mail_result is not None: if mail_result is not None:
results.append(mail_result + "\n") results.append(mail_result + "\n")

2
management/templates/aliases.html
View File

@ -57,7 +57,7 @@
</tbody> </tbody>
</table> </table>
<p style="margin-top: 1.5em"><small>Hostmaster@, postmaster@, and admin@ email addresses are required on some domains.</small></p> <p style="margin-top: 1.5em"><small>hostmaster@, postmaster@, and admin@ email addresses are required on some domains.</small></p>
<div style="display: none"> <div style="display: none">
<table> <table>