From b55e16009df3341f521d695a090c6e9ac2aa9957 Mon Sep 17 00:00:00 2001
From: Oliver Marks <oly@digitaloctave.com>
Date: Sun, 5 Feb 2017 17:04:08 +0000
Subject: [PATCH] Email should now send on stage

---
 config/settings/stage.py    | 12 ++++++------
 mhackspace/contact/views.py |  5 +++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/config/settings/stage.py b/config/settings/stage.py
index 5d99ab0..d170a0e 100644
--- a/config/settings/stage.py
+++ b/config/settings/stage.py
@@ -108,17 +108,17 @@ COMPRESS_ENABLED = env.bool('COMPRESS_ENABLED', default=True)
 # EMAIL
 # ------------------------------------------------------------------------------
 DEFAULT_FROM_EMAIL = env('DJANGO_DEFAULT_FROM_EMAIL',
-                         default='Maidstone Hackspace <noreply@test.maidstone-hackspace.org.uk>')
+                         default='Maidstone Hackspace <no-reply@test.maidstone-hackspace.org.uk>')
 EMAIL_SUBJECT_PREFIX = env('DJANGO_EMAIL_SUBJECT_PREFIX', default='[Maidstone Hackspace] ')
 SERVER_EMAIL = env('DJANGO_SERVER_EMAIL', default=DEFAULT_FROM_EMAIL)
-SERVER_EMAIL_PORT = '465'
+SERVER_EMAIL_PORT = '587'
 
-EMAIL_USE_TLS = False
+EMAIL_USE_TLS = True
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 EMAIL_HOST = 'smtp.gmail.com'
 EMAIL_HOST_PASSWORD = env('EMAIL_PASSWORD')
 EMAIL_HOST_USER = env('EMAIL_USER')
-EMAIL_PORT = 465
+EMAIL_PORT = 587
 
 # Anymail with Mailgun
 #INSTALLED_APPS += ("anymail", )
@@ -193,12 +193,12 @@ LOGGING = {
         'console': {
             'level': 'DEBUG',
             'class': 'logging.StreamHandler',
-            'formatter': 'verbose',
+            'formatter': 'verbose',00 
         },
         'logfile': {
             'level':'DEBUG',
             'class':'logging.FileHandler',
-            'filename': BASE_DIR + "/../logfile",
+            'filename': ROOT_DIR.path("django.log"),
         },
     },
     'loggers': {
diff --git a/mhackspace/contact/views.py b/mhackspace/contact/views.py
index 8924b3b..1a3ce03 100644
--- a/mhackspace/contact/views.py
+++ b/mhackspace/contact/views.py
@@ -6,7 +6,6 @@ from mhackspace.contact.forms import ContactForm
 # add to your views
 def contact(request):
     form_class = ContactForm
-    form = form_class(data=request.POST)
     if request.method == 'POST':
         form = form_class(data=request.POST)
         if form.is_valid():
@@ -14,9 +13,11 @@ def contact(request):
             email = EmailMessage(
                 '[%s] - %s' % (data['enquiry_type'], data['subject']),
                 data['message'],
-                to=['no-reply@maidstone-hackspace..org.uk'])
+                to=['contact@maidstone-hackspace.org.uk'])
             email.send()
             messages.add_message(request, messages.INFO, 'E-Mail sent')
+    else:
+        form = form_class()
 
 
     return render(request, 'pages/contact.html', {