Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2026-06-27 10:19:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

bug fix: finalize removal of cent8 repo

Browse Source
This commit is contained in:
Usman Nasir
2020-06-10 22:16:49 +05:00
parent ae723126d0
commit 029beee30f
3 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cyberpanel_upgrade.sh
View File

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

3
emailMarketing/emailMarketing.py
View File

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

29
plogical/upgrade.py
View File

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