Merge branch 'v2.3.6' into stable

CyberCP/settings.py

@@ -16,7 +16,6 @@ from django.utils.translation import gettext_lazy as _
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
-
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/
 
@@ -38,6 +37,7 @@ INSTALLED_APPS = [
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'baseTemplate',
+    'firewall',
     'loginSystem',
     'packages',
     'websiteFunctions',
@@ -49,7 +49,6 @@ INSTALLED_APPS = [
     'databases',
     'mailServer',
     'serverLogs',
-    'firewall',
     'backup',
     'managePHP',
     'manageSSL',
@@ -66,7 +65,7 @@ INSTALLED_APPS = [
     'containerization',
     'CLManager',
     'IncBackups',
-#    'WebTerminal'
+    #    'WebTerminal'
 ]
 
 MIDDLEWARE = [
@@ -83,7 +82,6 @@ MIDDLEWARE = [
 
 ROOT_URLCONF = 'CyberCP.urls'
 
-
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
@@ -103,7 +101,6 @@ TEMPLATES = [
 
 WSGI_APPLICATION = 'CyberCP.wsgi.application'
 
-
 # Database
 # https://docs.djangoproject.com/en/1.11/ref/settings/#databases
 
@@ -146,7 +143,6 @@ AUTH_PASSWORD_VALIDATORS = [
     },
 ]
 
-
 # Internationalization
 # https://docs.djangoproject.com/en/1.11/topics/i18n/
 
@@ -193,4 +189,4 @@ LANGUAGES = (
 
 MEDIA_URL = '/usr/local/CyberCP/tmp/'
 MEDIA_ROOT = MEDIA_URL
-DATA_UPLOAD_MAX_MEMORY_SIZE = 52428800
+DATA_UPLOAD_MAX_MEMORY_SIZE = 52428800

README.md

@@ -8,10 +8,10 @@ Web Hosting Control Panel that uses OpenLiteSpeed as the underlying Web Server.
 * Auto SSL.
 * FTP Server.
 * Light-weight DNS Server (PowerDNS).
-* phpMyAdmin to manage DBs (MariaDB).
+* phpMyAdmin will manage DBs (MariaDB).
 * Email Support (SnappyMail).
 * File Manager.
-* PHP Managment.
+* PHP Management.
 * Firewall (FirewallD & ConfigServer Firewall Integration).
 * One-click Backups and Restores.
 
@@ -21,7 +21,7 @@ Web Hosting Control Panel that uses OpenLiteSpeed as the underlying Web Server.
 * PHP 8.2 (will reach end of life (EOL) on 31 Dec, 2026.)
 * PHP 8.1 (will reach end of life (EOL) on 31 Dec, 2025.)
 * PHP 8.0 (will reach end of life (EOL) on 26 Nov, 2023.)
-* PHP 7.4 (Ubuntu 22.04 and up does not support php below this version.) (will reach end of life (EOL) on 28 Nov, 2022.)
+* PHP 7.4 (Ubuntu 22.04 and Almalinux 9.x and up does not support php below this version.) (will reach end of life (EOL) on 28 Nov 2022.)
 * PHP 7.3 (will reach end of life (EOL) on 6 Dec, 2021.)
 * PHP 7.2 (will reach end of life (EOL) on 30 Nov, 2020.)
 * PHP 7.1 (Almalinux 8.x and up does not support php below this version.),(will reach end of life (EOL) on 1 Dec, 2019.)
@@ -72,4 +72,4 @@ sh <(curl https://raw.githubusercontent.com/usmannasir/cyberpanel/stable/preUpgr
 * [Forums.](https://community.cyberpanel.net)
 * [Discord.](https://discord.gg/g8k8Db3)
 * [Facebook Group.](https://www.facebook.com/groups/cyberpanel)
-* [YouTube Channel.](https://www.youtube.com/@Cyber-Panel)
+* [YouTube Channel.](https://www.youtube.com/@Cyber-Panel)

loginSystem/views.py

@@ -6,13 +6,11 @@ from .models import Administrator
 from plogical import hashPassword
 import json
 from packages.models import Package
-from firewall.models import FirewallRules
 from baseTemplate.models import version
 from plogical.getSystemInformation import SystemInformation
 from .models import ACL
 from plogical.acl import ACLManager
 from django.views.decorators.csrf import ensure_csrf_cookie
-from plogical.CyberCPLogFileWriter import CyberCPLogFileWriter as logging
 from django.conf import settings
 from django.http import HttpResponse
 from django.utils import translation
@@ -162,6 +160,7 @@ def loadLoginPage(request):
 
         #return render(request, 'baseTemplate/homePage.html', finaData)
     except KeyError:
+        from firewall.models import FirewallRules
 
         numberOfAdministrator = Administrator.objects.count()
         password = hashPassword.hash_password('1234567')

plogical/acl.py

@@ -573,10 +573,10 @@ class ACLManager:
             php = "81"
         elif phpVersion == "PHP 8.2":
             php = "82"
+        elif phpVersion == "PHP 8.3":
+            php = "83"
         elif phpVersion == "PHP 8.4":
             php = "84"
-        elif phpVersion == "PHP 8.5":
-            php = "85"
 
         return php