fix imports

ApachController/ApacheController.py

@@ -3,7 +3,7 @@
 import subprocess
 import shlex
 import plogical.CyberCPLogFileWriter as logging
-from ApacheVhosts import ApacheVhost
+from .ApacheVhosts import ApacheVhost
 
 
 class ApacheController:

CLManager/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import url
-import views
+from . import views
 
 urlpatterns = [
     url(r'^CageFS$', views.CageFS, name='CageFS'),

CLManager/views.py

@@ -4,7 +4,7 @@
 from django.shortcuts import redirect, HttpResponse
 from loginSystem.views import loadLoginPage
 from plogical.acl import ACLManager
-from CLManagerMain import CLManagerMain
+from .CLManagerMain import CLManagerMain
 import json
 from websiteFunctions.models import Websites
 from plogical.processUtilities import ProcessUtilities

CyberCP/secMiddleware.py

@@ -74,7 +74,7 @@ def __call__(self, request):
 
                     if request.build_absolute_uri().find('saveSpamAssassinConfigurations') > -1 or request.build_absolute_uri().find('docker') > -1 or request.build_absolute_uri().find('cloudAPI') > -1 or request.build_absolute_uri().find('filemanager') > -1 or request.build_absolute_uri().find('verifyLogin') > -1 or request.build_absolute_uri().find('submitUserCreation') > -1:
                         continue
-                    if key == 'backupDestinations' or key == 'ports' or key == 'imageByPass' or key == 'passwordByPass' or key == 'cronCommand' or key == 'emailMessage' or key == 'configData' or key == 'rewriteRules' or key == 'modSecRules' or key == 'recordContentTXT' or key == 'SecAuditLogRelevantStatus' or key == 'fileContent':
+                    if key == 'recordContentAAAA' or key == 'backupDestinations' or key == 'ports' or key == 'imageByPass' or key == 'passwordByPass' or key == 'cronCommand' or key == 'emailMessage' or key == 'configData' or key == 'rewriteRules' or key == 'modSecRules' or key == 'recordContentTXT' or key == 'SecAuditLogRelevantStatus' or key == 'fileContent':
                         continue
                     if value.find(';') > -1 or value.find('&&') > -1 or value.find('|') > -1 or value.find('...') > -1 \
                             or value.find("`") > -1 or value.find("$") > -1 or value.find("(") > -1 or value.find(")") > -1 \

IncBackups/IncScheduler.py

@@ -10,8 +10,8 @@
     django.setup()
 except:
     pass
-from IncBackupsControl import IncJobs
-from IncBackups.models import BackupJob
+from .IncBackupsControl import IncJobs
+from .IncBackups.models import BackupJob
 from random import randint
 import argparse
 try:

IncBackups/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import url
-import views
+from . import views
 
 urlpatterns = [
     url(r'^createBackup$', views.createBackup, name='createBackupInc'),

WebTerminal/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import url
-import views
+from . import views
 
 urlpatterns = [
     url(r'^$', views.terminal, name='terminal'),

api/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import url
-import views
+from . import views
 
 urlpatterns = [
     url(r'^createWebsite', views.createWebsite, name='createWebsiteAPI'),

backup/pluginManager.py

@@ -1,4 +1,4 @@
-from signals import *
+from .signals import *
 from plogical.pluginManagerGlobal import pluginManagerGlobal
 
 class pluginManager:

backup/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import url
-import views
+from . import views
 
 urlpatterns = [
     url(r'^$', views.loadBackupHome, name='loadBackupHome'),

baseTemplate/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import url
-import views
+from . import views
 
 urlpatterns = [
     url(r'^$', views.renderBase, name='index'),

cli/cyberPanel.py

@@ -5,7 +5,7 @@
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings")
 django.setup()
 from inspect import stack
-from cliLogger import cliLogger as logger
+from .cliLogger import cliLogger as logger
 import json
 from plogical.virtualHostUtilities import virtualHostUtilities
 import re
@@ -17,7 +17,7 @@
 from loginSystem.models import Administrator
 from packages.models import Package
 from plogical.mysqlUtilities import mysqlUtilities
-from cliParser import cliParser
+from .cliParser import cliParser
 from plogical.vhost import vhost
 from plogical.mailUtilities import mailUtilities
 from plogical.ftpUtilities import FTPUtilities

cloudAPI/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import url
-import views
+from . import views
 
 urlpatterns = [
     url(r'^$', views.router, name='router'),

cloudAPI/views.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-from cloudManager import CloudManager
+from .cloudManager import CloudManager
 import json
 from loginSystem.models import Administrator
 from plogical.CyberCPLogFileWriter import CyberCPLogFileWriter as logging

containerization/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import url
-import views
+from . import views
 
 urlpatterns = [
     url(r'^$', views.cHome, name='cHome'),

containerization/views.py

@@ -3,7 +3,7 @@
 
 from django.shortcuts import HttpResponse, redirect
 from loginSystem.views import loadLoginPage
-from containerManager import ContainerManager
+from .containerManager import ContainerManager
 import json
 from websiteFunctions.models import Websites
 from .models import ContainerLimits

databases/admin.py

@@ -2,7 +2,7 @@
 
 
 from django.contrib import admin
-import models
+from . import models
 # Register your models here.
 
 

databases/pluginManager.py

@@ -1,4 +1,4 @@
-from signals import *
+from .signals import *
 from plogical.pluginManagerGlobal import pluginManagerGlobal
 
 class pluginManager:

databases/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import url
-import views
+from . import views
 
 urlpatterns = [
     url(r'^$', views.loadDatabaseHome, name='loadDatabaseHome'),

databases/views.py

@@ -3,8 +3,8 @@
 
 from django.shortcuts import redirect, HttpResponse
 from loginSystem.views import loadLoginPage
-from databaseManager import DatabaseManager
-from pluginManager import pluginManager
+from .databaseManager import DatabaseManager
+from .pluginManager import pluginManager
 import json
 from plogical.processUtilities import ProcessUtilities
 from loginSystem.models import Administrator

dns/admin.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import models
+from . import models
 from django.contrib import admin
 
 admin.site.register(models.Domains)

dns/dnsManager.py

@@ -11,7 +11,7 @@
 from plogical.dnsUtilities import DNS
 from loginSystem.models import Administrator
 import os
-from models import Domains,Records
+from .models import Domains,Records
 from re import match,I,M
 from plogical.mailUtilities import mailUtilities
 from plogical.acl import ACLManager

dns/pluginManager.py

@@ -1,4 +1,4 @@
-from signals import *
+from .signals import *
 from plogical.pluginManagerGlobal import pluginManagerGlobal
 
 class pluginManager:

dns/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import url
-import views
+from . import views
 
 urlpatterns = [
     url(r'^$', views.loadDNSHome, name='dnsHome'),

dns/views.py

@@ -2,8 +2,8 @@
 
 from django.shortcuts import redirect
 from loginSystem.views import loadLoginPage
-from dnsManager import DNSManager
-from pluginManager import pluginManager
+from .dnsManager import DNSManager
+from .pluginManager import pluginManager
 import json
 
 # Create your views here.

dockerManager/pluginManager.py

@@ -1,4 +1,4 @@
-from signals import *
+from .signals import *
 from plogical.pluginManagerGlobal import pluginManagerGlobal
 
 class pluginManager:

dockerManager/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import url
-import views
+from . import views
 
 urlpatterns = [
     url(r'^$', views.loadDockerHome, name='dockerHome'),

dockerManager/views.py

@@ -5,7 +5,7 @@
 from loginSystem.models import Administrator
 from loginSystem.views import loadLoginPage
 from .container import ContainerManager
-from decorators import preDockerRun
+from .decorators import preDockerRun
 from plogical.acl import ACLManager
 import json
 

emailMarketing/apps.py

@@ -7,4 +7,4 @@
 class EmailmarketingConfig(AppConfig):
     name = 'emailMarketing'
     def ready(self):
-        import signals
+        from . import signals

emailMarketing/emailMarketing.py

@@ -5,7 +5,7 @@
 import csv
 import re
 import plogical.CyberCPLogFileWriter as logging
-from emailMarketing.models import EmailMarketing, EmailLists, EmailsInList, EmailTemplate, EmailJobs, SMTPHosts
+from .emailMarketing.models import EmailMarketing, EmailLists, EmailsInList, EmailTemplate, EmailJobs, SMTPHosts
 from websiteFunctions.models import Websites
 import threading as multi
 import socket, smtplib

emailMarketing/emailMarketingManager.py

@@ -6,12 +6,12 @@
 import time
 from .models import EmailMarketing, EmailLists, EmailsInList, EmailJobs
 from websiteFunctions.models import Websites
-from emailMarketing import emailMarketing as EM
+from .emailMarketing import emailMarketing as EM
 from math import ceil
 import smtplib
 from .models import SMTPHosts, EmailTemplate
 from loginSystem.models import Administrator
-from emACL import emACL
+from .emACL import emACL
 
 class EmailMarketingManager:
 

emailMarketing/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import url
-import views
+from . import views
 urlpatterns = [
     url(r'^$', views.emailMarketing, name='emailMarketing'),
     url(r'^fetchUsers$', views.fetchUsers, name='fetchUsers'),

emailMarketing/views.py

@@ -2,7 +2,7 @@
 
 from django.shortcuts import redirect
 from loginSystem.views import loadLoginPage
-from emailMarketingManager import EmailMarketingManager
+from .emailMarketingManager import EmailMarketingManager
 # Create your views here.
 
 

emailPremium/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import url
-import views
+from . import views
 
 urlpatterns = [
 

examplePlugin/apps.py

@@ -8,4 +8,4 @@ class ExamplepluginConfig(AppConfig):
     name = 'examplePlugin'
 
     def ready(self):
-        import signals
+        from . import signals

examplePlugin/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import url
-import views
+from . import views
 
 urlpatterns = [
 

filemanager/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import url
-import views
+from . import views
 
 urlpatterns = [
     url(r'^upload$',views.upload, name='upload'),

firewall/admin.py

@@ -1,4 +1,4 @@
 from django.contrib import admin
-import models
+from . import models
 # Register your models here.
 admin.site.register(models.FirewallRules)

firewall/pluginManager.py

@@ -1,4 +1,4 @@
-from signals import *
+from .signals import *
 from plogical.pluginManagerGlobal import pluginManagerGlobal
 
 class pluginManager:

firewall/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import url
-import views
+from . import views
 
 urlpatterns = [
     url(r'^securityHome', views.securityHome, name='securityHome'),

firewall/views.py

@@ -1,8 +1,8 @@
 from django.shortcuts import redirect
 import json
 from loginSystem.views import loadLoginPage
-from firewallManager import FirewallManager
-from pluginManager import pluginManager
+from .firewallManager import FirewallManager
+from .pluginManager import pluginManager
 # Create your views here.
 
 

ftp/admin.py

@@ -2,7 +2,7 @@
 
 
 from django.contrib import admin
-import models
+from . import models
 
 # Register your models here.
 

ftp/ftpManager.py

@@ -8,7 +8,7 @@
 import json
 from django.shortcuts import render,redirect
 from django.http import HttpResponse
-from models import Users
+from .models import Users
 from loginSystem.models import Administrator
 import plogical.CyberCPLogFileWriter as logging
 from loginSystem.views import loadLoginPage

ftp/pluginManager.py

@@ -1,4 +1,4 @@
-from signals import *
+from .signals import *
 from plogical.pluginManagerGlobal import pluginManagerGlobal
 
 class pluginManager:

ftp/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import url
-import views
+from . import views
 
 urlpatterns = [
     url(r'^$', views.loadFTPHome, name='loadFTPHome'),

ftp/views.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
 from django.shortcuts import redirect
-from ftpManager import FTPManager
+from .ftpManager import FTPManager
 from loginSystem.views import loadLoginPage
-from pluginManager import pluginManager
+from .pluginManager import pluginManager
 # Create your views here.
 
 def loadFTPHome(request):

install/firewallUtilities.py

@@ -5,7 +5,7 @@ class FirewallUtilities:
 
     @staticmethod
     def doCommand(command):
-        import install as inst
+        from . import install as inst
         try:
             cmd = shlex.split(command)
             res = subprocess.call(cmd)

loginSystem/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import url
-import views
+from . import views
 
 urlpatterns = [
     url(r'^$', views.loadLoginPage, name='adminLogin'),