Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2026-05-08 23:45:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

bug fix: email marketing

Browse Source
This commit is contained in:
Usman Nasir
2020-06-23 18:00:44 +05:00
parent d0f7c5b87f
commit 2abcfa0262
1 changed files with 47 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
emailMarketing/emailMarketing.py
View File

@@ -5,7 +5,7 @@ import time
import csv import csv
import re import re
import plogical.CyberCPLogFileWriter as logging import plogical.CyberCPLogFileWriter as logging
from .models import EmailMarketing, EmailLists, EmailsInList, EmailTemplate, EmailJobs, SMTPHosts, ValidationLog from .models import EmailLists, EmailsInList, EmailTemplate, EmailJobs, SMTPHosts, ValidationLog
from plogical.backupSchedule import backupSchedule from plogical.backupSchedule import backupSchedule
from websiteFunctions.models import Websites from websiteFunctions.models import Websites
import threading as multi import threading as multi
@@ -271,27 +271,35 @@ class emailMarketing(multi.Thread):
logging.CyberCPLogFileWriter.writeToFile(str(msg)) logging.CyberCPLogFileWriter.writeToFile(str(msg))
return 0 return 0
def setupSMTPConnection(self):
try:
if self.extraArgs['host'] == 'localhost':
self.smtpServer = smtplib.SMTP('127.0.0.1')
return 1
else:
self.verifyHost = SMTPHosts.objects.get(host=self.extraArgs['host'])
self.smtpServer = smtplib.SMTP(str(self.verifyHost.host), int(self.verifyHost.port))
self.smtpServer.login(str(self.verifyHost.userName), str(self.verifyHost.password))
return 1
except smtplib.SMTPHeloError:
logging.CyberCPLogFileWriter.statusWriter(self.extraArgs['tempStatusPath'],
'The server didnt reply properly to the HELO greeting.')
return 0
except smtplib.SMTPAuthenticationError:
logging.CyberCPLogFileWriter.statusWriter(self.extraArgs['tempStatusPath'],
'Username and password combination not accepted.')
return 0
except smtplib.SMTPException:
logging.CyberCPLogFileWriter.statusWriter(self.extraArgs['tempStatusPath'],
'No suitable authentication method was found.')
return 0
def startEmailJob(self): def startEmailJob(self):
try: try:
try:
if self.extraArgs['host'] == 'localhost': if self.setupSMTPConnection() == 0:
smtpServer = smtplib.SMTP('127.0.0.1') logging.CyberCPLogFileWriter.writeToFile('SMTP Connection failed. [301]')
else: return 0
verifyHost = SMTPHosts.objects.get(host=self.extraArgs['host'])
smtpServer = smtplib.SMTP(str(verifyHost.host), int(verifyHost.port))
smtpServer.login(str(verifyHost.userName), str(verifyHost.password))
except smtplib.SMTPHeloError:
logging.CyberCPLogFileWriter.statusWriter(self.extraArgs['tempStatusPath'],
'The server didnt reply properly to the HELO greeting.')
return
except smtplib.SMTPAuthenticationError:
logging.CyberCPLogFileWriter.statusWriter(self.extraArgs['tempStatusPath'],
'Username and password combination not accepted.')
return
except smtplib.SMTPException:
logging.CyberCPLogFileWriter.statusWriter(self.extraArgs['tempStatusPath'],
'No suitable authentication method was found.')
return
emailList = EmailLists.objects.get(listName=self.extraArgs['listName']) emailList = EmailLists.objects.get(listName=self.extraArgs['listName'])
allEmails = emailList.emailsinlist_set.all() allEmails = emailList.emailsinlist_set.all()
@@ -364,7 +372,16 @@ class emailMarketing(multi.Thread):
html = MIMEText(finalMessage, 'plain') html = MIMEText(finalMessage, 'plain')
message.attach(html) message.attach(html)
smtpServer.sendmail(message['From'], items.email, message.as_string()) try:
status = self.smtpServer.noop()[0]
self.smtpServer.sendmail(message['From'], items.email, message.as_string())
except: # smtplib.SMTPServerDisconnected
if self.setupSMTPConnection() == 0:
logging.CyberCPLogFileWriter.writeToFile('SMTP Connection failed. [301]')
return 0
self.smtpServer.sendmail(message['From'], items.email, message.as_string())
sent = sent + 1 sent = sent + 1
emailJob.sent = sent emailJob.sent = sent
emailJob.save() emailJob.save()
@@ -379,7 +396,10 @@ class emailMarketing(multi.Thread):
logging.CyberCPLogFileWriter.statusWriter(self.extraArgs['tempStatusPath'], logging.CyberCPLogFileWriter.statusWriter(self.extraArgs['tempStatusPath'],
'Successfully sent: ' + str( 'Successfully sent: ' + str(
sent) + ', Failed: ' + str(failed)) sent) + ', Failed: ' + str(failed))
logging.CyberCPLogFileWriter.writeToFile(str(msg)) if self.setupSMTPConnection() == 0:
logging.CyberCPLogFileWriter.writeToFile(
'SMTP Connection failed. Error: %s. [392]' % (str(msg)))
return 0
except BaseException as msg: except BaseException as msg:
failed = failed + 1 failed = failed + 1
emailJob.failed = failed emailJob.failed = failed
@@ -387,13 +407,13 @@ class emailMarketing(multi.Thread):
logging.CyberCPLogFileWriter.statusWriter(self.extraArgs['tempStatusPath'], logging.CyberCPLogFileWriter.statusWriter(self.extraArgs['tempStatusPath'],
'Successfully sent: ' + str( 'Successfully sent: ' + str(
sent) + ', Failed: ' + str(failed)) sent) + ', Failed: ' + str(failed))
logging.CyberCPLogFileWriter.writeToFile(str(msg)) if self.setupSMTPConnection() == 0:
logging.CyberCPLogFileWriter.writeToFile('SMTP Connection failed. Error: %s. [399]' % (str(msg)))
return 0
emailJob = EmailJobs(owner=emailMessage, date=time.strftime("%I-%M-%S-%a-%b-%Y"), emailJob.sent = sent
host=self.extraArgs['host'], totalEmails=totalEmails, emailJob.failed = failed
sent=sent, failed=failed
)
emailJob.save() emailJob.save()
logging.CyberCPLogFileWriter.statusWriter(self.extraArgs['tempStatusPath'], logging.CyberCPLogFileWriter.statusWriter(self.extraArgs['tempStatusPath'],