From 53e74e69eee3e55e738aaca0cc6c11ee251bf253 Mon Sep 17 00:00:00 2001 From: LV-426 Date: Tue, 27 Jan 2015 20:47:59 +0200 Subject: rz_mail#send_message(): rename, arg reordering, default attachments value --- src/server/rz_feedback.py | 14 +++++++------- src/server/rz_mail.py | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/server') diff --git a/src/server/rz_feedback.py b/src/server/rz_feedback.py index ea12d0ef..13a1fa91 100644 --- a/src/server/rz_feedback.py +++ b/src/server/rz_feedback.py @@ -5,7 +5,7 @@ from flask import request from flask import session import logging -from rz_mail import send_message +from rz_mail import send_email_message from rz_req_handling import make_json_response @@ -67,12 +67,12 @@ def send_user_feedback__email(): msg_body = '\n'.join(msg_body) try: - send_message(recipients=[current_app.rz_config.feedback_recipient], - subject="User Feedback", - body=msg_body, - attachments=[('feedback_screenshot.png', 'image/png', u_feedback.img), - ('feedback_page.html', 'text/html', u_feedback.html), - ]) + send_email_message(recipients=[current_app.rz_config.feedback_recipient], + subject="User Feedback", + body=msg_body, + attachments=[('feedback_screenshot.png', 'image/png', u_feedback.img), + ('feedback_page.html', 'text/html', u_feedback.html), + ]) return json.dumps({}) # expects json encoded, contents discarded except Exception: diff --git a/src/server/rz_mail.py b/src/server/rz_mail.py index 3eadad20..a13892c6 100644 --- a/src/server/rz_mail.py +++ b/src/server/rz_mail.py @@ -11,7 +11,7 @@ import smtplib log = logging.getLogger('rhizi') -def send_message(recipients, subject, attachments, body): +def send_email_message(recipients, subject, body, attachments=[]): send_from = current_app.rz_config.mail_default_sender smtp_hostname = current_app.rz_config.mail_hostname -- cgit v1.3.1