From ef85135e1954fdf4cf934846017a662e9926c75c Mon Sep 17 00:00:00 2001
From: usmannasir <usman@cyberpersons.com>
Date: Fri, 27 Sep 2024 15:00:23 +0500
Subject: [PATCH] bug fix: default dkim to 1

---
 .../websiteFunctions/createDomain.html        | 33 +++++++------------
 .../websiteFunctions/createWebsite.html       | 31 +++++++----------
 websiteFunctions/website.py                   |  7 ++--
 3 files changed, 26 insertions(+), 45 deletions(-)

diff --git a/websiteFunctions/templates/websiteFunctions/createDomain.html b/websiteFunctions/templates/websiteFunctions/createDomain.html
index 580ae961c..1dbe49331 100755
--- a/websiteFunctions/templates/websiteFunctions/createDomain.html
+++ b/websiteFunctions/templates/websiteFunctions/createDomain.html
@@ -212,10 +212,10 @@
                                         <label>
                                             {% if test_domain_data %}
                                                 <input ng-model="apacheBackend" type="checkbox" value="">
-                                                Apache as Reverse Proxy (Beta, for Ubuntu 22 and AlmaLinux 8)
+                                                OpenLiteSpeed + Apache (Backend) (For Ubuntu 22, AlmaLinux 8 and AlmaLinux 9.)
                                             {% else %}
                                                 <input ng-model="apacheBackend" type="checkbox" value="" disabled>
-                                                OpenLiteSpeed + Apache (Backend) (For Ubuntu 22 and AlmaLinux 8) -
+                                                OpenLiteSpeed + Apache (Backend) (For Ubuntu 22, AlmaLinux 8 and AlmaLinux 9.) -
                                                 <strong><a href="https://go.cyberpanel.net/ApacheRev">Premium
                                                     Feature</a> <i
                                                         class="p fa fa-external-link btn-icon"> </i></strong>
@@ -223,27 +223,18 @@
                                         </label>
                                     </div>
                                 </div>
-
-                                <label class="col-sm-3 control-label"></label>
-                                <div class="col-sm-9">
-                                    <div class="checkbox">
-                                        <label>
-                                            <input ng-model="dkimCheck" type="checkbox" value="">
-                                            DKIM Support
-                                        </label>
-                                    </div>
-                                </div>
-                                <label class="col-sm-3 control-label"></label>
-                                <div class="col-sm-9">
-                                    <div class="checkbox">
-                                        <label>
-                                            <input ng-model="openBasedir" type="checkbox" value="">
-                                            open_basedir Protection
-                                        </label>
-                                    </div>
-                                </div>
+{#                                <label class="col-sm-3 control-label"></label>#}
+{#                                <div class="col-sm-9">#}
+{#                                    <div class="checkbox">#}
+{#                                        <label>#}
+{#                                            <input ng-model="openBasedir" type="checkbox" value="">#}
+{#                                            open_basedir Protection#}
+{#                                        </label>#}
+{#                                    </div>#}
+{#                                </div>#}
                             </div>
 
+
                             <div ng-hide="DomainCreateForm" class="form-group">
                                 <label class="col-sm-3 control-label"></label>
                                 <div class="col-sm-4">
diff --git a/websiteFunctions/templates/websiteFunctions/createWebsite.html b/websiteFunctions/templates/websiteFunctions/createWebsite.html
index 9448a18a7..4d39ece28 100755
--- a/websiteFunctions/templates/websiteFunctions/createWebsite.html
+++ b/websiteFunctions/templates/websiteFunctions/createWebsite.html
@@ -179,35 +179,26 @@
                                     <label>
                                         {% if test_domain_data %}
                                             <input ng-model="apacheBackend" type="checkbox" value="">
-                                            OpenLiteSpeed + Apache (Backend) (For Ubuntu 22 and AlmaLinux 8)
+                                            OpenLiteSpeed + Apache (Backend) (For Ubuntu 22, AlmaLinux 8 and AlmaLinux 9.)
                                         {% else %}
 
                                             <input ng-model="apacheBackend" type="checkbox" value="" disabled>
-                                            OpenLiteSpeed + Apache (Backend) (For Ubuntu 22 and AlmaLinux 8) -
+                                            OpenLiteSpeed + Apache (Backend) (For Ubuntu 22, AlmaLinux 8 and AlmaLinux 9.) -
                                             <strong><a href="https://go.cyberpanel.net/ApacheRev">Premium Feature</a> <i
                                                     class="p fa fa-external-link btn-icon"> </i></strong>
                                         {% endif %}
                                     </label>
                                 </div>
                             </div>
-                            <label class="col-sm-3 control-label"></label>
-                            <div class="col-sm-9">
-                                <div class="checkbox">
-                                    <label>
-                                        <input ng-model="dkimCheck" type="checkbox" value="">
-                                        DKIM Support
-                                    </label>
-                                </div>
-                            </div>
-                            <label class="col-sm-3 control-label"></label>
-                            <div class="col-sm-9">
-                                <div class="checkbox">
-                                    <label>
-                                        <input ng-model="openBasedir" type="checkbox" value="">
-                                        open_basedir Protection
-                                    </label>
-                                </div>
-                            </div>
+{#                            <label class="col-sm-3 control-label"></label>#}
+{#                            <div class="col-sm-9">#}
+{#                                <div class="checkbox">#}
+{#                                    <label>#}
+{#                                        <input ng-model="openBasedir" type="checkbox" value="">#}
+{#                                        open_basedir Protection#}
+{#                                    </label>#}
+{#                                </div>#}
+{#                            </div>#}
                             <label class="col-sm-3 control-label"></label>
                             <div class="col-sm-9">
                                 <div class="checkbox">
diff --git a/websiteFunctions/website.py b/websiteFunctions/website.py
index c71a62576..8ec87a367 100755
--- a/websiteFunctions/website.py
+++ b/websiteFunctions/website.py
@@ -2218,7 +2218,7 @@ class WebsiteManager:
             execPath = execPath + " createVirtualHost --virtualHostName " + domain + \
                        " --administratorEmail " + adminEmail + " --phpVersion '" + phpSelection + \
                        "' --virtualHostUser " + externalApp + " --ssl " + str(data['ssl']) + " --dkimCheck " \
-                       + str(data['dkimCheck']) + " --openBasedir " + str(data['openBasedir']) + \
+                       + str(1) + " --openBasedir " + str(data['openBasedir']) + \
                        ' --websiteOwner "' + websiteOwner + '" --package "' + packageName + '" --tempStatusPath ' + tempStatusPath + " --apache " + apacheBackend + " --mailDomain %s" % (
                            mailDomain)
 
@@ -2319,8 +2319,7 @@ class WebsiteManager:
             execPath = "/usr/local/CyberCP/bin/python " + virtualHostUtilities.cyberPanel + "/plogical/virtualHostUtilities.py"
 
             execPath = execPath + " createDomain --masterDomain " + masterDomain + " --virtualHostName " + domain + \
-                       " --phpVersion '" + phpSelection + "' --ssl " + str(data['ssl']) + " --dkimCheck " + str(
-                data['dkimCheck']) \
+                       " --phpVersion '" + phpSelection + "' --ssl " + str(data['ssl']) + " --dkimCheck " + str(1) \
                        + " --openBasedir " + str(data['openBasedir']) + ' --path ' + path + ' --websiteOwner ' \
                        + admin.userName + ' --tempStatusPath ' + tempStatusPath + " --apache " + apacheBackend + f' --aliasDomain {str(alias)}'
 
@@ -4541,7 +4540,7 @@ StrictHostKeyChecking no
             websiteOwner = data['websiteOwner']
             ownerPassword = data['ownerPassword']
             data['ssl'] = 1
-            data['dkimCheck'] = 0
+            data['dkimCheck'] = 1
             data['openBasedir'] = 1
             data['adminEmail'] = data['ownerEmail']
             data['phpSelection'] = "PHP 7.4"