self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2025-06-02 23:17:26 +02:00
Code Issues Releases Activity

expand user and alias params

Browse Source
This commit is contained in:
Dmytro Makovey 2017-09-27 21:29:42 -07:00
parent 06d7828e06
commit c9f124c9b9
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
admin/manage.py
View File

@ -114,15 +114,24 @@ def config_update(verbose=False, delete_objects=False):
users=new_config.get('users',[]) users=new_config.get('users',[])
tracked_users=set() tracked_users=set()
user_optional_params=('comment','quota_bytes','global_admin',
'enable_imap','enable_pop','forward_enabled','forward_destination',
'reply_enabled','reply_subject','reply_body','displayed_name','spam_enabled',
'email','spam_threshold')
for user_config in users: for user_config in users:
if verbose: if verbose:
print(str(user_config)) print(str(user_config))
localpart=user_config['localpart'] localpart=user_config['localpart']
domain_name=user_config['domain'] domain_name=user_config['domain']
global_admin=user_config.get('global_admin',False)
password_hash=user_config.get('password_hash',None) password_hash=user_config.get('password_hash',None)
hash_scheme=user_config.get('hash_scheme',None) hash_scheme=user_config.get('hash_scheme',None)
domain = models.Domain.query.get(domain_name) domain = models.Domain.query.get(domain_name)
email='{0}@{1}'.format(localpart,domain_name) email='{0}@{1}'.format(localpart,domain_name)
optional_params={}
for k in user_optional_params:
if user_config.has_key(k):
optional_params[k]=user_config[k]
if not domain: if not domain:
domain = models.Domain(name=domain_name) domain = models.Domain(name=domain_name)
db.session.add(domain) db.session.add(domain)
@ -133,7 +142,7 @@ def config_update(verbose=False, delete_objects=False):
user = models.User( user = models.User(
localpart=localpart, localpart=localpart,
domain=domain, domain=domain,
global_admin=False **optional_params
) )
user.set_password(password_hash, hash_scheme=hash_scheme, raw=True) user.set_password(password_hash, hash_scheme=hash_scheme, raw=True)
db.session.add(user) db.session.add(user)
@ -146,6 +155,11 @@ def config_update(verbose=False, delete_objects=False):
localpart=alias_config['localpart'] localpart=alias_config['localpart']
domain_name=alias_config['domain'] domain_name=alias_config['domain']
destination=alias_config['destination'] destination=alias_config['destination']
if type(alias_config['destination']) == str:
destination = alias_config['destination'].split(',')
else:
destination = alias_config['destination']
wildcard=alias_config.get('wildcard',False)
domain = models.Domain.query.get(domain_name) domain = models.Domain.query.get(domain_name)
email='{0}@{1}'.format(localpart,domain_name) email='{0}@{1}'.format(localpart,domain_name)
if not domain: if not domain:
@ -158,14 +172,13 @@ def config_update(verbose=False, delete_objects=False):
alias = models.Alias( alias = models.Alias(
localpart=localpart, localpart=localpart,
domain=domain, domain=domain,
# destination=destination.split(','), wildcard=wildcard,
destination=destination,
email=email email=email
) )
else: else:
if type(destination) == str: alias.destination = destination
alias.destination = destination.split(',') alias.wildcard=wildcard
else:
alias.destination = destination
db.session.add(alias) db.session.add(alias)
db.session.commit() db.session.commit()