diff --git a/baseTemplate/views.py b/baseTemplate/views.py index 74d18de28..4395a7009 100755 --- a/baseTemplate/views.py +++ b/baseTemplate/views.py @@ -66,7 +66,6 @@ def getAdminStatus(request): def getSystemStatus(request): try: - HTTPData = SystemInformation.getSystemInformation() json_data = json.dumps(HTTPData) return HttpResponse(json_data) @@ -79,11 +78,8 @@ def getLoadAverage(request): one = loadAverage[0] two = loadAverage[1] three = loadAverage[2] - loadAvg = {"one": one, "two": two,"three": three} - json_data = json.dumps(loadAvg) - return HttpResponse(json_data) @ensure_csrf_cookie @@ -91,9 +87,7 @@ def versionManagment(request): ## Get latest version getVersion = requests.get('https://cyberpanel.net/version.txt') - latest = getVersion.json() - latestVersion = latest['version'] latestBuild = latest['build'] diff --git a/containerization/containerManager.py b/containerization/containerManager.py index 8922516a5..f86c1f636 100755 --- a/containerization/containerManager.py +++ b/containerization/containerManager.py @@ -1,4 +1,3 @@ -from django.shortcuts import render from plogical.processUtilities import ProcessUtilities import threading as multi from plogical.acl import ACLManager diff --git a/dns/dnsManager.py b/dns/dnsManager.py index 05009251c..bbb507607 100755 --- a/dns/dnsManager.py +++ b/dns/dnsManager.py @@ -113,10 +113,12 @@ class DNSManager: return HttpResponse(final_json) def createDNSZone(self, request = None, userID = None): + if os.path.exists('/home/cyberpanel/powerdns'): finalData = {'status': 1} else: finalData = {'status': 0} + template = 'dns/createDNSZone.html' proc = httpProc(request, template, finalData, 'createDNSZone') return proc.render() @@ -158,6 +160,7 @@ class DNSManager: def addDeleteDNSRecords(self, request = None, userID = None): currentACL = ACLManager.loadedACL(userID) + if not os.path.exists('/home/cyberpanel/powerdns'): finalData = {"status": 0} else: diff --git a/dockerManager/container.py b/dockerManager/container.py index 8cc1ceb73..71d251e44 100755 --- a/dockerManager/container.py +++ b/dockerManager/container.py @@ -1,13 +1,8 @@ #!/usr/local/CyberCP/bin/python -import os import os.path import sys import django -import mimetypes - -from plogical.httpProc import httpProc - sys.path.append('/usr/local/CyberCP') os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings") django.setup() diff --git a/dockerManager/views.py b/dockerManager/views.py index ed871a900..2e58b9f33 100755 --- a/dockerManager/views.py +++ b/dockerManager/views.py @@ -29,7 +29,6 @@ def loadDockerHome(request): userID = request.session['userID'] admin = Administrator.objects.get(pk=userID) template = 'dockerManager/index.html' - proc = httpProc(request, template, {"type": admin.type}, 'admin') return proc.render()