Merge pull request #603 from ODM2/password-reset

Tweaks to default email sender

src/WebSDL/settings/base.py

@@ -163,14 +163,15 @@
 RECAPTCHA_USER_KEY = data["recaptcha_user_key"] if "recaptcha_user_key" in data else ""
 RECAPTCHA_VERIFY_URL = "https://www.google.com/recaptcha/api/siteverify"
 
-EMAIL_SENDER = data['password_email_sender'] if 'password_email_sender' in data else '',
+EMAIL_SENDER = data['email_from'] if 'email_from' in data else '',
 NOTIFY_EMAIL = data['notify_email_sender'] if 'notify_email_sender' in data else ''
 DEFAULT_FROM_EMAIL = EMAIL_SENDER[0] if isinstance(EMAIL_SENDER, tuple) else EMAIL_SENDER
 NOTIFY_EMAIL_SENDER = NOTIFY_EMAIL[0] if isinstance(NOTIFY_EMAIL, tuple) else NOTIFY_EMAIL
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 EMAIL_SERVER = data['email_host'] if 'email_host' in data else '',
 EMAIL_HOST = EMAIL_SERVER[0] if isinstance(EMAIL_SERVER, tuple) else EMAIL_SERVER
-EMAIL_HOST_USER = data['email_user'] if 'email_user' in data else ''
+EMAIL_PORT = data['email_port']
+EMAIL_HOST_USER = data['email_username'] if 'email_username' in data else ''
 EMAIL_HOST_PASSWORD = data['email_password'] if 'email_password' in data else ''
 EMAIL_USE_TLS = True