Merge pull request #63 from jabbate19/mail-server-name

Allow Mail to Use Any Server Name in Email

Author: galenguyer

quotefault/mail.py

@@ -21,8 +21,8 @@ def send_report_email(reporter, quote):
                 sender=app.config.get('MAIL_USERNAME'),
                 recipients=recipients)
     template = 'mail/report'
-    msg.body = render_template(template + '.txt', reporter = reporter, quote = quote )
-    msg.html = render_template(template + '.html', reporter = reporter, quote = quote )
+    msg.body = render_template(template + '.txt', reporter = reporter, quote = quote, server = app.config['SERVER_NAME'])
+    msg.html = render_template(template + '.html', reporter = reporter, quote = quote, server = app.config['SERVER_NAME'])
     mail_client.send(msg)
 
 def send_email(toaddr, subject, body):

quotefault/templates/mail/report.html

@@ -7,7 +7,7 @@ <h3>There is a new report on QuoteFault</h3>
         <p>Report submitted by: {{reporter}}</p>
         <p>Quote being reported: {{quote.quote}} -{{quote.speaker}}</p>
         <p>Quote submitted by: {{quote.submitter}}</p>
-        <p>Please attend to this on the <a href="https://quotefault.csh.rit.edu/admin">QuoteFault Admin Page</a>!</p>
+        <p>Please attend to this on the <a href="https://{{server}}/admin">QuoteFault Admin Page</a>!</p>
     </div>
 {% endblock %}
 

quotefault/templates/mail/report.txt

@@ -3,5 +3,5 @@ Hello EBoard/RTP
     Report submitted by: {{reporter}}
     Quote being reported: {{quote.quote}} -{{quote.speaker}}
     Quote submitted by: {{quote.submitter}}
-    Please attend to this on https://quotefault.csh.rit.edu/admin
+    Please attend to this on https://{{server}}/admin