From d59a40c8f203cdf3efc84b192a469d0603d9b750 Mon Sep 17 00:00:00 2001
From: usmannasir <usman@cyberpersons.com>
Date: Mon, 19 Aug 2024 10:30:30 +0300
Subject: [PATCH] bug fix: creating user via cli

---
 CyberCP/settings.py  | 10 +++-------
 loginSystem/views.py |  3 +--
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/CyberCP/settings.py b/CyberCP/settings.py
index a757aee4a..79665436c 100755
--- a/CyberCP/settings.py
+++ b/CyberCP/settings.py
@@ -16,7 +16,6 @@
 # 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 @@
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'baseTemplate',
+    'firewall',
     'loginSystem',
     'packages',
     'websiteFunctions',
@@ -49,7 +49,6 @@
     'databases',
     'mailServer',
     'serverLogs',
-    'firewall',
     'backup',
     'managePHP',
     'manageSSL',
@@ -66,7 +65,7 @@
     'containerization',
     'CLManager',
     'IncBackups',
-#    'WebTerminal'
+    #    'WebTerminal'
 ]
 
 MIDDLEWARE = [
@@ -83,7 +82,6 @@
 
 ROOT_URLCONF = 'CyberCP.urls'
 
-
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
@@ -103,7 +101,6 @@
 
 WSGI_APPLICATION = 'CyberCP.wsgi.application'
 
-
 # Database
 # https://docs.djangoproject.com/en/1.11/ref/settings/#databases
 
@@ -146,7 +143,6 @@
     },
 ]
 
-
 # Internationalization
 # https://docs.djangoproject.com/en/1.11/topics/i18n/
 
@@ -193,4 +189,4 @@
 
 MEDIA_URL = '/usr/local/CyberCP/tmp/'
 MEDIA_ROOT = MEDIA_URL
-DATA_UPLOAD_MAX_MEMORY_SIZE = 52428800
\ No newline at end of file
+DATA_UPLOAD_MAX_MEMORY_SIZE = 52428800
diff --git a/loginSystem/views.py b/loginSystem/views.py
index 29d1e6933..7684da335 100644
--- a/loginSystem/views.py
+++ b/loginSystem/views.py
@@ -6,13 +6,11 @@
 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')