external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-20 18:27:23 +01:00
Code Issues Releases Wiki Activity

Add support for a default quota value and allow setting quota when adding user

Browse Source
This commit is contained in:
John Supplee
2019-01-31 22:57:04 +02:00
parent 6de34b0464
commit d1906bd055
3 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
management/mailconfig.py
View File

@@ -298,7 +298,7 @@ def get_mail_domains(env, filter_aliases=lambda alias : True):
+ [get_domain(address, as_unicode=False) for address, *_ in get_mail_aliases(env) if filter_aliases(address) ]
)
def add_mail_user(email, pw, privs, env):
def add_mail_user(email, pw, privs, quota, env):
# validate email
if email.strip() == "":
return ("No email address provided.", 400)
@@ -324,6 +324,11 @@ def add_mail_user(email, pw, privs, env):
validation = validate_privilege(p)
if validation: return validation
try:
quota = validate_quota(quota)
except ValueError as e:
return (str(e), 400)
# get the database
conn, c = open_database(env, with_connection=True)
@@ -332,8 +337,8 @@ def add_mail_user(email, pw, privs, env):
# add the user to the database
try:
c.execute("INSERT INTO users (email, password, privileges) VALUES (?, ?, ?)",
(email, pw, "\n".join(privs)))
c.execute("INSERT INTO users (email, password, privileges, quota) VALUES (?, ?, ?, ?)",
(email, pw, "\n".join(privs)), quota)
except sqlite3.IntegrityError:
return ("User already exists.", 400)
@@ -376,6 +381,10 @@ def set_mail_quota(email, quota, env):
conn.commit()
return "OK"
def get_default_quota(env):
config = utils.load_settings(env)
return config.get("default-quota", '0')
def validate_quota(quota):
# validate quota
quota = quota.strip().upper()