fix imports

ApachController/ApacheController.py

@@ -3,7 +3,7 @@ import os
 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 @@ class secMiddleware:
 
                     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 @@ try:
     django.setup()
 except:
     pass
-from IncBackupsControl import IncJobs
+from .IncBackupsControl import IncJobs
-from IncBackups.models import BackupJob
+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 @@ import django
 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 @@ import requests
 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 .databaseManager import DatabaseManager
-from pluginManager import pluginManager
+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 @@ import json
 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 .dnsManager import DNSManager
-from pluginManager import pluginManager
+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 django.shortcuts import render, redirect, HttpResponse
 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 @@ from django.apps import AppConfig
 class EmailmarketingConfig(AppConfig):
     name = 'emailMarketing'
     def ready(self):
-        import signals
+        from . import signals

emailMarketing/emailMarketing.py

@@ -5,7 +5,7 @@ import time
 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 @@ from random import randint
 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 .firewallManager import FirewallManager
-from pluginManager import pluginManager
+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 @@ django.setup()
 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'),

loginSystem/views.py

@@ -3,7 +3,7 @@
 
 from django.shortcuts import render
 from django.http import HttpResponse
-from models import Administrator
+from .models import Administrator
 from plogical import hashPassword
 import json
 from packages.models import Package
@@ -12,7 +12,7 @@ from baseTemplate.models import version
 from plogical.getSystemInformation import SystemInformation
 from django.utils.translation import LANGUAGE_SESSION_KEY
 import CyberCP.settings as settings
-from models import ACL
+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

mailServer/mailserverManager.py

@@ -8,7 +8,7 @@ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings")
 django.setup()
 from django.shortcuts import render,redirect
 from django.http import HttpResponse
-from models import Domains,EUsers
+from .models import Domains,EUsers
 from loginSystem.views import loadLoginPage
 import plogical.CyberCPLogFileWriter as logging
 import json

mailServer/pluginManager.py

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

mailServer/urls.py

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

mailServer/views.py

@@ -5,8 +5,8 @@ from django.shortcuts import redirect
 from django.http import HttpResponse
 from loginSystem.views import loadLoginPage
 import json
-from mailserverManager import MailServerManager
+from .mailserverManager import MailServerManager
-from pluginManager import pluginManager
+from .pluginManager import pluginManager
 
 def loadEmailHome(request):
     try:

managePHP/admin.py

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

managePHP/urls.py

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

managePHP/views.py

@@ -20,7 +20,7 @@ from random import randint
 from xml.etree import ElementTree
 from plogical.acl import ACLManager
 from plogical.processUtilities import ProcessUtilities
-from phpManager import PHPManager
+from .phpManager import PHPManager
 
 
 # Create your views here.

manageSSL/urls.py

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

manageServices/urls.py

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

manageServices/views.py

@@ -9,7 +9,7 @@ import os
 import json
 from plogical.mailUtilities import mailUtilities
 from plogical.acl import ACLManager
-from models import PDNSStatus, SlaveServers
+from .models import PDNSStatus, SlaveServers
 from .serviceManager import ServiceManager
 from plogical.processUtilities import ProcessUtilities
 # Create your views here.

packages/admin.py

@@ -5,6 +5,6 @@ from django.contrib import admin
 
 # Register your models here.
 from django.contrib import admin
-import models
+from . import models
 # Register your models here.
 admin.site.register(models.Package)

packages/pluginManager.py

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

packages/urls.py

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

packages/views.py

@@ -3,8 +3,8 @@
 
 from django.shortcuts import redirect
 from loginSystem.views import loadLoginPage
-from packagesManager import PackagesManager
+from .packagesManager import PackagesManager
-from pluginManager import pluginManager
+from .pluginManager import pluginManager
 
 # Create your views here.
 

plogical/acl.py

@@ -12,7 +12,7 @@ from dns.models import Domains
 import json
 from subprocess import call, CalledProcessError
 from shlex import split
-from CyberCPLogFileWriter import CyberCPLogFileWriter as logging
+from .CyberCPLogFileWriter import CyberCPLogFileWriter as logging
 from dockerManager.models import Containers
 
 class ACLManager:

plogical/applicationInstaller.py

@@ -9,12 +9,12 @@ django.setup()
 import threading as multi
 from plogical.CyberCPLogFileWriter import CyberCPLogFileWriter as logging
 import subprocess
-from vhost import vhost
+from .vhost import vhost
 from websiteFunctions.models import ChildDomains, Websites
-import randomPassword
+from . import randomPassword
-from mysqlUtilities import mysqlUtilities
+from .mysqlUtilities import mysqlUtilities
 from databases.models import Databases
-from installUtilities import installUtilities
+from .installUtilities import installUtilities
 import shutil
 from plogical.mailUtilities import mailUtilities
 from plogical.processUtilities import ProcessUtilities

plogical/backupManager.py

@@ -7,15 +7,15 @@ sys.path.append('/usr/local/CyberCP')
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings")
 django.setup()
 import json
-from acl import ACLManager
+from .acl import ACLManager
-import CyberCPLogFileWriter as logging
+from . import CyberCPLogFileWriter as logging
 from websiteFunctions.models import Websites, Backups, dest, backupSchedules
-from virtualHostUtilities import virtualHostUtilities
+from .virtualHostUtilities import virtualHostUtilities
 import subprocess
 import shlex
 from django.shortcuts import HttpResponse, render
 from loginSystem.models import Administrator
-from mailUtilities import mailUtilities
+from .mailUtilities import mailUtilities
 from random import randint
 import time
 import plogical.backupUtilities as backupUtil

plogical/backupSchedule.py

@@ -5,12 +5,12 @@ import django
 sys.path.append('/usr/local/CyberCP')
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings")
 django.setup()
-import CyberCPLogFileWriter as logging
+from . import CyberCPLogFileWriter as logging
 import subprocess
 import shlex
 import os
 import time
-from backupUtilities import backupUtilities
+from .backupUtilities import backupUtilities
 from re import match,I,M
 from websiteFunctions.models import Websites, Backups
 from plogical.processUtilities import ProcessUtilities

plogical/backupScheduleLocal.py

@@ -1,7 +1,7 @@
-import CyberCPLogFileWriter as logging
+from . import CyberCPLogFileWriter as logging
 import os
 import time
-from backupSchedule import backupSchedule
+from .backupSchedule import backupSchedule
 from plogical.processUtilities import ProcessUtilities
 from re import match,I,M
 

plogical/backupUtilities.py

@@ -7,19 +7,19 @@ try:
 except:
     pass
 import pexpect
-import CyberCPLogFileWriter as logging
+from . import CyberCPLogFileWriter as logging
 import subprocess
 import shlex
 from shutil import make_archive,rmtree
-import mysqlUtilities
+from . import mysqlUtilities
 import tarfile
 from multiprocessing import Process
 import signal
-from installUtilities import installUtilities
+from .installUtilities import installUtilities
 import argparse
 try:
-    from virtualHostUtilities import virtualHostUtilities
+    from .virtualHostUtilities import virtualHostUtilities
-    from sslUtilities import sslUtilities
+    from .sslUtilities import sslUtilities
     from plogical.mailUtilities import mailUtilities
 except:
     pass
@@ -35,7 +35,7 @@ try:
     from websiteFunctions.models import Websites, ChildDomains, Backups
     from databases.models import Databases
     from loginSystem.models import Administrator
-    from dnsUtilities import DNS
+    from .dnsUtilities import DNS
     from mailServer.models import Domains as eDomains
     from backup.models import DBUsers
 except:

plogical/cronUtil.py

@@ -1,5 +1,5 @@
 import argparse
-from processUtilities import ProcessUtilities
+from .processUtilities import ProcessUtilities
 
 class CronUtil:
 

plogical/csf.py

@@ -1,13 +1,13 @@
 #!/usr/local/CyberCP/bin/python
-import CyberCPLogFileWriter as logging
+from . import CyberCPLogFileWriter as logging
 import subprocess
 import shlex
 import argparse
-from virtualHostUtilities import virtualHostUtilities
+from .virtualHostUtilities import virtualHostUtilities
 import os
 import tarfile
 import shutil
-from mailUtilities import mailUtilities
+from .mailUtilities import mailUtilities
 import threading as multi
 from plogical.processUtilities import ProcessUtilities
 

plogical/dnsUtilities.py

@@ -7,12 +7,12 @@ try:
     django.setup()
 except:
     pass
-import CyberCPLogFileWriter as logging
+from . import CyberCPLogFileWriter as logging
 import subprocess
 import shlex
 try:
     from dns.models import Domains,Records
-    from processUtilities import ProcessUtilities
+    from .processUtilities import ProcessUtilities
     from manageServices.models import PDNSStatus, SlaveServers
 except:
     pass

plogical/filemanager.py

@@ -1,4 +1,4 @@
-import CyberCPLogFileWriter as logging
+from . import CyberCPLogFileWriter as logging
 import argparse
 from random import randint
 

plogical/findBWUsage.py

@@ -1,5 +1,5 @@
 import os
-import CyberCPLogFileWriter as logging
+from . import CyberCPLogFileWriter as logging
 import shlex
 import subprocess
 class findBWUsage:

plogical/ftpUtilities.py

@@ -4,9 +4,9 @@ sys.path.append('/usr/local/CyberCP')
 import django
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings")
 django.setup()
-import mysqlUtilities as sql
+from . import mysqlUtilities as sql
 import subprocess
-import CyberCPLogFileWriter as logging
+from . import CyberCPLogFileWriter as logging
 import os
 import shlex
 import argparse

plogical/installUtilities.py

@@ -1,11 +1,11 @@
 import subprocess
 import sys
-import CyberCPLogFileWriter as logging
+from . import CyberCPLogFileWriter as logging
 import shutil
 import pexpect
 import os
 import shlex
-from processUtilities import ProcessUtilities
+from .processUtilities import ProcessUtilities
 
 class installUtilities:
 

plogical/mailUtilities.py

@@ -8,11 +8,11 @@ except:
     pass
 import os.path
 import shutil
-import CyberCPLogFileWriter as logging
+from . import CyberCPLogFileWriter as logging
 import subprocess
 import argparse
 import shlex
-from processUtilities import ProcessUtilities
+from .processUtilities import ProcessUtilities
 import os, getpass
 import hashlib
 import bcrypt

plogical/modSec.py

@@ -1,13 +1,13 @@
-import CyberCPLogFileWriter as logging
+from . import CyberCPLogFileWriter as logging
 import subprocess
 import shlex
 import argparse
-from virtualHostUtilities import virtualHostUtilities
+from .virtualHostUtilities import virtualHostUtilities
 import os
 import tarfile
 import shutil
-from mailUtilities import mailUtilities
+from .mailUtilities import mailUtilities
-from processUtilities import ProcessUtilities
+from .processUtilities import ProcessUtilities
 from plogical.installUtilities import installUtilities
 
 class modSec:

plogical/mysqlUtilities.py

@@ -6,7 +6,7 @@ try:
     django.setup()
 except:
     pass
-import CyberCPLogFileWriter as logging
+from . import CyberCPLogFileWriter as logging
 import subprocess
 import shlex
 try:

plogical/phpUtilities.py

@@ -1,12 +1,12 @@
-import CyberCPLogFileWriter as logging
+from . import CyberCPLogFileWriter as logging
 import subprocess
 import shlex
 import _thread
-import installUtilities
+from . import installUtilities
 import argparse
 import os
-from mailUtilities import mailUtilities
+from .mailUtilities import mailUtilities
-from processUtilities import ProcessUtilities
+from .processUtilities import ProcessUtilities
 
 class phpUtilities:
 

plogical/pluginManagerGlobal.py

@@ -1,5 +1,5 @@
 from django.http import HttpResponse
-from CyberCPLogFileWriter import CyberCPLogFileWriter as logging
+from .CyberCPLogFileWriter import CyberCPLogFileWriter as logging
 
 
 class pluginManagerGlobal:

plogical/processUtilities.py

@@ -1,4 +1,4 @@
-from CyberCPLogFileWriter import CyberCPLogFileWriter as logging
+from .CyberCPLogFileWriter import CyberCPLogFileWriter as logging
 import subprocess
 import shlex
 import os

plogical/remoteBackup.py

@@ -1,9 +1,9 @@
-import CyberCPLogFileWriter as logging
+from . import CyberCPLogFileWriter as logging
 import os
 import requests
 import json
 import time
-import backupUtilities as backupUtil
+from . import backupUtilities as backupUtil
 import subprocess
 import shlex
 from multiprocessing import Process

plogical/remoteTransferUtilities.py

@@ -1,7 +1,7 @@
 import argparse
 import os
-import CyberCPLogFileWriter as logging
+from . import CyberCPLogFileWriter as logging
-import backupUtilities as backupUtil
+from . import backupUtilities as backupUtil
 import time
 from multiprocessing import Process
 import json
@@ -11,7 +11,7 @@ import shlex
 from shutil import move
 from plogical.virtualHostUtilities import virtualHostUtilities
 from plogical.processUtilities import ProcessUtilities
-from backupSchedule import backupSchedule
+from .backupSchedule import backupSchedule
 import shutil
 
 class remoteTransferUtilities:

plogical/serverLogs.py

@@ -1,4 +1,4 @@
-import CyberCPLogFileWriter as logging
+from . import CyberCPLogFileWriter as logging
 import argparse
 
 class serverLogs:

plogical/sslUtilities.py

@@ -1,4 +1,4 @@
-import CyberCPLogFileWriter as logging
+from . import CyberCPLogFileWriter as logging
 import os
 import shlex
 import subprocess

plogical/tuning.py

@@ -1,9 +1,9 @@
-import CyberCPLogFileWriter as logging
+from . import CyberCPLogFileWriter as logging
-from installUtilities import installUtilities
+from .installUtilities import installUtilities
 import argparse
 import subprocess
 import shlex
-from processUtilities import ProcessUtilities
+from .processUtilities import ProcessUtilities
 from xml.etree import ElementTree
 
 class tuning:

plogical/vhost.py

@@ -10,18 +10,18 @@ try:
 except:
     pass
 import shutil
-import installUtilities
+from . import installUtilities
 
 import subprocess
 import shlex
-import CyberCPLogFileWriter as logging
+from . import CyberCPLogFileWriter as logging
 
-from mysqlUtilities import mysqlUtilities
+from .mysqlUtilities import mysqlUtilities
-from dnsUtilities import DNS
+from .dnsUtilities import DNS
 from random import randint
-from processUtilities import ProcessUtilities
+from .processUtilities import ProcessUtilities
 from managePHP.phpManager import PHPManager
-from vhostConfs import vhostConfs
+from .vhostConfs import vhostConfs
 from ApachController.ApacheVhosts import ApacheVhost
 try:
     from websiteFunctions.models import Websites, ChildDomains, aliasDomains

plogical/virtualHostUtilities.py

@@ -14,8 +14,8 @@ except:
 
 import shutil
 import argparse
-import installUtilities
+from . import installUtilities
-import sslUtilities
+from . import sslUtilities
 from os.path import join
 from os import listdir, rmdir
 from shutil import move
@@ -23,12 +23,12 @@ from multiprocessing import Process
 import subprocess
 import shlex
 from plogical.mailUtilities import mailUtilities
-import CyberCPLogFileWriter as logging
+from . import CyberCPLogFileWriter as logging
-from dnsUtilities import DNS
+from .dnsUtilities import DNS
-from vhost import vhost
+from .vhost import vhost
-from applicationInstaller import ApplicationInstaller
+from .applicationInstaller import ApplicationInstaller
-from acl import ACLManager
+from .acl import ACLManager
-from processUtilities import ProcessUtilities
+from .processUtilities import ProcessUtilities
 from ApachController.ApacheController import ApacheController
 from ApachController.ApacheVhosts import ApacheVhost
 from managePHP.phpManager import PHPManager

plogical/website.py

@@ -8,31 +8,31 @@ sys.path.append('/usr/local/CyberCP')
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings")
 django.setup()
 import json
-from acl import ACLManager
+from .acl import ACLManager
-import CyberCPLogFileWriter as logging
+from . import CyberCPLogFileWriter as logging
 from websiteFunctions.models import Websites, ChildDomains
-from virtualHostUtilities import virtualHostUtilities
+from .virtualHostUtilities import virtualHostUtilities
 import subprocess
 import shlex
-from installUtilities import installUtilities
+from .installUtilities import installUtilities
 from django.shortcuts import HttpResponse, render
 from loginSystem.models import Administrator, ACL
 from packages.models import Package
-from mailUtilities import mailUtilities
+from .mailUtilities import mailUtilities
 from random import randint
 import time
 import re
-from childDomain import ChildDomainManager
+from .childDomain import ChildDomainManager
 from math import ceil
 from plogical.alias import AliasManager
 from plogical.applicationInstaller import ApplicationInstaller
 from databases.models import Databases
-import randomPassword as randomPassword
+from . import randomPassword as randomPassword
 import hashlib
-from mysqlUtilities import mysqlUtilities
+from .mysqlUtilities import mysqlUtilities
 from plogical import hashPassword
 from emailMarketing.emACL import emACL
-from processUtilities import ProcessUtilities
+from .processUtilities import ProcessUtilities
 from managePHP.phpManager import PHPManager
 from ApachController.ApacheVhosts import ApacheVhost
 from plogical.vhostConfs import vhostConfs

pluginHolder/urls.py

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

postfixSenderPolicy/accept_traffic.py

@@ -6,11 +6,11 @@ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings")
 django.setup()
 import threading as multi
 from plogical.CyberCPLogFileWriter import CyberCPLogFileWriter as logging
-from policyConstraint import policyConstraints
+from .policyConstraint import policyConstraints
 from emailPremium.models import DomainLimits, EmailLogs
 from mailServer.models import Domains, EUsers
 import time
-from cacheManager import cacheManager
+from .cacheManager import cacheManager
 
 limitThreads = multi.BoundedSemaphore(10)
 

postfixSenderPolicy/startServer.py

@@ -6,10 +6,10 @@ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings")
 django.setup()
 import socket
 import os
-import accept_traffic as handle
+from . import accept_traffic as handle
 from plogical.CyberCPLogFileWriter import CyberCPLogFileWriter as logging
 from signal import *
-from cacheManager import cacheManager
+from .cacheManager import cacheManager
 import pwd
 import grp
 

serverLogs/urls.py

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

serverStatus/urls.py

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

serverStatus/views.py

@@ -13,7 +13,7 @@ from plogical.acl import ACLManager
 import os
 from plogical.virtualHostUtilities import virtualHostUtilities
 import time
-import serverStatusUtil
+from . import serverStatusUtil
 from plogical.processUtilities import ProcessUtilities
 from plogical.httpProc import httpProc
 from plogical.installUtilities import installUtilities

tuning/urls.py

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

tuning/views.py

@@ -4,7 +4,7 @@
 from django.shortcuts import redirect
 import json
 from loginSystem.views import loadLoginPage
-from tuning import tuningManager
+from .tuning import tuningManager
 # Create your views here.
 
 

userManagment/urls.py

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

websiteFunctions/admin.py

@@ -2,6 +2,6 @@
 
 
 from django.contrib import admin
-import models
+from . import models
 # Register your models here.
 admin.site.register(models.Websites)