From 7468b9bf96d68e6c43caeb262bcbced9e70cbe1b Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Thu, 4 Jun 2020 21:41:59 +0500
Subject: [PATCH] bug fix: email verification

---
 emailMarketing/emailMarketing.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/emailMarketing/emailMarketing.py b/emailMarketing/emailMarketing.py
index 7d0a88548..3a0578712 100755
--- a/emailMarketing/emailMarketing.py
+++ b/emailMarketing/emailMarketing.py
@@ -191,23 +191,24 @@ class emailMarketing(multi.Thread):
             for items in allEmails:
                 message = MIMEMultipart('alternative')
                 message['Subject'] = emailMessage.subject
-                message['From'] = emailMessage.fromName + ' ' + emailMessage.fromEmail
+                message['From'] = emailMessage.fromEmail
                 message['reply-to'] = emailMessage.replyTo
                 if (items.verificationStatus == 'Verified' or self.extraArgs['verificationCheck']) and not items.verificationStatus == 'REMOVED':
                     try:
 
                         removalLink = "https:\/\/" + ipAddress + ":8090\/emailMarketing\/remove\/" + self.extraArgs[
                             'listName'] + "\/" + items.email
-                        messageText = str(emailMessage.emailMessage)
+                        messageText = emailMessage.emailMessage.encode('utf-8', 'replace')
                         message['To'] = items.email
 
-                        if re.search('<html', messageText, re.IGNORECASE) and re.search('<body', messageText,
+                        if re.search(b'<html', messageText, re.IGNORECASE) and re.search(b'<body', messageText,
                                                                                         re.IGNORECASE):
-                            finalMessage = messageText
+                            finalMessage = messageText.decode()
 
+                            self.extraArgs['unsubscribeCheck'] = 0
                             if self.extraArgs['unsubscribeCheck']:
                                 messageFile = open(tempPath, 'w')
-                                messageFile.write(messageText)
+                                messageFile.write(finalMessage)
                                 messageFile.close()
 
                                 command = "sudo sed -i 's/{{ unsubscribeCheck }}/" + removalLink + "/g' " + tempPath