From 5cebef64ed9f3c164db964828a62c7e0a3bde290 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Wed, 3 May 2017 16:08:43 +0530
Subject: Rename email_verification.py to send_emails.py

---
 yaksh/email_verification.py | 68 ---------------------------------------------
 yaksh/send_emails.py        | 58 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 68 deletions(-)
 delete mode 100644 yaksh/email_verification.py
 create mode 100644 yaksh/send_emails.py

(limited to 'yaksh')

diff --git a/yaksh/email_verification.py b/yaksh/email_verification.py
deleted file mode 100644
index 721fa61..0000000
--- a/yaksh/email_verification.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# Local imports
-try:
-    from string import letters
-except ImportError:
-    from string import ascii_letters as letters
-from string import digits, punctuation
-import hashlib
-from random import randint
-from textwrap import dedent
-import smtplib
-
-# Django imports
-from django.utils.crypto import get_random_string
-from django.conf import settings
-
-def generate_activation_key(username):
-    """ Generate hashed secret key for email activation """
-    chars = letters + digits + punctuation
-    secret_key = get_random_string(randint(10, 40), chars)
-    return hashlib.sha256((secret_key + username).encode('utf-8')).hexdigest()
-
-def send_user_mail(user_mail, key):
-    """ Send mail to user whose email is to be verified
-        This function should get two args i.e user_email and secret_key.
-        The activation url is generated from settings.PRODUCTION_URL and key.
-    """
-    try:
-        to = user_mail
-        subject = 'Yaksh Email Verification'
-        message = dedent("""\
-                To activate your account and verify your email address,
-                please click the following link:
-                {0}/exam/activate/{1}
-                If clicking the link above does not work,
-                copy and paste the URL in a new browser window instead.
-                For any issue, please write us on {2}
-
-                Regards
-                Yaksh Team
-            """.format(settings.PRODUCTION_URL, key, settings.REPLY_EMAIL)
-            )
-
-        user = settings.EMAIL_HOST_USER
-        pwd = settings.EMAIL_HOST_PASSWORD
-        smtpserver = smtplib.SMTP(settings.EMAIL_HOST, settings.EMAIL_PORT)
-        smtpserver.ehlo()
-        smtpserver.starttls()
-        smtpserver.ehlo()
-        smtpserver.esmtp_features['auth']='LOGIN DIGEST-MD5 PLAIN'
-
-        smtpserver.login(user, pwd)
-        header = 'To:{0}\nFrom:{1}\nSubject:{2}\n'.format(to,
-                    settings.SENDER_EMAIL, subject)
-        message = '{0}\n{1}\n\n'.format(header, message)
-        smtpserver.sendmail(user, to, message)
-        smtpserver.close()
-
-        msg = "An activation link is sent to your registered email.\
-                        Please activate the link within 20 minutes."
-        success = True
-
-    except Exception as exc_msg:
-        msg = """Error: {0}. Please check your email address.\
-                If email address is correct then
-                Please contact {1}.""".format(exc_msg, settings.REPLY_EMAIL)
-        success = False
-
-    return success, msg
diff --git a/yaksh/send_emails.py b/yaksh/send_emails.py
new file mode 100644
index 0000000..37736d5
--- /dev/null
+++ b/yaksh/send_emails.py
@@ -0,0 +1,58 @@
+# Local imports
+try:
+    from string import letters
+except ImportError:
+    from string import ascii_letters as letters
+from string import digits, punctuation
+import hashlib
+from random import randint
+from textwrap import dedent
+import smtplib
+
+# Django imports
+from django.utils.crypto import get_random_string
+from django.conf import settings
+from django.core.mail import send_mass_mail, send_mail
+
+
+def generate_activation_key(username):
+    """ Generate hashed secret key for email activation """
+    chars = letters + digits + punctuation
+    secret_key = get_random_string(randint(10, 40), chars)
+    return hashlib.sha256((secret_key + username).encode('utf-8')).hexdigest()
+
+
+def send_user_mail(user_mail, key):
+    """ Send mail to user whose email is to be verified
+        This function should get two args i.e user_email and secret_key.
+        The activation url is generated from settings.PRODUCTION_URL and key.
+    """
+    try:
+        to = user_mail
+        subject = 'Yaksh Email Verification'
+        message = dedent("""\
+                To activate your account and verify your email address,
+                please click the following link:
+                {0}/exam/activate/{1}
+                If clicking the link above does not work,
+                copy and paste the URL in a new browser window instead.
+                For any issue, please write us on {2}
+
+                Regards
+                Yaksh Team
+            """.format(settings.PRODUCTION_URL, key, settings.REPLY_EMAIL)
+            )
+
+        send_mail(subject, message, settings.SENDER_EMAIL, [to])
+
+        msg = "An activation link is sent to your registered email.\
+                        Please activate the link within 20 minutes."
+        success = True
+
+    except Exception as exc_msg:
+        msg = """Error: {0}. Please check your email address.\
+                If email address is correct then
+                Please contact {1}.""".format(exc_msg, settings.REPLY_EMAIL)
+        success = False
+
+    return success, msg
-- 
cgit