From 771d660e1027066468642e1b43b63f47edf30cf9 Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Mon, 8 Jun 2020 00:05:43 +0500
Subject: [PATCH] remove cent8 own repo

---
 cyberpanel.sh                                        |  4 +---
 emailMarketing/emailMarketing.py                     |  2 ++
 .../templates/emailMarketing/manageLists.html        | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cyberpanel.sh b/cyberpanel.sh
index 04b1a576a..f51613ab8 100644
--- a/cyberpanel.sh
+++ b/cyberpanel.sh
@@ -371,7 +371,6 @@ install_required() {
 
 if [[ -d /etc/yum.repos.d ]] ; then
 	if [[ $CENTOS_8 == "True" ]] ; then
-  		curl https://raw.githubusercontent.com/usmannasir/cyberpanel/v2.0.1/install/CyberPanel8.repo > /etc/yum.repos.d/CyberPanel.repo
   		dnf install zip -y
 	elif [[ $CENTOS_8 == "False" ]] ; then
   		curl https://raw.githubusercontent.com/usmannasir/cyberpanel/v2.0.1/install/CyberPanel.repo > /etc/yum.repos.d/CyberPanel.repo
@@ -380,7 +379,6 @@ fi
 
 echo -e "\nInstalling necessary components..."
 if [[ $SERVER_OS == "CentOS" ]] ; then
-
 	timeout 10 rpm --import https://$DOWNLOAD_SERVER/mariadb/RPM-GPG-KEY-MariaDB
 	timeout 10 rpm --import https://$DOWNLOAD_SERVER/litespeed/RPM-GPG-KEY-litespeed
 	timeout 10 rpm --import https://$DOWNLOAD_SERVER/powerdns/FD380FBB-pub.asc
@@ -402,7 +400,7 @@ if [[ $SERVER_OS == "CentOS" ]] ; then
 	rm -f /etc/yum.repos.d/epel.repo.rpmsave
 
 	if [[ $CENTOS_8 == "False" ]] ; then
-	  yum --enablerepo=CyberPanel install -y wget strace htop net-tools telnet curl which bc telnet htop libevent-devel gcc libattr-devel xz-devel gpgme-devel curl-devel git socat openssl-devel MariaDB-shared mariadb-devel yum-utils python36u python36u-pip python36u-devel
+	  yum install -y wget strace htop net-tools telnet curl which bc telnet htop libevent-devel gcc libattr-devel xz-devel gpgme-devel curl-devel git socat openssl-devel MariaDB-shared mariadb-devel yum-utils python36u python36u-pip python36u-devel
 		check_return
 		yum -y groupinstall development
 		check_return
diff --git a/emailMarketing/emailMarketing.py b/emailMarketing/emailMarketing.py
index 9a62e25e5..44344f294 100755
--- a/emailMarketing/emailMarketing.py
+++ b/emailMarketing/emailMarketing.py
@@ -268,6 +268,8 @@ class emailMarketing(multi.Thread):
                 verificationList.verified = verificationList.emailsinlist_set.filter(verificationStatus='Verified').count()
                 verificationList.save()
 
+            ValidationLog(owner=verificationList, status=backupSchedule.ERROR, message=str(counter) + ' emails successfully verified. [200]').save()
+
             logging.CyberCPLogFileWriter.statusWriter(tempStatusPath, str(counter) + ' emails successfully verified. [200]')
         except BaseException as msg:
             verificationList = EmailLists.objects.get(listName=self.extraArgs['listName'])
diff --git a/emailMarketing/templates/emailMarketing/manageLists.html b/emailMarketing/templates/emailMarketing/manageLists.html
index 7234fcddb..c7c5c4dd0 100755
--- a/emailMarketing/templates/emailMarketing/manageLists.html
+++ b/emailMarketing/templates/emailMarketing/manageLists.html
@@ -38,9 +38,9 @@
 
                         <div ng-hide="currentRecords" class="form-group">
                             <div class="row">
-                                <div class="col-sm-2">
+                                <div class="col-sm-1">
                                     <button data-toggle="modal" data-target="#deleteList"
-                                            class="btn ra-100 btn-danger">{% trans 'Delete This List' %}</button>
+                                            class="btn ra-100 btn-danger">{% trans 'Delete' %}</button>
                                     <!--- Delete Pool --->
                                     <div class="modal fade" id="deleteList" tabindex="-1" role="dialog"
                                          aria-labelledby="myModalLabel" aria-hidden="true">
@@ -68,16 +68,16 @@
                                     </div>
                                     <!--- Delete Pool --->
                                 </div>
-                                <div class="col-sm-2">
+                                <div class="col-sm-1">
                                     <button ng-disabled="verificationButton" ng-click="startVerification()"
-                                            class="btn ra-100 btn-blue-alt">{% trans 'Verify This List' %}</button>
+                                            class="btn ra-100 btn-blue-alt">{% trans 'Verify' %}</button>
                                 </div>
-                                <div class="col-sm-2">
+                                <div class="col-sm-3">
                                     <a target="_blank" href="/emailMarketing/{{ domain }}/configureVerify">
                                         <button class="btn ra-100 btn-blue-alt">{% trans 'Configure Verification' %}</button>
                                     </a>
                                 </div>
-                                <div class="col-sm-2">
+                                <div class="col-sm-3">
                                     <button ng-click="fetchLogs()" data-toggle="modal" data-target="#verificationLogs"
                                             class="btn ra-100 btn-blue-alt">{% trans 'Verfications Logs' %}</button>
                                     <!--- Delete Pool --->