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

Fixed notifications.

Browse Source 
see #1132
This commit is contained in:
Antoine Nguyen
2017-06-16 09:20:36 +02:00
parent bb6bc4d987
commit b06a2a6b77
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/admin/management/commands/subcommands/_mx.py
+16 -15
View File
@@ -147,25 +147,26 @@ class CheckMXRecords(BaseCommand):
models.DNSBLResult.objects.bulk_create(to_create)
if not alerts:
return
emails = options["email"]
emails = list(options["email"])
if not options["skip_admin_emails"]:
emails.extend(
domain.admins.exclude(email="").values_list("email", flat=True)
)
if not len(emails):
return
content = render_to_string(
"admin/notifications/domain_in_dnsbl.html", {
"domain": domain, "alerts": alerts
})
subject = _("[modoboa] DNSBL issue(s) for domain {}").format(
domain.name)
for email in emails:
status, msg = email_utils.sendmail_simple(
self.sender, email,
subject=subject, content=content)
if not status:
print(msg)
for domain, providers in list(alerts.items()):
content = render_to_string(
"admin/notifications/domain_in_dnsbl.html", {
"domain": domain, "alerts": providers
})
subject = _("[modoboa] DNSBL issue(s) for domain {}").format(
domain.name)
for email in emails:
status, msg = email_utils.sendmail_simple(
self.sender, email,
subject=subject, content=content.strip())
if not status:
print(msg)
def check_valid_mx(self, domain, mx_list, **options):
"""Check that domain's MX record exist.
@@ -195,7 +196,7 @@ class CheckMXRecords(BaseCommand):
)
if not alerts:
return
emails = options["email"]
emails = list(options["email"])
if not options["skip_admin_emails"]:
emails.extend(
domain.admins.exclude(email="").values_list("email", flat=True)
@@ -211,7 +212,7 @@ class CheckMXRecords(BaseCommand):
for email in emails:
status, msg = email_utils.sendmail_simple(
self.sender, email,
subject=subject, content=content)
subject=subject, content=content.strip())
if not status:
print(msg)