YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[mod] normalize input to lighten after code

Browse source
This commit is contained in:
Laurent Peuch 2016-11-16 20:51:49 +01:00
parent 0c1a072e8a
commit 61d694791c
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/yunohost/alias.py
View file

@ -91,6 +91,13 @@ def alias_update(auth, alias, add_mailforward=None, remove_mailforward=None):
""" """
_ensure_ldap_ou_is_created(auth) _ensure_ldap_ou_is_created(auth)
# normalize input
if not isinstance(add_mailforward, list):
add_mailforward = [add_mailforward]
if not isinstance(add_mailforward, list):
add_mailforward = [add_mailforward]
alias_attrs = [ alias_attrs = [
'mail', 'maildrop' 'mail', 'maildrop'
] ]
@ -110,15 +117,11 @@ def alias_update(auth, alias, add_mailforward=None, remove_mailforward=None):
# Get modifications from arguments # Get modifications from arguments
if add_mailforward: if add_mailforward:
if not isinstance(add_mailforward, list):
add_mailforward = [add_mailforward]
for mail in add_mailforward: for mail in add_mailforward:
if mail not in current_alias_info['maildrop']: if mail not in current_alias_info['maildrop']:
current_alias_info['maildrop'].append(mail) current_alias_info['maildrop'].append(mail)
if remove_mailforward: if remove_mailforward:
if not isinstance(add_mailforward, list):
add_mailforward = [add_mailforward]
for mail in remove_mailforward: for mail in remove_mailforward:
if mail in current_alias_info['maildrop'][1:]: if mail in current_alias_info['maildrop'][1:]:
current_alias_info['maildrop'].remove(mail) current_alias_info['maildrop'].remove(mail)