|
@@ -228,12 +228,11 @@ def log_hash(name):
|
|
|
# True add the 'Reply-to: ' header to the email
|
|
|
def log_mail(kind, user_name, date, tags, log):
|
|
|
if REPLY_TO:
|
|
|
- subprocess.run("printf " + shlex.quote(log) + " | mail -s \"Log" + kind + " " + date + " " + tags +
|
|
|
- "\" -r " + user + FROM_DOMAIN + " -a \"Reply-to:" + TO_ADDRESS + " \" -- "
|
|
|
- + TO_ADDRESS, shell=True)
|
|
|
+ subprocess.run('printf "%s\n" ' + f'{shlex.quote(log)} | mail -s "Log{kind} {date} {tags}" ' +
|
|
|
+ f'-r {user}@{FROM_DOMAIN} -a "Reply-to: {TO_ADDRESS}" -- {TO_ADDRESS}', shell=True)
|
|
|
else:
|
|
|
- subprocess.run("printf \"%s\n\" " + shlex.quote(log) + " | mail -s \"Log" | kind + " " + date + " " + tags +
|
|
|
- "\" -r " + user + FROM_DOMAIN + " -- " + TO_ADDRESS, shell=True)
|
|
|
+ subprocess.run('printf "%s\n" ' + f'{shlex.quote(log)} | mail -s "Log{kind} {date} {tags}" ' +
|
|
|
+ f'-r {user}@{FROM_DOMAIN} -- {TO_ADDRESS}', shell=True)
|
|
|
return
|
|
|
|
|
|
|