1
0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2024-11-25 02:47:04 +00:00

email_administrator.py: fix report formatting (#2249)

This commit is contained in:
Peter Tóth 2023-05-13 12:40:31 +02:00 committed by GitHub
parent c9584148a0
commit 963fb9f2e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -29,7 +29,7 @@ content = sys.stdin.read().strip()
# If there's nothing coming in, just exit. # If there's nothing coming in, just exit.
if content == "": if content == "":
sys.exit(0) sys.exit(0)
# create MIME message # create MIME message
msg = MIMEMultipart('alternative') msg = MIMEMultipart('alternative')
@ -41,7 +41,7 @@ msg['From'] = "\"%s\" <%s>" % (env['PRIMARY_HOSTNAME'], admin_addr)
msg['To'] = admin_addr msg['To'] = admin_addr
msg['Subject'] = "[%s] %s" % (env['PRIMARY_HOSTNAME'], subject) msg['Subject'] = "[%s] %s" % (env['PRIMARY_HOSTNAME'], subject)
content_html = "<html><body><pre>{}</pre></body></html>".format(html.escape(content)) content_html = '<html><body><pre style="overflow-x: scroll; white-space: pre;">{}</pre></body></html>'.format(html.escape(content))
msg.attach(MIMEText(content, 'plain')) msg.attach(MIMEText(content, 'plain'))
msg.attach(MIMEText(content_html, 'html')) msg.attach(MIMEText(content_html, 'html'))