From 3fb7236b43406d2b7f9a4ccd4e288a531451b5f6 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Wed, 3 Mar 2021 18:58:37 +0500 Subject: [PATCH] add default renderer to mailserver --- mailServer/mailserverManager.py | 71 +++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 29 deletions(-) diff --git a/mailServer/mailserverManager.py b/mailServer/mailserverManager.py index c76325ae5..4245c7342 100755 --- a/mailServer/mailserverManager.py +++ b/mailServer/mailserverManager.py @@ -3,6 +3,9 @@ import os.path import sys import django + +from plogical.httpProc import httpProc + sys.path.append('/usr/local/CyberCP') os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings") django.setup() @@ -56,8 +59,9 @@ class MailServerManager(multi.Thread): def loadEmailHome(self): try: - val = self.request.session['userID'] - return render(self.request, 'mailServer/index.html') + proc = httpProc(self.request, 'mailServer/index.html', + None, 'createEmail') + return proc.render() except KeyError: return redirect(loadLoginPage) @@ -67,17 +71,18 @@ class MailServerManager(multi.Thread): userID = self.request.session['userID'] currentACL = ACLManager.loadedACL(userID) - if ACLManager.currentContextPermission(currentACL, 'createEmail') == 0: - return ACLManager.loadError() - if not os.path.exists('/home/cyberpanel/postfix'): - return render(self.request, "mailServer/createEmailAccount.html", {"status": 0}) + proc = httpProc(self.request, 'mailServer/createEmailAccount.html', + { "status": 0}, 'createEmail') + return proc.render() websitesName = ACLManager.findAllSites(currentACL, userID) websitesName = websitesName + ACLManager.findChildDomains(websitesName) - return render(self.request, 'mailServer/createEmailAccount.html', - {'websiteList': websitesName, "status": 1}) + proc = httpProc(self.request, 'mailServer/createEmailAccount.html', + {'websiteList': websitesName, "status": 1}, 'createEmail') + return proc.render() + except BaseException as msg: return redirect(loadLoginPage) @@ -86,17 +91,18 @@ class MailServerManager(multi.Thread): userID = self.request.session['userID'] currentACL = ACLManager.loadedACL(userID) - if ACLManager.currentContextPermission(currentACL, 'listEmails') == 0: - return ACLManager.loadError() - if not os.path.exists('/home/cyberpanel/postfix'): - return render(self.request, "mailServer/listEmails.html", {"status": 0}) + proc = httpProc(self.request, 'mailServer/listEmails.html', + { "status": 0}, 'listEmails') + return proc.render() websitesName = ACLManager.findAllSites(currentACL, userID) websitesName = websitesName + ACLManager.findChildDomains(websitesName) - return render(self.request, 'mailServer/listEmails.html', - {'websiteList': websitesName, "status": 1}) + proc = httpProc(self.request, 'mailServer/listEmails.html', + {'websiteList': websitesName, "status": 1}, 'listEmails') + return proc.render() + except BaseException as msg: return redirect(loadLoginPage) @@ -147,17 +153,19 @@ class MailServerManager(multi.Thread): userID = self.request.session['userID'] currentACL = ACLManager.loadedACL(userID) - if ACLManager.currentContextPermission(currentACL, 'deleteEmail') == 0: - return ACLManager.loadError() if not os.path.exists('/home/cyberpanel/postfix'): - return render(self.request, "mailServer/deleteEmailAccount.html", {"status": 0}) + proc = httpProc(self.request, 'mailServer/deleteEmailAccount.html', + { "status": 0}, 'deleteEmail') + return proc.render() websitesName = ACLManager.findAllSites(currentACL, userID) websitesName = websitesName + ACLManager.findChildDomains(websitesName) - return render(self.request, 'mailServer/deleteEmailAccount.html', - {'websiteList': websitesName, "status": 1}) + proc = httpProc(self.request, 'mailServer/deleteEmailAccount.html', + {'websiteList': websitesName, "status": 1}, 'deleteEmail') + return proc.render() + except BaseException as msg: return redirect(loadLoginPage) @@ -288,16 +296,17 @@ class MailServerManager(multi.Thread): userID = self.request.session['userID'] currentACL = ACLManager.loadedACL(userID) - if ACLManager.currentContextPermission(currentACL, 'emailForwarding') == 0: - return ACLManager.loadError() - if not os.path.exists('/home/cyberpanel/postfix'): - return render(self.request, "mailServer/emailForwarding.html", {"status": 0}) + proc = httpProc(self.request, 'mailServer/emailForwarding.html', + { "status": 0}, 'emailForwarding') + return proc.render() websitesName = ACLManager.findAllSites(currentACL, userID) websitesName = websitesName + ACLManager.findChildDomains(websitesName) - return render(self.request, 'mailServer/emailForwarding.html', {'websiteList': websitesName, "status": 1}) + proc = httpProc(self.request, 'mailServer/emailForwarding.html', + {'websiteList': websitesName, "status": 1}, 'emailForwarding') + return proc.render() except BaseException as msg: return redirect(loadLoginPage) @@ -581,13 +590,16 @@ class MailServerManager(multi.Thread): return ACLManager.loadError() if not os.path.exists('/home/cyberpanel/postfix'): - return render(self.request, "mailServer/changeEmailPassword.html", {"status": 0}) + proc = httpProc(self.request, 'mailServer/changeEmailPassword.html', + {"status": 0}, 'changeEmailPassword') + return proc.render() websitesName = ACLManager.findAllSites(currentACL, userID) websitesName = websitesName + ACLManager.findChildDomains(websitesName) - return render(self.request, 'mailServer/changeEmailPassword.html', - {'websiteList': websitesName, "status": 1}) + proc = httpProc(self.request, 'mailServer/changeEmailPassword.html', + {'websiteList': websitesName, "status": 1}, 'changeEmailPassword') + return proc.render() except BaseException as msg: return redirect(loadLoginPage) @@ -653,8 +665,9 @@ class MailServerManager(multi.Thread): websitesName = ACLManager.findAllSites(currentACL, userID) websitesName = websitesName + ACLManager.findChildDomains(websitesName) - return render(self.request, 'mailServer/dkimManager.html', - {'websiteList': websitesName, 'openDKIMInstalled': openDKIMInstalled}) + proc = httpProc(self.request, 'mailServer/dkimManager.html', + {'websiteList': websitesName, 'openDKIMInstalled': openDKIMInstalled}, 'dkimManager') + return proc.render() except BaseException as msg: return redirect(loadLoginPage)