From a1df439270d5382523bc9f710f118cd45aa3e9a8 Mon Sep 17 00:00:00 2001 From: usmannasir <01-134132-158@student.bahria.edu.pk> Date: Mon, 22 Oct 2018 10:55:52 +0500 Subject: [PATCH] Remove some events --- CyberCP/secMiddleware.py | 2 +- emailMarketing/emailMarketing.py | 31 ++++---- emailMarketing/signals.py | 79 ------------------- plogical/upgrade.py | 37 ++++++++- plogical/website.py | 3 + .../templates/websiteFunctions/website.html | 75 +++++++++++++++++- 6 files changed, 128 insertions(+), 99 deletions(-) diff --git a/CyberCP/secMiddleware.py b/CyberCP/secMiddleware.py index 3d4496e91..6c7ce7143 100644 --- a/CyberCP/secMiddleware.py +++ b/CyberCP/secMiddleware.py @@ -16,7 +16,7 @@ class secMiddleware: pass else: continue - if key == 'configData' or key == 'rewriteRules' or key == 'modSecRules' or key == 'recordContentTXT' or key == 'SecAuditLogRelevantStatus': + if key == 'emailMessage' or key == 'configData' or key == 'rewriteRules' or key == 'modSecRules' or key == 'recordContentTXT' or key == 'SecAuditLogRelevantStatus': continue if value.find(';') > -1 or value.find('&&') > -1 or value.find('|') > -1 or value.find('...') > -1: logging.writeToFile(request.body) diff --git a/emailMarketing/emailMarketing.py b/emailMarketing/emailMarketing.py index 393c8d732..01e0f81c1 100644 --- a/emailMarketing/emailMarketing.py +++ b/emailMarketing/emailMarketing.py @@ -192,26 +192,25 @@ class emailMarketing(multi.Thread): if (items.verificationStatus == 'Verified' or self.extraArgs['verificationCheck']) and not items.verificationStatus == 'REMOVED': try: - if re.search('', emailMessage.emailMessage, re.IGNORECASE): - html = MIMEText(emailMessage.emailMessage, 'html') - message.attach(html) + removalLink = "https://" + ipAddress + ":8090/emailMarketing/remove/" + self.extraArgs['listName'] + "/" + items.email + + if re.search('Unsubscribe from future emails.' - additionalCheck = MIMEText(removalMessage, 'html') - message.attach(additionalCheck) + finalMessage = finalMessage.replace('{{ unsubscribeCheck }}', removalLink) + + html = MIMEText(finalMessage, 'html') + message.attach(html) + else: - html = MIMEText(emailMessage.emailMessage, 'plain') - message.attach(html) - if self.extraArgs['unsubscribeCheck']: - finalMessage = '\n\n Unsubscribe by visiting https://' + ipAddress + ':8090/emailMarketing/remove/' + \ - self.extraArgs[ - 'listName'] + "/" + items.email + finalMessage = emailMessage.emailMessage - html = MIMEText(finalMessage, 'plain') - message.attach(html) + if self.extraArgs['unsubscribeCheck']: + finalMessage = finalMessage.replace('{{ unsubscribeCheck }}', removalLink) + + html = MIMEText(finalMessage, 'plain') + message.attach(html) diff --git a/emailMarketing/signals.py b/emailMarketing/signals.py index a492b6449..e69de29bb 100644 --- a/emailMarketing/signals.py +++ b/emailMarketing/signals.py @@ -1,79 +0,0 @@ -from django.dispatch import receiver -from django.shortcuts import render -from websiteFunctions.signals import preDomain -from emACL import emACL - - - -@receiver(preDomain) -def loadDomainHome(sender, **kwargs): - from websiteFunctions.models import Websites - from loginSystem.models import Administrator - from plogical.virtualHostUtilities import virtualHostUtilities - import subprocess, shlex - import plogical.CyberCPLogFileWriter as logging - from plogical.acl import ACLManager - - request = kwargs['request'] - domain = request.GET['domain'] - userID = request.session['userID'] - - if Websites.objects.filter(domain=domain).exists(): - - currentACL = ACLManager.loadedACL(userID) - website = Websites.objects.get(domain=domain) - admin = Administrator.objects.get(pk=userID) - - if ACLManager.checkOwnership(domain, admin, currentACL) == 1: - pass - else: - return ACLManager.loadError() - - marketingStatus = emACL.checkIfEMEnabled(admin.userName) - - Data = {} - - Data['ftpTotal'] = website.package.ftpAccounts - Data['ftpUsed'] = website.users_set.all().count() - - Data['databasesUsed'] = website.databases_set.all().count() - Data['databasesTotal'] = website.package.dataBases - Data['marketingStatus'] = marketingStatus - - Data['domain'] = domain - - diskUsageDetails = virtualHostUtilities.getDiskUsage("/home/" + domain, website.package.diskSpace) - - try: - execPath = "sudo python " + virtualHostUtilities.cyberPanel + "/plogical/virtualHostUtilities.py" - execPath = execPath + " findDomainBW --virtualHostName " + domain + " --bandwidth " + str( - website.package.bandwidth) - - output = subprocess.check_output(shlex.split(execPath)) - bwData = output.split(",") - except BaseException, msg: - logging.CyberCPLogFileWriter.writeToFile(str(msg)) - bwData = [0, 0] - - ## bw usage calculations - - Data['bwInMBTotal'] = website.package.bandwidth - Data['bwInMB'] = bwData[0] - Data['bwUsage'] = bwData[1] - - if diskUsageDetails != None: - if diskUsageDetails[1] > 100: - diskUsageDetails[1] = 100 - - Data['diskUsage'] = diskUsageDetails[1] - Data['diskInMB'] = diskUsageDetails[0] - Data['diskInMBTotal'] = website.package.diskSpace - else: - Data['diskUsage'] = 0 - Data['diskInMB'] = 0 - Data['diskInMBTotal'] = website.package.diskSpace - - return render(request, 'emailMarketing/website.html', Data) - else: - return render(request, 'emailMarketing/website.html', - {"error": 1, "domain": "This domain does not exists."}) \ No newline at end of file diff --git a/plogical/upgrade.py b/plogical/upgrade.py index 29a303f79..407a0dd15 100644 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -454,6 +454,23 @@ WantedBy=multi-user.target""" except: pass + @staticmethod + def emailMarketingMigrationsa(): + try: + os.chdir('/usr/local/CyberCP') + try: + command = "python manage.py makemigrations emailMarketing" + subprocess.call(shlex.split(command)) + except: + pass + try: + command = "python manage.py migrate emailMarketing" + subprocess.call(shlex.split(command)) + except: + pass + except: + pass + @staticmethod def enableServices(): try: @@ -530,6 +547,11 @@ WantedBy=multi-user.target""" if items.find('pluginHolder') > -1: pluginCheck = 0 + emailMarketing = 1 + for items in data: + if items.find('emailMarketing') > -1: + emailMarketing = 0 + Upgrade.stdOut('Restoring settings file!') @@ -541,6 +563,8 @@ WantedBy=multi-user.target""" writeToFile.writelines(items) if pluginCheck == 1: writeToFile.writelines(" 'pluginHolder',\n") + if emailMarketing == 1: + writeToFile.writelines(" 'emailMarketing',\n") if Version.currentVersion == '1.6': writeToFile.writelines(" 'emailPremium',\n") else: @@ -560,6 +584,16 @@ WantedBy=multi-user.target""" except: pass + + @staticmethod + def installPYDNS(): + try: + command = "pip install pydns" + res = subprocess.call(shlex.split(command)) + except OSError, msg: + Upgrade.stdOut(str(msg) + " [installPYDNS]") + return 0 + @staticmethod def installTLDExtract(): try: @@ -726,7 +760,7 @@ WantedBy=multi-user.target""" os._exit(0) ## - + Upgrade.installPYDNS() Upgrade.downloadAndUpgrade(Version, versionNumbring) @@ -737,6 +771,7 @@ WantedBy=multi-user.target""" ## Upgrade.mailServerMigrations() + Upgrade.emailMarketingMigrationsa() ## diff --git a/plogical/website.py b/plogical/website.py index 1eabfef17..3df1a411a 100644 --- a/plogical/website.py +++ b/plogical/website.py @@ -30,6 +30,7 @@ import randomPassword as randomPassword import hashlib from mysqlUtilities import mysqlUtilities from plogical import hashPassword +from emailMarketing.emACL import emACL class WebsiteManager: def __init__(self, domain = None, childDomain = None): @@ -483,7 +484,9 @@ class WebsiteManager: return ACLManager.loadError() Data = {} + marketingStatus = emACL.checkIfEMEnabled(admin.userName) + Data['marketingStatus'] = marketingStatus Data['ftpTotal'] = website.package.ftpAccounts Data['ftpUsed'] = website.users_set.all().count() diff --git a/websiteFunctions/templates/websiteFunctions/website.html b/websiteFunctions/templates/websiteFunctions/website.html index 6b2be8bb6..46e2938b2 100644 --- a/websiteFunctions/templates/websiteFunctions/website.html +++ b/websiteFunctions/templates/websiteFunctions/website.html @@ -819,8 +819,7 @@ - -
+

{% trans "Files" %} @@ -940,6 +939,78 @@

+ {% if marketingStatus %} + +
+
+

+ {% trans "Email Marketing" %} +

+ +
+
+ +
+ + + + + + {% trans "Create Lists" %} + + +
+ +
+ + + + + + {% trans "Manage Lists" %} + + +
+ +
+ + + + + + {% trans "SMTP Hosts" %} + + +
+ +
+ + + + + + {% trans "Compose" %} + + +
+ +
+ + + + + + {% trans "Send Emails" %} + + +
+ +
+
+
+
+ + {% endif %}