Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2026-01-16 12:32:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug fix: email verification

Browse Source
This commit is contained in:
Usman Nasir
2020-06-04 21:41:59 +05:00
parent d8febfacdb
commit 7468b9bf96
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
emailMarketing/emailMarketing.py
View File

@@ -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