Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-06 21:35:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

further refoctor default render

Browse Source
This commit is contained in:
Usman Nasir
2021-03-03 21:15:23 +05:00
parent b9e0a29a37
commit 8dde79dead
5 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
baseTemplate/views.py
View File

@@ -66,7 +66,6 @@ def getAdminStatus(request):
def getSystemStatus(request): def getSystemStatus(request):
try: try:
HTTPData = SystemInformation.getSystemInformation() HTTPData = SystemInformation.getSystemInformation()
json_data = json.dumps(HTTPData) json_data = json.dumps(HTTPData)
return HttpResponse(json_data) return HttpResponse(json_data)
@@ -79,11 +78,8 @@ def getLoadAverage(request):
one = loadAverage[0] one = loadAverage[0]
two = loadAverage[1] two = loadAverage[1]
three = loadAverage[2] three = loadAverage[2]
loadAvg = {"one": one, "two": two,"three": three} loadAvg = {"one": one, "two": two,"three": three}
json_data = json.dumps(loadAvg) json_data = json.dumps(loadAvg)
return HttpResponse(json_data) return HttpResponse(json_data)
@ensure_csrf_cookie @ensure_csrf_cookie
@@ -91,9 +87,7 @@ def versionManagment(request):
## Get latest version ## Get latest version
getVersion = requests.get('https://cyberpanel.net/version.txt') getVersion = requests.get('https://cyberpanel.net/version.txt')
latest = getVersion.json() latest = getVersion.json()
latestVersion = latest['version'] latestVersion = latest['version']
latestBuild = latest['build'] latestBuild = latest['build']

1
containerization/containerManager.py
View File

@@ -1,4 +1,3 @@
from django.shortcuts import render
from plogical.processUtilities import ProcessUtilities from plogical.processUtilities import ProcessUtilities
import threading as multi import threading as multi
from plogical.acl import ACLManager from plogical.acl import ACLManager

3
dns/dnsManager.py
View File

@@ -113,10 +113,12 @@ class DNSManager:
return HttpResponse(final_json) return HttpResponse(final_json)
def createDNSZone(self, request = None, userID = None): def createDNSZone(self, request = None, userID = None):
if os.path.exists('/home/cyberpanel/powerdns'): if os.path.exists('/home/cyberpanel/powerdns'):
finalData = {'status': 1} finalData = {'status': 1}
else: else:
finalData = {'status': 0} finalData = {'status': 0}
template = 'dns/createDNSZone.html' template = 'dns/createDNSZone.html'
proc = httpProc(request, template, finalData, 'createDNSZone') proc = httpProc(request, template, finalData, 'createDNSZone')
return proc.render() return proc.render()
@@ -158,6 +160,7 @@ class DNSManager:
def addDeleteDNSRecords(self, request = None, userID = None): def addDeleteDNSRecords(self, request = None, userID = None):
currentACL = ACLManager.loadedACL(userID) currentACL = ACLManager.loadedACL(userID)
if not os.path.exists('/home/cyberpanel/powerdns'): if not os.path.exists('/home/cyberpanel/powerdns'):
finalData = {"status": 0} finalData = {"status": 0}
else: else:

5
dockerManager/container.py
View File

@@ -1,13 +1,8 @@
#!/usr/local/CyberCP/bin/python #!/usr/local/CyberCP/bin/python
import os
import os.path import os.path
import sys import sys
import django import django
import mimetypes
from plogical.httpProc import httpProc
sys.path.append('/usr/local/CyberCP') sys.path.append('/usr/local/CyberCP')
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings") os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings")
django.setup() django.setup()

1
dockerManager/views.py
View File

@@ -29,7 +29,6 @@ def loadDockerHome(request):
userID = request.session['userID'] userID = request.session['userID']
admin = Administrator.objects.get(pk=userID) admin = Administrator.objects.get(pk=userID)
template = 'dockerManager/index.html' template = 'dockerManager/index.html'
proc = httpProc(request, template, {"type": admin.type}, 'admin') proc = httpProc(request, template, {"type": admin.type}, 'admin')
return proc.render() return proc.render()