From 029beee30f94f6b9b910326cabc413ca382877d4 Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Wed, 10 Jun 2020 22:16:49 +0500
Subject: [PATCH] bug fix: finalize removal of cent8 repo

---
 cyberpanel_upgrade.sh            |  3 ++-
 emailMarketing/emailMarketing.py |  3 +--
 plogical/upgrade.py              | 29 +++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/cyberpanel_upgrade.sh b/cyberpanel_upgrade.sh
index 2f49f7edf..6eb60345d 100644
--- a/cyberpanel_upgrade.sh
+++ b/cyberpanel_upgrade.sh
@@ -180,7 +180,6 @@ elif echo $OUTPUT | grep -q "CloudLinux 7" ; then
   rm -f /etc/yum.repos.d/epel.repo
   rm -f /etc/yum.repos.d/epel.repo.rpmsave
 elif  echo $OUTPUT | grep -q "CentOS Linux 8" ; then
-  curl https://raw.githubusercontent.com/usmannasir/cyberpanel/v2.0.1/install/CyberPanel8.repo > /etc/yum.repos.d/CyberPanel.repo
 	echo -e "\nDetecting CentOS 8.X...\n"
 	SERVER_OS="CentOS8"
 	yum clean all
@@ -188,6 +187,8 @@ elif  echo $OUTPUT | grep -q "CentOS Linux 8" ; then
   yum autoremove epel-release -y
   rm -f /etc/yum.repos.d/epel.repo
   rm -f /etc/yum.repos.d/epel.repo.rpmsave
+  yum autoremove epel-release -y
+  dnf install epel-release -y
 elif echo $OUTPUT | grep -q "Ubuntu 18.04" ; then
 	echo -e "\nDetecting Ubuntu 18.04...\n"
 	SERVER_OS="Ubuntu"
diff --git a/emailMarketing/emailMarketing.py b/emailMarketing/emailMarketing.py
index eed2afe21..57a036d9b 100755
--- a/emailMarketing/emailMarketing.py
+++ b/emailMarketing/emailMarketing.py
@@ -158,9 +158,9 @@ class emailMarketing(multi.Thread):
             ValidationLog(owner=verificationList, status=backupSchedule.INFO, message='Starting email verification..').save()
 
             for items in allEmailsInList:
-
                 if items.verificationStatus != 'Verified':
                     try:
+
                         email = items.email
                         self.currentEmail = email
                         domainName = email.split('@')[1]
@@ -245,7 +245,6 @@ class emailMarketing(multi.Thread):
                                 items.verificationStatus = 'Verification Failed'
                                 items.save()
 
-
                         logging.CyberCPLogFileWriter.statusWriter(tempStatusPath, str(counter) + ' emails verified so far..')
                         counter = counter + 1
                     except BaseException as msg:
diff --git a/plogical/upgrade.py b/plogical/upgrade.py
index 9434f3303..8c89749dc 100755
--- a/plogical/upgrade.py
+++ b/plogical/upgrade.py
@@ -903,6 +903,20 @@ class Upgrade:
   KEY `emailMarketing_email_owner_id_bf1b4530_fk_websiteFu` (`owner_id`),
   CONSTRAINT `emailMarketing_email_owner_id_bf1b4530_fk_websiteFu` FOREIGN KEY (`owner_id`) REFERENCES `websiteFunctions_websites` (`id`)
 )"""
+            try:
+                cursor.execute(query)
+            except:
+                pass
+
+            query = 'ALTER TABLE emailMarketing_emaillists ADD COLUMN verified INT DEFAULT 0'
+
+            try:
+                cursor.execute(query)
+            except:
+                pass
+
+            query = 'ALTER TABLE emailMarketing_emaillists ADD COLUMN notVerified INT DEFAULT 0'
+
             try:
                 cursor.execute(query)
             except:
@@ -989,6 +1003,21 @@ class Upgrade:
   PRIMARY KEY (`id`)
 )"""
 
+            try:
+                cursor.execute(query)
+            except:
+                pass
+
+            query = """CREATE TABLE `emailMarketing_validationlog` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `status` int(11) NOT NULL,
+  `message` longtext NOT NULL,
+  `owner_id` int(11) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `emailMarketing_valid_owner_id_240ad36e_fk_emailMark` (`owner_id`),
+  CONSTRAINT `emailMarketing_valid_owner_id_240ad36e_fk_emailMark` FOREIGN KEY (`owner_id`) REFERENCES `emailMarketing_emaillists` (`id`)
+)"""
+
             try:
                 cursor.execute(query)
             except: