Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
ec9a2e875b
|
|||
|
7a31c01955
|
@@ -118,7 +118,10 @@ def list_quarantine_emails(config, args):
|
||||
metadata["date"]))
|
||||
row["mailfrom"] = metadata["mailfrom"]
|
||||
row["recipient"] = metadata["recipients"].pop(0)
|
||||
if "subject" in emails[quarantine_id]["headers"].keys():
|
||||
row["subject"] = emails[quarantine_id]["headers"]["subject"][:60]
|
||||
else
|
||||
row["subject"] = ""
|
||||
rows.append(row)
|
||||
|
||||
if metadata["recipients"]:
|
||||
|
||||
@@ -353,7 +353,12 @@ class EMailNotification(BaseNotification):
|
||||
"{}: generating notification email for '{}'".format(
|
||||
queueid, recipient))
|
||||
self.logger.debug("{}: parsing email template".format(queueid))
|
||||
|
||||
if "from" not in headers.keys():
|
||||
headers["from"] = ""
|
||||
if "to" not in headers.keys():
|
||||
headers["to"] = ""
|
||||
if "subject" not in headers.keys():
|
||||
headers["subject"] = ""
|
||||
# generate dict containing all template variables
|
||||
variables = defaultdict(str,
|
||||
EMAIL_HTML_TEXT=sanitized_text,
|
||||
|
||||
@@ -1 +1 @@
|
||||
__version__ = "0.0.5"
|
||||
__version__ = "0.0.6"
|
||||
|
||||
Reference in New Issue
Block a user