github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-17 05:41:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix attempt for #630.

Browse Source
This commit is contained in:
Antoine Nguyen
2014-11-03 17:02:43 +01:00
parent 8224c03ff0
commit 8d8ec7dcc9
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/extensions/amavis/views.py
+22 -8
View File
@@ -170,12 +170,19 @@ def delete(request, mail_id):
"""
mail_id = check_mail_id(request, mail_id)
connector = get_connector()
mb = Mailbox.objects.get(user=request.user) \
if request.user.group == 'SimpleUsers' else None
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
for mid in mail_id:
r, i = mid.split()
if mb is not None and r != mb.full_address \
and not r in mb.alias_addresses:
if valid_addresses is not None and r not in valid_addresses:
continue
connector.set_msgrcpt_status(r, i, 'D')
message = ungettext("%(count)d message deleted successfully",
@@ -222,12 +229,19 @@ def release(request, mail_id):
mail_id = check_mail_id(request, mail_id)
msgrcpts = []
connector = get_connector()
mb = Mailbox.objects.get(user=request.user) \
if request.user.group == 'SimpleUsers' else None
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
for mid in mail_id:
r, i = mid.split()
if mb is not None and r != mb.full_address \
and not r in mb.alias_addresses:
if valid_addresses is not None and r not in valid_addresses:
continue
msgrcpts += [connector.get_recipient_message(r, i)]
if mb is not None and parameters.get_admin("USER_CAN_RELEASE") == "no":