From 148f9f055a122801ea8dc6dc7dd2a60d577863c7 Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Sun, 7 Aug 2022 08:19:11 +0500
Subject: [PATCH] resolve: https://github.com/usmannasir/cyberpanel/issues/942

---
 .../templates/emailPremium/Rspamd.html        | 55 ++++++++++++-------
 install/installCyberPanel.py                  |  3 +
 plogical/IncScheduler.py                      |  1 -
 websiteFunctions/website.py                   |  1 +
 4 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/emailPremium/templates/emailPremium/Rspamd.html b/emailPremium/templates/emailPremium/Rspamd.html
index 8f8af893e..7314b132b 100644
--- a/emailPremium/templates/emailPremium/Rspamd.html
+++ b/emailPremium/templates/emailPremium/Rspamd.html
@@ -12,34 +12,35 @@
         <div id="page-title">
             <h2>{% trans "Rspamd Configurations!" %} -
             </h2>
-            <p>{% trans "On this page you can configure RSPAMD settings." %}</p>
+            <p>{% trans "On this page you can configure Rspamd settings." %}</p>
         </div>
 
         <div ng-controller="Rspamd" class="example-box-wrapper">
             <div class="panel panel-body">
-            <div class="col-lg-12" style="float: left">
-                        <h3 class="content-box-header">
-                            {% trans "Rspamd" %} <img ng-hide="RspamdLoading" src="/static/images/loading.gif">
+                <div class="col-lg-12" style="float: left">
+                    <h3 class="content-box-header">
+                        {% trans "Rspamd" %} <img ng-hide="RspamdLoading" src="/static/images/loading.gif">
 
-                        </h3>
-                    </div>
+                    </h3>
+                </div>
                 <div style="width: 100%; margin: 0 auto">
 
                     <div ng-hide="uninstallbutton" class="col-lg-3" style="float: left">
-                        <button type="button" data-toggle="modal" data-target="#ViewRspamdlog" ng-click="FetchRspamdLog()"
-                                class="btn btn-primaryb btn-lg btn-block">{% trans "View Rsmapd Log" %}</button>
+                        <button type="button" data-toggle="modal" data-target="#ViewRspamdlog"
+                                ng-click="FetchRspamdLog()"
+                                class="btn btn-primaryb btn-lg btn-block">{% trans "View Rspamd Logs" %}</button>
                     </div>
 
-                    <div ng-hide="uninstallbutton" class="col-lg-2" style="float: left">
+                    <div ng-hide="uninstallbutton" class="col-lg-3" style="float: left">
 
                         <button type="button" data-toggle="modal" data-target="#UninstallRspamdmodal"
-                                class="btn btn-danger btn-lg btn-block">{% trans "uninstall." %}</button>
+                                class="btn btn-danger btn-lg btn-block">{% trans "Un-install Rspamd" %}</button>
 
                     </div>
-                    <div ng-hide="uninstallbutton" class="col-lg-2" style="float: left">
+                    <div ng-hide="uninstallbutton" class="col-lg-6" style="float: left">
 
                         <button type="button" ng-click="RestartRspamd()"
-                                class="btn btn-gray btn-lg btn-block">{% trans "Restart" %}</button>
+                                class="btn btn-gray btn-lg btn-block">{% trans "Restart Rspamd and CLAMAV" %}</button>
 
                     </div>
                 </div>
@@ -164,8 +165,11 @@
                                 <!-----------------------------------------ClamAv--------------------------->
                                 <div style="padding: 2%" class="col-md-12">
                                     <h3 class="content-box-header">
-                                        {% trans "ClamAV" %}
+                                        {% trans "ClamAV - This is CLAMV Configurations in Rspamd" %}
                                     </h3>
+                                    <p style="margin: 1%">
+                                        <strong>Warning</strong> {% trans "this is advanced settings, do not change if you don't know what you are doing" %}.
+                                    </p>
                                     <form action="/" id="createPackages" class="form-horizontal bordered-row">
 
                                         <div ng-hide="phpDetailsBox" class="form-group">
@@ -256,13 +260,17 @@
                                     </form>
                                 </div>
 
-                                 <!-----------------------------------------ClamAv 2--------------------------->
+                                <!-----------------------------------------ClamAv 2--------------------------->
                                 <div style="padding: 2%" class="col-md-12">
                                     <h3 class="content-box-header">
                                         {% trans "ClamAV Configuration" %}
                                         <img ng-hide="CLamAVLoading"
-                                                                  src="/static/images/loading.gif">
+                                             src="/static/images/loading.gif">
                                     </h3>
+                                    <p style="margin: 1%">
+                                        <strong>Warning</strong> {% trans "this is advanced settings, do not change if you don't know what you are doing" %}.
+                                    </p>
+
                                     <form action="/" id="createPackages" class="form-horizontal bordered-row">
                                         <div ng-hide="phpDetailsBox" class="form-group">
                                             <label class="col-sm-4 control-label">TCPSocket</label>
@@ -330,9 +338,13 @@
                                 <!-----------------------------------------postfix--------------------------->
                                 <div style="padding: 2%" class="col-md-12">
                                     <h3 class="content-box-header">
-                                        {% trans "Postfix" %}<img ng-hide="postfixLoading"
-                                                                  src="/static/images/loading.gif">
+                                        {% trans "Postfix Configurations for Rspamd" %}<img ng-hide="postfixLoading"
+                                                                                            src="/static/images/loading.gif">
                                     </h3>
+                                    <p style="margin: 1%">
+                                        <strong>Warning</strong> {% trans "this is advanced settings, do not change if you don't know what you are doing" %}.
+                                    </p>
+
                                     <form action="/" id="createPackages" class="form-horizontal bordered-row">
 
                                         <div class="form-group">
@@ -387,6 +399,10 @@
                                     <h3 class="content-box-header">
                                         {% trans "Redis" %}<img ng-hide="RedisLoading" src="/static/images/loading.gif">
                                     </h3>
+                                    <p style="margin: 1%">
+                                        <strong>Warning</strong> {% trans "this is advanced settings, do not change if you don't know what you are doing" %}.
+                                    </p>
+
                                     <form action="/" id="createPackages" class="form-horizontal bordered-row">
 
                                         <div class="form-group">
@@ -489,12 +505,13 @@
                             </h4>
                         </div>
                         <div class="modal-body">
-                            <textarea ng-model="RspamdlogsData" class="form-control" rows="30">{{ Rspamdlogs }}</textarea>
+                            <textarea ng-model="RspamdlogsData" class="form-control"
+                                      rows="30">{{ Rspamdlogs }}</textarea>
 
                         </div>
                         <div class="modal-footer">
                             <button type="button"
-                                    class="btn btn-primary" data-dismiss="modal" >yes
+                                    class="btn btn-primary" data-dismiss="modal">yes
                             </button>
                             <button type="button"
                                     class="btn btn-default" data-dismiss="modal">
diff --git a/install/installCyberPanel.py b/install/installCyberPanel.py
index 22dc6310d..fc0d9d96b 100755
--- a/install/installCyberPanel.py
+++ b/install/installCyberPanel.py
@@ -251,6 +251,9 @@ class InstallCyberPanel:
         if self.distro == cent8:
             command = 'dnf install lsphp71* lsphp72* lsphp73* lsphp74* lsphp80* --exclude lsphp73-pecl-zip --exclude *imagick* -y'
             subprocess.call(command, shell=True)
+
+            command = 'dnf install lsphp81* --exclude *imagick* -y'
+            subprocess.call(command, shell=True)
         
         if self.distro == openeuler:
             command = 'dnf install lsphp71* lsphp72* lsphp73* lsphp74* lsphp80* -y'
diff --git a/plogical/IncScheduler.py b/plogical/IncScheduler.py
index 0686d784e..039cd0c83 100644
--- a/plogical/IncScheduler.py
+++ b/plogical/IncScheduler.py
@@ -907,7 +907,6 @@ Automatic backup failed for %s on %s.
 
                         command = 'chattr -R -i /home/%s/incbackup/' % (website.domain)
                         ProcessUtilities.executioner(command)
-
                     else:
                         command = 'chattr -R -i /home/%s/' % (website.domain)
                         ProcessUtilities.executioner(command)
diff --git a/websiteFunctions/website.py b/websiteFunctions/website.py
index fac0dc7c2..c0a641284 100755
--- a/websiteFunctions/website.py
+++ b/websiteFunctions/website.py
@@ -1,4 +1,5 @@
 #!/usr/local/CyberCP/bin/python
+import html
 import os
 import os.path
 import sys