File tree 3 files changed +32
-3
lines changed
3 files changed +32
-3
lines changed Original file line number Diff line number Diff line change @@ -180,14 +180,15 @@ elif echo $OUTPUT | grep -q "CloudLinux 7" ; then
180
180
rm -f /etc/yum.repos.d/epel.repo
181
181
rm -f /etc/yum.repos.d/epel.repo.rpmsave
182
182
elif echo $OUTPUT | grep -q " CentOS Linux 8" ; then
183
- curl https://raw.githubusercontent.com/usmannasir/cyberpanel/v2.0.1/install/CyberPanel8.repo > /etc/yum.repos.d/CyberPanel.repo
184
183
echo -e " \nDetecting CentOS 8.X...\n"
185
184
SERVER_OS=" CentOS8"
186
185
yum clean all
187
186
yum update -y
188
187
yum autoremove epel-release -y
189
188
rm -f /etc/yum.repos.d/epel.repo
190
189
rm -f /etc/yum.repos.d/epel.repo.rpmsave
190
+ yum autoremove epel-release -y
191
+ dnf install epel-release -y
191
192
elif echo $OUTPUT | grep -q " Ubuntu 18.04" ; then
192
193
echo -e " \nDetecting Ubuntu 18.04...\n"
193
194
SERVER_OS=" Ubuntu"
Original file line number Diff line number Diff line change @@ -158,9 +158,9 @@ def verificationJob(self):
158
158
ValidationLog (owner = verificationList , status = backupSchedule .INFO , message = 'Starting email verification..' ).save ()
159
159
160
160
for items in allEmailsInList :
161
-
162
161
if items .verificationStatus != 'Verified' :
163
162
try :
163
+
164
164
email = items .email
165
165
self .currentEmail = email
166
166
domainName = email .split ('@' )[1 ]
@@ -245,7 +245,6 @@ def verificationJob(self):
245
245
items .verificationStatus = 'Verification Failed'
246
246
items .save ()
247
247
248
-
249
248
logging .CyberCPLogFileWriter .statusWriter (tempStatusPath , str (counter ) + ' emails verified so far..' )
250
249
counter = counter + 1
251
250
except BaseException as msg :
Original file line number Diff line number Diff line change @@ -903,6 +903,20 @@ def emailMarketingMigrationsa():
903
903
KEY `emailMarketing_email_owner_id_bf1b4530_fk_websiteFu` (`owner_id`),
904
904
CONSTRAINT `emailMarketing_email_owner_id_bf1b4530_fk_websiteFu` FOREIGN KEY (`owner_id`) REFERENCES `websiteFunctions_websites` (`id`)
905
905
)"""
906
+ try :
907
+ cursor .execute (query )
908
+ except :
909
+ pass
910
+
911
+ query = 'ALTER TABLE emailMarketing_emaillists ADD COLUMN verified INT DEFAULT 0'
912
+
913
+ try :
914
+ cursor .execute (query )
915
+ except :
916
+ pass
917
+
918
+ query = 'ALTER TABLE emailMarketing_emaillists ADD COLUMN notVerified INT DEFAULT 0'
919
+
906
920
try :
907
921
cursor .execute (query )
908
922
except :
@@ -989,6 +1003,21 @@ def emailMarketingMigrationsa():
989
1003
PRIMARY KEY (`id`)
990
1004
)"""
991
1005
1006
+ try :
1007
+ cursor .execute (query )
1008
+ except :
1009
+ pass
1010
+
1011
+ query = """CREATE TABLE `emailMarketing_validationlog` (
1012
+ `id` int(11) NOT NULL AUTO_INCREMENT,
1013
+ `status` int(11) NOT NULL,
1014
+ `message` longtext NOT NULL,
1015
+ `owner_id` int(11) NOT NULL,
1016
+ PRIMARY KEY (`id`),
1017
+ KEY `emailMarketing_valid_owner_id_240ad36e_fk_emailMark` (`owner_id`),
1018
+ CONSTRAINT `emailMarketing_valid_owner_id_240ad36e_fk_emailMark` FOREIGN KEY (`owner_id`) REFERENCES `emailMarketing_emaillists` (`id`)
1019
+ )"""
1020
+
992
1021
try :
993
1022
cursor .execute (query )
994
1023
except :
You can’t perform that action at this time.
0 commit comments