From 5fd03242ad2cdbf017ff11e80489c847aed822b7 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 20 Jan 2015 14:43:26 +0100 Subject: [PATCH 1/2] Make sure to always return a list. fix #675 --- modoboa/extensions/amavis/views.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modoboa/extensions/amavis/views.py b/modoboa/extensions/amavis/views.py index 7a69b6528..ed48ab722 100644 --- a/modoboa/extensions/amavis/views.py +++ b/modoboa/extensions/amavis/views.py @@ -205,8 +205,9 @@ def check_mail_id(request, mail_id): def get_user_valid_addresses(user): """Retrieve all valid addresses of a user.""" + valid_addresses = [] if user.group == 'SimpleUsers': - valid_addresses = user.email + valid_addresses.append(user.email) try: mb = Mailbox.objects.get(user=user) except Mailbox.DoesNotExist: @@ -240,7 +241,7 @@ def delete(request, mail_id): valid_addresses = get_user_valid_addresses(request.user) for mid in mail_id: r, i = mid.split() - if valid_addresses is not None and r not in valid_addresses: + if valid_addresses and r not in valid_addresses: continue connector.set_msgrcpt_status(r, i, 'D') message = ungettext("%(count)d message deleted successfully", @@ -290,7 +291,7 @@ def release(request, mail_id): valid_addresses = get_user_valid_addresses(request.user) for mid in mail_id: r, i = mid.split() - if valid_addresses is not None and r not in valid_addresses: + if valid_addresses and r not in valid_addresses: continue msgrcpts += [connector.get_recipient_message(r, i)] if request.user.group == "SimpleUsers" and \ From 6ec51d271a4ce63a4825a913e2c11d244371df98 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 20 Jan 2015 14:46:52 +0100 Subject: [PATCH 2/2] End of previous commit. fix #675 --- modoboa/extensions/amavis/views.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/modoboa/extensions/amavis/views.py b/modoboa/extensions/amavis/views.py index ed48ab722..8a05008a9 100644 --- a/modoboa/extensions/amavis/views.py +++ b/modoboa/extensions/amavis/views.py @@ -214,8 +214,6 @@ def get_user_valid_addresses(user): pass else: valid_addresses += mb.alias_addresses - else: - valid_addresses = None return valid_addresses