From 7067ec3cd1e928c0d46f3e0d5f825861400df43f Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Wed, 3 Mar 2021 19:02:42 +0500 Subject: [PATCH] add default renderer to phpmanager --- managePHP/views.py | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/managePHP/views.py b/managePHP/views.py index 9f672a3c9..2549da31a 100755 --- a/managePHP/views.py +++ b/managePHP/views.py @@ -20,6 +20,7 @@ from xml.etree import ElementTree from plogical.acl import ACLManager from plogical.processUtilities import ProcessUtilities from .phpManager import PHPManager +from plogical.httpProc import httpProc # Create your views here. @@ -29,12 +30,10 @@ def loadPHPHome(request): userID = request.session['userID'] currentACL = ACLManager.loadedACL(userID) - if currentACL['admin'] == 1: - pass - else: - return ACLManager.loadError() + proc = httpProc(request, 'managePHP/index.html', + None, 'admin') + return proc.render() - return render(request, 'managePHP/index.html') except KeyError: return redirect(loadLoginPage) @@ -43,11 +42,6 @@ def installExtensions(request): userID = request.session['userID'] currentACL = ACLManager.loadedACL(userID) - if currentACL['admin'] == 1: - pass - else: - return ACLManager.loadError() - if PHP.objects.count() == 0: for i in range(3, 7): php = "php" + str(5) + str(i) @@ -1247,7 +1241,10 @@ def installExtensions(request): except: pass - return render(request, 'managePHP/installExtensions.html', {'phps': PHPManager.findPHPVersions()}) + proc = httpProc(request, 'managePHP/installExtensions.html', + {'phps': PHPManager.findPHPVersions()}, 'admin') + return proc.render() + except KeyError: return redirect(loadLoginPage) @@ -1601,14 +1598,10 @@ def getRequestStatusApache(request): def editPHPConfigs(request): try: userID = request.session['userID'] - currentACL = ACLManager.loadedACL(userID) + proc = httpProc(request, 'managePHP/editPHPConfig.html', + {'phps': PHPManager.findPHPVersions()}, 'admin') + return proc.render() - if currentACL['admin'] == 1: - pass - else: - return ACLManager.loadError() - - return render(request, 'managePHP/editPHPConfig.html', {'phps': PHPManager.findPHPVersions()}) except KeyError: return redirect(loadLoginPage) @@ -1695,7 +1688,9 @@ def getCurrentPHPConfig(request): return HttpResponse(final_json) - return render(request, 'managePHP/editPHPConfig.html') + proc = httpProc(request, 'managePHP/editPHPConfig.html', + None, 'admin') + return proc.render() except KeyError: return redirect(loadLoginPage)