From 87e5dd2ca17af098de2811182ae16bd04606d0f6 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Mon, 3 Nov 2014 17:04:58 +0100
Subject: [PATCH] Better fix.

see #630
---
 modoboa/extensions/amavis/views.py | 37 ++++++++++++++----------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/modoboa/extensions/amavis/views.py b/modoboa/extensions/amavis/views.py
index da24aacf0..c92cb8b7b 100644
--- a/modoboa/extensions/amavis/views.py
+++ b/modoboa/extensions/amavis/views.py
@@ -151,6 +151,21 @@ def check_mail_id(request, mail_id):
     return mail_id
 
 
+def get_user_valid_addresses(user):
+    """Retrieve all valid addresses of a user."""
+    if request.user.group == 'SimpleUsers':
+        valid_addresses = request.user.email
+        try:
+            mb = Mailbox.objects.get(user=request.user)
+        except Mailbox.DoesNotExist:
+            pass
+        else:
+            valid_addresses += mb.alias_addresses
+    else:
+        valid_addresses = None
+    return valid_addresses
+
+
 def delete_selfservice(request, mail_id):
     rcpt = request.GET.get("rcpt", None)
     if rcpt is None:
@@ -170,16 +185,7 @@ def delete(request, mail_id):
     """
     mail_id = check_mail_id(request, mail_id)
     connector = get_connector()
-    if request.user.group == 'SimpleUsers':
-        valid_addresses = request.user.email
-        try:
-            mb = Mailbox.objects.get(user=request.user)
-        except Mailbox.DoesNotExist:
-            pass
-        else:
-            valid_addresses += mb.alias_addresses
-    else:
-        valid_addresses = None
+    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:
@@ -229,16 +235,7 @@ def release(request, mail_id):
     mail_id = check_mail_id(request, mail_id)
     msgrcpts = []
     connector = get_connector()
-    if request.user.group == 'SimpleUsers':
-        valid_addresses = request.user.email
-        try:
-            mb = Mailbox.objects.get(user=request.user)
-        except Mailbox.DoesNotExist:
-            pass
-        else:
-            valid_addresses += mb.alias_addresses
-    else:
-        valid_addresses = None
+    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: