From 6e6cbed1a096f17f8a7c870e39f5f994c3a01d97 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Wed, 11 Dec 2019 10:40:35 +0500 Subject: [PATCH] fix imports --- ApachController/ApacheController.py | 2 +- CLManager/urls.py | 2 +- CLManager/views.py | 2 +- CyberCP/secMiddleware.py | 2 +- IncBackups/IncScheduler.py | 4 ++-- IncBackups/urls.py | 2 +- WebTerminal/urls.py | 2 +- api/urls.py | 2 +- backup/pluginManager.py | 2 +- backup/urls.py | 2 +- baseTemplate/urls.py | 2 +- cli/cyberPanel.py | 4 ++-- cloudAPI/urls.py | 2 +- cloudAPI/views.py | 2 +- containerization/urls.py | 2 +- containerization/views.py | 2 +- databases/admin.py | 2 +- databases/pluginManager.py | 2 +- databases/urls.py | 2 +- databases/views.py | 4 ++-- dns/admin.py | 2 +- dns/dnsManager.py | 2 +- dns/pluginManager.py | 2 +- dns/urls.py | 2 +- dns/views.py | 4 ++-- dockerManager/pluginManager.py | 2 +- dockerManager/urls.py | 2 +- dockerManager/views.py | 2 +- emailMarketing/apps.py | 2 +- emailMarketing/emailMarketing.py | 2 +- emailMarketing/emailMarketingManager.py | 4 ++-- emailMarketing/urls.py | 2 +- emailMarketing/views.py | 2 +- emailPremium/urls.py | 2 +- examplePlugin/apps.py | 2 +- examplePlugin/urls.py | 2 +- filemanager/urls.py | 2 +- firewall/admin.py | 2 +- firewall/pluginManager.py | 2 +- firewall/urls.py | 2 +- firewall/views.py | 4 ++-- ftp/admin.py | 2 +- ftp/ftpManager.py | 2 +- ftp/pluginManager.py | 2 +- ftp/urls.py | 2 +- ftp/views.py | 4 ++-- install/firewallUtilities.py | 2 +- loginSystem/urls.py | 2 +- loginSystem/views.py | 4 ++-- mailServer/mailserverManager.py | 2 +- mailServer/pluginManager.py | 2 +- mailServer/urls.py | 2 +- mailServer/views.py | 4 ++-- managePHP/admin.py | 2 +- managePHP/urls.py | 2 +- managePHP/views.py | 2 +- manageSSL/urls.py | 2 +- manageServices/urls.py | 2 +- manageServices/views.py | 2 +- packages/admin.py | 2 +- packages/pluginManager.py | 2 +- packages/urls.py | 2 +- packages/views.py | 4 ++-- plogical/acl.py | 2 +- plogical/applicationInstaller.py | 8 ++++---- plogical/backupManager.py | 8 ++++---- plogical/backupSchedule.py | 4 ++-- plogical/backupScheduleLocal.py | 4 ++-- plogical/backupUtilities.py | 12 ++++++------ plogical/cronUtil.py | 2 +- plogical/csf.py | 6 +++--- plogical/dnsUtilities.py | 4 ++-- plogical/filemanager.py | 2 +- plogical/findBWUsage.py | 2 +- plogical/ftpUtilities.py | 4 ++-- plogical/installUtilities.py | 4 ++-- plogical/mailUtilities.py | 4 ++-- plogical/modSec.py | 8 ++++---- plogical/mysqlUtilities.py | 2 +- plogical/phpUtilities.py | 8 ++++---- plogical/pluginManagerGlobal.py | 2 +- plogical/processUtilities.py | 2 +- plogical/remoteBackup.py | 4 ++-- plogical/remoteTransferUtilities.py | 6 +++--- plogical/serverLogs.py | 2 +- plogical/sslUtilities.py | 2 +- plogical/tuning.py | 6 +++--- plogical/vhost.py | 12 ++++++------ plogical/virtualHostUtilities.py | 16 ++++++++-------- plogical/website.py | 18 +++++++++--------- pluginHolder/urls.py | 2 +- postfixSenderPolicy/accept_traffic.py | 4 ++-- postfixSenderPolicy/startServer.py | 4 ++-- serverLogs/urls.py | 2 +- serverStatus/urls.py | 2 +- serverStatus/views.py | 2 +- tuning/urls.py | 2 +- tuning/views.py | 2 +- userManagment/urls.py | 2 +- websiteFunctions/admin.py | 2 +- websiteFunctions/pluginManager.py | 2 +- websiteFunctions/urls.py | 2 +- websiteFunctions/website.py | 2 +- 103 files changed, 165 insertions(+), 165 deletions(-) diff --git a/ApachController/ApacheController.py b/ApachController/ApacheController.py index 6f075c3ee..080a3ece1 100755 --- a/ApachController/ApacheController.py +++ b/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: diff --git a/CLManager/urls.py b/CLManager/urls.py index d7a531c43..d298e391a 100644 --- a/CLManager/urls.py +++ b/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'), diff --git a/CLManager/views.py b/CLManager/views.py index 8dcbd53e8..455e9c170 100644 --- a/CLManager/views.py +++ b/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 diff --git a/CyberCP/secMiddleware.py b/CyberCP/secMiddleware.py index 91c456634..2d0f06832 100755 --- a/CyberCP/secMiddleware.py +++ b/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 \ diff --git a/IncBackups/IncScheduler.py b/IncBackups/IncScheduler.py index df9a65de5..d9186019a 100644 --- a/IncBackups/IncScheduler.py +++ b/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: diff --git a/IncBackups/urls.py b/IncBackups/urls.py index fcf10fce5..aa0864b46 100644 --- a/IncBackups/urls.py +++ b/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'), diff --git a/WebTerminal/urls.py b/WebTerminal/urls.py index a959df39a..73b52d1e5 100755 --- a/WebTerminal/urls.py +++ b/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'), diff --git a/api/urls.py b/api/urls.py index 89923e4fc..8caf9cb92 100755 --- a/api/urls.py +++ b/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'), diff --git a/backup/pluginManager.py b/backup/pluginManager.py index 95373eacb..7f8a5b50d 100755 --- a/backup/pluginManager.py +++ b/backup/pluginManager.py @@ -1,4 +1,4 @@ -from signals import * +from .signals import * from plogical.pluginManagerGlobal import pluginManagerGlobal class pluginManager: diff --git a/backup/urls.py b/backup/urls.py index 47d79639b..0a7164ba2 100755 --- a/backup/urls.py +++ b/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'), diff --git a/baseTemplate/urls.py b/baseTemplate/urls.py index 7af0f42b6..31a0ed8c5 100755 --- a/baseTemplate/urls.py +++ b/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'), diff --git a/cli/cyberPanel.py b/cli/cyberPanel.py index 2bac6f4d2..16ddb9920 100755 --- a/cli/cyberPanel.py +++ b/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 diff --git a/cloudAPI/urls.py b/cloudAPI/urls.py index 94a9b975c..2c9619e7b 100755 --- a/cloudAPI/urls.py +++ b/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'), diff --git a/cloudAPI/views.py b/cloudAPI/views.py index cec667668..c8b98dcfe 100755 --- a/cloudAPI/views.py +++ b/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 diff --git a/containerization/urls.py b/containerization/urls.py index 6fb3ac761..dafc7e031 100755 --- a/containerization/urls.py +++ b/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'), diff --git a/containerization/views.py b/containerization/views.py index 817cfdd83..15b4806aa 100755 --- a/containerization/views.py +++ b/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 diff --git a/databases/admin.py b/databases/admin.py index 8585adea5..1db91e378 100755 --- a/databases/admin.py +++ b/databases/admin.py @@ -2,7 +2,7 @@ from django.contrib import admin -import models +from . import models # Register your models here. diff --git a/databases/pluginManager.py b/databases/pluginManager.py index 81e7d9f71..1e89c0872 100755 --- a/databases/pluginManager.py +++ b/databases/pluginManager.py @@ -1,4 +1,4 @@ -from signals import * +from .signals import * from plogical.pluginManagerGlobal import pluginManagerGlobal class pluginManager: diff --git a/databases/urls.py b/databases/urls.py index 3ef288986..64633b886 100755 --- a/databases/urls.py +++ b/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'), diff --git a/databases/views.py b/databases/views.py index 8807e0068..3b8eeb493 100755 --- a/databases/views.py +++ b/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 diff --git a/dns/admin.py b/dns/admin.py index 5cf394083..d799d78c4 100755 --- a/dns/admin.py +++ b/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) diff --git a/dns/dnsManager.py b/dns/dnsManager.py index 1272da1e1..dee0e03b2 100755 --- a/dns/dnsManager.py +++ b/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 diff --git a/dns/pluginManager.py b/dns/pluginManager.py index 17e477533..9d52edeb9 100755 --- a/dns/pluginManager.py +++ b/dns/pluginManager.py @@ -1,4 +1,4 @@ -from signals import * +from .signals import * from plogical.pluginManagerGlobal import pluginManagerGlobal class pluginManager: diff --git a/dns/urls.py b/dns/urls.py index e1ffd4b66..3f6059006 100755 --- a/dns/urls.py +++ b/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'), diff --git a/dns/views.py b/dns/views.py index 1809c9a17..b391ab16f 100755 --- a/dns/views.py +++ b/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. diff --git a/dockerManager/pluginManager.py b/dockerManager/pluginManager.py index 60a64e7ca..26dca3274 100755 --- a/dockerManager/pluginManager.py +++ b/dockerManager/pluginManager.py @@ -1,4 +1,4 @@ -from signals import * +from .signals import * from plogical.pluginManagerGlobal import pluginManagerGlobal class pluginManager: diff --git a/dockerManager/urls.py b/dockerManager/urls.py index 0bb5ca064..64209963e 100755 --- a/dockerManager/urls.py +++ b/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'), diff --git a/dockerManager/views.py b/dockerManager/views.py index b686d0108..976b27206 100755 --- a/dockerManager/views.py +++ b/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 diff --git a/emailMarketing/apps.py b/emailMarketing/apps.py index 251980df4..6de896393 100755 --- a/emailMarketing/apps.py +++ b/emailMarketing/apps.py @@ -7,4 +7,4 @@ class EmailmarketingConfig(AppConfig): name = 'emailMarketing' def ready(self): - import signals + from . import signals diff --git a/emailMarketing/emailMarketing.py b/emailMarketing/emailMarketing.py index c53e30874..701a4a24b 100755 --- a/emailMarketing/emailMarketing.py +++ b/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 diff --git a/emailMarketing/emailMarketingManager.py b/emailMarketing/emailMarketingManager.py index eb59339be..41e98f006 100755 --- a/emailMarketing/emailMarketingManager.py +++ b/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: diff --git a/emailMarketing/urls.py b/emailMarketing/urls.py index 45cf7606e..4d22a9206 100755 --- a/emailMarketing/urls.py +++ b/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'), diff --git a/emailMarketing/views.py b/emailMarketing/views.py index afcb46055..3aff6a5ff 100755 --- a/emailMarketing/views.py +++ b/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. diff --git a/emailPremium/urls.py b/emailPremium/urls.py index 2fde03c37..abb7ac027 100755 --- a/emailPremium/urls.py +++ b/emailPremium/urls.py @@ -1,5 +1,5 @@ from django.conf.urls import url -import views +from . import views urlpatterns = [ diff --git a/examplePlugin/apps.py b/examplePlugin/apps.py index cad74d831..dbda5f9af 100755 --- a/examplePlugin/apps.py +++ b/examplePlugin/apps.py @@ -8,4 +8,4 @@ class ExamplepluginConfig(AppConfig): name = 'examplePlugin' def ready(self): - import signals + from . import signals diff --git a/examplePlugin/urls.py b/examplePlugin/urls.py index 5c68f92d1..f0c4eea2e 100755 --- a/examplePlugin/urls.py +++ b/examplePlugin/urls.py @@ -1,5 +1,5 @@ from django.conf.urls import url -import views +from . import views urlpatterns = [ diff --git a/filemanager/urls.py b/filemanager/urls.py index 25a64655f..114469614 100755 --- a/filemanager/urls.py +++ b/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'), diff --git a/firewall/admin.py b/firewall/admin.py index eba54e2af..ae4fb368a 100755 --- a/firewall/admin.py +++ b/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) \ No newline at end of file diff --git a/firewall/pluginManager.py b/firewall/pluginManager.py index ccb002950..463afbd78 100755 --- a/firewall/pluginManager.py +++ b/firewall/pluginManager.py @@ -1,4 +1,4 @@ -from signals import * +from .signals import * from plogical.pluginManagerGlobal import pluginManagerGlobal class pluginManager: diff --git a/firewall/urls.py b/firewall/urls.py index 7c004d075..bdbfec1d4 100755 --- a/firewall/urls.py +++ b/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'), diff --git a/firewall/views.py b/firewall/views.py index 4d7bf4d58..7c9e68cd4 100755 --- a/firewall/views.py +++ b/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. diff --git a/ftp/admin.py b/ftp/admin.py index 68f74225e..496994814 100755 --- a/ftp/admin.py +++ b/ftp/admin.py @@ -2,7 +2,7 @@ from django.contrib import admin -import models +from . import models # Register your models here. diff --git a/ftp/ftpManager.py b/ftp/ftpManager.py index d0b381814..bdb028ae2 100755 --- a/ftp/ftpManager.py +++ b/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 diff --git a/ftp/pluginManager.py b/ftp/pluginManager.py index 275c1f7a5..baacfe757 100755 --- a/ftp/pluginManager.py +++ b/ftp/pluginManager.py @@ -1,4 +1,4 @@ -from signals import * +from .signals import * from plogical.pluginManagerGlobal import pluginManagerGlobal class pluginManager: diff --git a/ftp/urls.py b/ftp/urls.py index 46205a645..170bc36e2 100755 --- a/ftp/urls.py +++ b/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'), diff --git a/ftp/views.py b/ftp/views.py index 2e2c19383..0eaf41284 100755 --- a/ftp/views.py +++ b/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): diff --git a/install/firewallUtilities.py b/install/firewallUtilities.py index 8884eae16..0a4a24dec 100755 --- a/install/firewallUtilities.py +++ b/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) diff --git a/loginSystem/urls.py b/loginSystem/urls.py index 93585445a..091b0afb7 100755 --- a/loginSystem/urls.py +++ b/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'), diff --git a/loginSystem/views.py b/loginSystem/views.py index 8b84dbc25..d851fbbd3 100755 --- a/loginSystem/views.py +++ b/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 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 diff --git a/mailServer/mailserverManager.py b/mailServer/mailserverManager.py index ed266ca19..fea54757c 100755 --- a/mailServer/mailserverManager.py +++ b/mailServer/mailserverManager.py @@ -8,7 +8,7 @@ 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 diff --git a/mailServer/pluginManager.py b/mailServer/pluginManager.py index fab06b5a0..7b9107a8c 100755 --- a/mailServer/pluginManager.py +++ b/mailServer/pluginManager.py @@ -1,4 +1,4 @@ -from signals import * +from .signals import * from plogical.pluginManagerGlobal import pluginManagerGlobal class pluginManager: diff --git a/mailServer/urls.py b/mailServer/urls.py index 6d4680075..74d902484 100755 --- a/mailServer/urls.py +++ b/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'), diff --git a/mailServer/views.py b/mailServer/views.py index cf0c2ad02..337567c07 100755 --- a/mailServer/views.py +++ b/mailServer/views.py @@ -5,8 +5,8 @@ from django.http import HttpResponse from loginSystem.views import loadLoginPage import json -from mailserverManager import MailServerManager -from pluginManager import pluginManager +from .mailserverManager import MailServerManager +from .pluginManager import pluginManager def loadEmailHome(request): try: diff --git a/managePHP/admin.py b/managePHP/admin.py index 20da422e0..ca64a0bcd 100755 --- a/managePHP/admin.py +++ b/managePHP/admin.py @@ -1,7 +1,7 @@ from django.contrib import admin -import models +from . import models # Register your models here. diff --git a/managePHP/urls.py b/managePHP/urls.py index 28360c444..6d2a1a83b 100755 --- a/managePHP/urls.py +++ b/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'), diff --git a/managePHP/views.py b/managePHP/views.py index 7a157bad7..e145b10bf 100755 --- a/managePHP/views.py +++ b/managePHP/views.py @@ -20,7 +20,7 @@ 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. diff --git a/manageSSL/urls.py b/manageSSL/urls.py index 01488e1c6..84488c724 100755 --- a/manageSSL/urls.py +++ b/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'), diff --git a/manageServices/urls.py b/manageServices/urls.py index 23f3a31bf..04a34f863 100755 --- a/manageServices/urls.py +++ b/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'), diff --git a/manageServices/views.py b/manageServices/views.py index 1a6b96549..1facec6a0 100755 --- a/manageServices/views.py +++ b/manageServices/views.py @@ -9,7 +9,7 @@ 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. diff --git a/packages/admin.py b/packages/admin.py index dd4a2dda5..75c68f72c 100755 --- a/packages/admin.py +++ b/packages/admin.py @@ -5,6 +5,6 @@ # Register your models here. from django.contrib import admin -import models +from . import models # Register your models here. admin.site.register(models.Package) \ No newline at end of file diff --git a/packages/pluginManager.py b/packages/pluginManager.py index 56d52db88..547d8be44 100755 --- a/packages/pluginManager.py +++ b/packages/pluginManager.py @@ -1,4 +1,4 @@ -from signals import * +from .signals import * from plogical.pluginManagerGlobal import pluginManagerGlobal class pluginManager: diff --git a/packages/urls.py b/packages/urls.py index 0f680c58d..fe335e206 100755 --- a/packages/urls.py +++ b/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'), diff --git a/packages/views.py b/packages/views.py index db4e6fe75..825dbc066 100755 --- a/packages/views.py +++ b/packages/views.py @@ -3,8 +3,8 @@ from django.shortcuts import redirect from loginSystem.views import loadLoginPage -from packagesManager import PackagesManager -from pluginManager import pluginManager +from .packagesManager import PackagesManager +from .pluginManager import pluginManager # Create your views here. diff --git a/plogical/acl.py b/plogical/acl.py index a85fe7e08..51db810b5 100755 --- a/plogical/acl.py +++ b/plogical/acl.py @@ -12,7 +12,7 @@ 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: diff --git a/plogical/applicationInstaller.py b/plogical/applicationInstaller.py index 8d9f8747f..0ade2d67a 100755 --- a/plogical/applicationInstaller.py +++ b/plogical/applicationInstaller.py @@ -9,12 +9,12 @@ 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 mysqlUtilities import mysqlUtilities +from . import randomPassword +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 diff --git a/plogical/backupManager.py b/plogical/backupManager.py index fbe7f6e5f..b70f49164 100644 --- a/plogical/backupManager.py +++ b/plogical/backupManager.py @@ -7,15 +7,15 @@ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings") django.setup() import json -from acl import ACLManager -import CyberCPLogFileWriter as logging +from .acl import ACLManager +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 diff --git a/plogical/backupSchedule.py b/plogical/backupSchedule.py index 6cacb00ff..da83781bb 100755 --- a/plogical/backupSchedule.py +++ b/plogical/backupSchedule.py @@ -5,12 +5,12 @@ 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 diff --git a/plogical/backupScheduleLocal.py b/plogical/backupScheduleLocal.py index 5cc924e03..3c345aaf4 100755 --- a/plogical/backupScheduleLocal.py +++ b/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 diff --git a/plogical/backupUtilities.py b/plogical/backupUtilities.py index 7c141ceb3..cba936331 100755 --- a/plogical/backupUtilities.py +++ b/plogical/backupUtilities.py @@ -7,19 +7,19 @@ 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 sslUtilities import sslUtilities + from .virtualHostUtilities import virtualHostUtilities + from .sslUtilities import sslUtilities from plogical.mailUtilities import mailUtilities except: pass @@ -35,7 +35,7 @@ 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: diff --git a/plogical/cronUtil.py b/plogical/cronUtil.py index f80d64d1f..a97da493a 100755 --- a/plogical/cronUtil.py +++ b/plogical/cronUtil.py @@ -1,5 +1,5 @@ import argparse -from processUtilities import ProcessUtilities +from .processUtilities import ProcessUtilities class CronUtil: diff --git a/plogical/csf.py b/plogical/csf.py index 929940e08..ce6798547 100755 --- a/plogical/csf.py +++ b/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 diff --git a/plogical/dnsUtilities.py b/plogical/dnsUtilities.py index e634c73a0..ad60309da 100755 --- a/plogical/dnsUtilities.py +++ b/plogical/dnsUtilities.py @@ -7,12 +7,12 @@ 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 diff --git a/plogical/filemanager.py b/plogical/filemanager.py index 70745cacb..a6a25e599 100755 --- a/plogical/filemanager.py +++ b/plogical/filemanager.py @@ -1,4 +1,4 @@ -import CyberCPLogFileWriter as logging +from . import CyberCPLogFileWriter as logging import argparse from random import randint diff --git a/plogical/findBWUsage.py b/plogical/findBWUsage.py index f62d65f6d..046857f95 100755 --- a/plogical/findBWUsage.py +++ b/plogical/findBWUsage.py @@ -1,5 +1,5 @@ import os -import CyberCPLogFileWriter as logging +from . import CyberCPLogFileWriter as logging import shlex import subprocess class findBWUsage: diff --git a/plogical/ftpUtilities.py b/plogical/ftpUtilities.py index 61522b357..3fd045ac8 100755 --- a/plogical/ftpUtilities.py +++ b/plogical/ftpUtilities.py @@ -4,9 +4,9 @@ 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 diff --git a/plogical/installUtilities.py b/plogical/installUtilities.py index 0ef088732..f2937fcaa 100755 --- a/plogical/installUtilities.py +++ b/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: diff --git a/plogical/mailUtilities.py b/plogical/mailUtilities.py index 654e3eae9..7b25eed9d 100755 --- a/plogical/mailUtilities.py +++ b/plogical/mailUtilities.py @@ -8,11 +8,11 @@ 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 diff --git a/plogical/modSec.py b/plogical/modSec.py index fe6cc9afe..836f1edc5 100755 --- a/plogical/modSec.py +++ b/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 processUtilities import ProcessUtilities +from .mailUtilities import mailUtilities +from .processUtilities import ProcessUtilities from plogical.installUtilities import installUtilities class modSec: diff --git a/plogical/mysqlUtilities.py b/plogical/mysqlUtilities.py index 47f5e7e9f..f505d1627 100755 --- a/plogical/mysqlUtilities.py +++ b/plogical/mysqlUtilities.py @@ -6,7 +6,7 @@ django.setup() except: pass -import CyberCPLogFileWriter as logging +from . import CyberCPLogFileWriter as logging import subprocess import shlex try: diff --git a/plogical/phpUtilities.py b/plogical/phpUtilities.py index 2aa0ef6af..a981e68cc 100755 --- a/plogical/phpUtilities.py +++ b/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 processUtilities import ProcessUtilities +from .mailUtilities import mailUtilities +from .processUtilities import ProcessUtilities class phpUtilities: diff --git a/plogical/pluginManagerGlobal.py b/plogical/pluginManagerGlobal.py index aad75f0e1..2bad06043 100755 --- a/plogical/pluginManagerGlobal.py +++ b/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: diff --git a/plogical/processUtilities.py b/plogical/processUtilities.py index 00d713f3d..4d7fd8382 100755 --- a/plogical/processUtilities.py +++ b/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 diff --git a/plogical/remoteBackup.py b/plogical/remoteBackup.py index 02b99589e..30650bdbc 100755 --- a/plogical/remoteBackup.py +++ b/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 diff --git a/plogical/remoteTransferUtilities.py b/plogical/remoteTransferUtilities.py index 2aff062b0..2bafe120b 100755 --- a/plogical/remoteTransferUtilities.py +++ b/plogical/remoteTransferUtilities.py @@ -1,7 +1,7 @@ import argparse import os -import CyberCPLogFileWriter as logging -import backupUtilities as backupUtil +from . import CyberCPLogFileWriter as logging +from . import backupUtilities as backupUtil import time from multiprocessing import Process import json @@ -11,7 +11,7 @@ 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: diff --git a/plogical/serverLogs.py b/plogical/serverLogs.py index 2788db484..e5e91af31 100755 --- a/plogical/serverLogs.py +++ b/plogical/serverLogs.py @@ -1,4 +1,4 @@ -import CyberCPLogFileWriter as logging +from . import CyberCPLogFileWriter as logging import argparse class serverLogs: diff --git a/plogical/sslUtilities.py b/plogical/sslUtilities.py index b86332770..a29a7b0ae 100755 --- a/plogical/sslUtilities.py +++ b/plogical/sslUtilities.py @@ -1,4 +1,4 @@ -import CyberCPLogFileWriter as logging +from . import CyberCPLogFileWriter as logging import os import shlex import subprocess diff --git a/plogical/tuning.py b/plogical/tuning.py index 1f3919510..4838fe9ef 100755 --- a/plogical/tuning.py +++ b/plogical/tuning.py @@ -1,9 +1,9 @@ -import CyberCPLogFileWriter as logging -from installUtilities import installUtilities +from . import CyberCPLogFileWriter as logging +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: diff --git a/plogical/vhost.py b/plogical/vhost.py index ca9165f3e..4638f0afd 100755 --- a/plogical/vhost.py +++ b/plogical/vhost.py @@ -10,18 +10,18 @@ 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 dnsUtilities import DNS +from .mysqlUtilities import mysqlUtilities +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 diff --git a/plogical/virtualHostUtilities.py b/plogical/virtualHostUtilities.py index 01b1e625b..bd57b508e 100755 --- a/plogical/virtualHostUtilities.py +++ b/plogical/virtualHostUtilities.py @@ -14,8 +14,8 @@ import shutil import argparse -import installUtilities -import sslUtilities +from . import installUtilities +from . import sslUtilities from os.path import join from os import listdir, rmdir from shutil import move @@ -23,12 +23,12 @@ import subprocess import shlex from plogical.mailUtilities import mailUtilities -import CyberCPLogFileWriter as logging -from dnsUtilities import DNS -from vhost import vhost -from applicationInstaller import ApplicationInstaller -from acl import ACLManager -from processUtilities import ProcessUtilities +from . import CyberCPLogFileWriter as logging +from .dnsUtilities import DNS +from .vhost import vhost +from .applicationInstaller import ApplicationInstaller +from .acl import ACLManager +from .processUtilities import ProcessUtilities from ApachController.ApacheController import ApacheController from ApachController.ApacheVhosts import ApacheVhost from managePHP.phpManager import PHPManager diff --git a/plogical/website.py b/plogical/website.py index d26af29dc..acd48fe14 100755 --- a/plogical/website.py +++ b/plogical/website.py @@ -8,31 +8,31 @@ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings") django.setup() import json -from acl import ACLManager -import CyberCPLogFileWriter as logging +from .acl import ACLManager +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 diff --git a/pluginHolder/urls.py b/pluginHolder/urls.py index 0a33bc3c9..b975e079d 100755 --- a/pluginHolder/urls.py +++ b/pluginHolder/urls.py @@ -1,6 +1,6 @@ from django.conf.urls import url -import views +from . import views urlpatterns = [ diff --git a/postfixSenderPolicy/accept_traffic.py b/postfixSenderPolicy/accept_traffic.py index 778410b5b..9c20572d2 100755 --- a/postfixSenderPolicy/accept_traffic.py +++ b/postfixSenderPolicy/accept_traffic.py @@ -6,11 +6,11 @@ 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) diff --git a/postfixSenderPolicy/startServer.py b/postfixSenderPolicy/startServer.py index a5098718b..3ebc612b9 100755 --- a/postfixSenderPolicy/startServer.py +++ b/postfixSenderPolicy/startServer.py @@ -6,10 +6,10 @@ 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 diff --git a/serverLogs/urls.py b/serverLogs/urls.py index bc7017a36..01a9c2b24 100755 --- a/serverLogs/urls.py +++ b/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'), diff --git a/serverStatus/urls.py b/serverStatus/urls.py index c2c59696b..cdd1224e0 100755 --- a/serverStatus/urls.py +++ b/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'), diff --git a/serverStatus/views.py b/serverStatus/views.py index 217a366a6..dae87051e 100755 --- a/serverStatus/views.py +++ b/serverStatus/views.py @@ -13,7 +13,7 @@ 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 diff --git a/tuning/urls.py b/tuning/urls.py index b0363f122..8eccf9958 100755 --- a/tuning/urls.py +++ b/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'), diff --git a/tuning/views.py b/tuning/views.py index eee9dfbd5..0e86d44ff 100755 --- a/tuning/views.py +++ b/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. diff --git a/userManagment/urls.py b/userManagment/urls.py index 77743648e..ff506accf 100755 --- a/userManagment/urls.py +++ b/userManagment/urls.py @@ -1,5 +1,5 @@ from django.conf.urls import url -import views +from . import views urlpatterns = [ diff --git a/websiteFunctions/admin.py b/websiteFunctions/admin.py index 9f27f8e5b..02a92fbcc 100755 --- a/websiteFunctions/admin.py +++ b/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) \ No newline at end of file diff --git a/websiteFunctions/pluginManager.py b/websiteFunctions/pluginManager.py index 1659ac516..55009cfd6 100755 --- a/websiteFunctions/pluginManager.py +++ b/websiteFunctions/pluginManager.py @@ -1,4 +1,4 @@ -from signals import * +from .signals import * from plogical.pluginManagerGlobal import pluginManagerGlobal class pluginManager: diff --git a/websiteFunctions/urls.py b/websiteFunctions/urls.py index 5441dddf2..c59d536cb 100755 --- a/websiteFunctions/urls.py +++ b/websiteFunctions/urls.py @@ -1,5 +1,5 @@ from django.conf.urls import url -import views +from . import views urlpatterns = [ diff --git a/websiteFunctions/website.py b/websiteFunctions/website.py index 07ab0a253..3a0dbcb69 100755 --- a/websiteFunctions/website.py +++ b/websiteFunctions/website.py @@ -38,7 +38,7 @@ from plogical.cronUtil import CronUtil from re import match,I,M from plogical import randomPassword -from StagingSetup import StagingSetup +from .StagingSetup import StagingSetup class WebsiteManager: