From bb5e6ffc97731629dcfa3943015c59ee7401c6c6 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Sat, 6 Mar 2021 11:25:47 +0500 Subject: [PATCH] further refoctor default render mailserver --- IncBackups/views.py | 2 - mailServer/mailserverManager.py | 159 +++++++++++++------------------- 2 files changed, 63 insertions(+), 98 deletions(-) diff --git a/IncBackups/views.py b/IncBackups/views.py index ee1d45f53..399cd0bfd 100644 --- a/IncBackups/views.py +++ b/IncBackups/views.py @@ -6,8 +6,6 @@ from pathlib import Path from random import randint from django.shortcuts import HttpResponse, redirect -from django.shortcuts import render - from loginSystem.models import Administrator from loginSystem.views import loadLoginPage from plogical.CyberCPLogFileWriter import CyberCPLogFileWriter as logging diff --git a/mailServer/mailserverManager.py b/mailServer/mailserverManager.py index 4245c7342..d16fbd6b9 100755 --- a/mailServer/mailserverManager.py +++ b/mailServer/mailserverManager.py @@ -58,53 +58,42 @@ class MailServerManager(multi.Thread): logging.CyberCPLogFileWriter.writeToFile(str(msg) + ' [MailServerManager.run]') def loadEmailHome(self): - try: - proc = httpProc(self.request, 'mailServer/index.html', - None, 'createEmail') - return proc.render() - except KeyError: - return redirect(loadLoginPage) + proc = httpProc(self.request, 'mailServer/index.html', + None, 'createEmail') + return proc.render() def createEmailAccount(self): - try: - userID = self.request.session['userID'] - currentACL = ACLManager.loadedACL(userID) - - if not os.path.exists('/home/cyberpanel/postfix'): - proc = httpProc(self.request, 'mailServer/createEmailAccount.html', - { "status": 0}, 'createEmail') - return proc.render() - - websitesName = ACLManager.findAllSites(currentACL, userID) - websitesName = websitesName + ACLManager.findChildDomains(websitesName) + userID = self.request.session['userID'] + currentACL = ACLManager.loadedACL(userID) + if not os.path.exists('/home/cyberpanel/postfix'): proc = httpProc(self.request, 'mailServer/createEmailAccount.html', - {'websiteList': websitesName, "status": 1}, 'createEmail') + {"status": 0}, 'createEmail') return proc.render() - except BaseException as msg: - return redirect(loadLoginPage) + websitesName = ACLManager.findAllSites(currentACL, userID) + websitesName = websitesName + ACLManager.findChildDomains(websitesName) + + proc = httpProc(self.request, 'mailServer/createEmailAccount.html', + {'websiteList': websitesName, "status": 1}, 'createEmail') + return proc.render() def listEmails(self): - try: - userID = self.request.session['userID'] - currentACL = ACLManager.loadedACL(userID) - - if not os.path.exists('/home/cyberpanel/postfix'): - proc = httpProc(self.request, 'mailServer/listEmails.html', - { "status": 0}, 'listEmails') - return proc.render() - - websitesName = ACLManager.findAllSites(currentACL, userID) - websitesName = websitesName + ACLManager.findChildDomains(websitesName) + userID = self.request.session['userID'] + currentACL = ACLManager.loadedACL(userID) + if not os.path.exists('/home/cyberpanel/postfix'): proc = httpProc(self.request, 'mailServer/listEmails.html', - {'websiteList': websitesName, "status": 1}, 'listEmails') + {"status": 0}, 'listEmails') return proc.render() - except BaseException as msg: - return redirect(loadLoginPage) + websitesName = ACLManager.findAllSites(currentACL, userID) + websitesName = websitesName + ACLManager.findChildDomains(websitesName) + + proc = httpProc(self.request, 'mailServer/listEmails.html', + {'websiteList': websitesName, "status": 1}, 'listEmails') + return proc.render() def submitEmailCreation(self): try: @@ -148,26 +137,20 @@ class MailServerManager(multi.Thread): return HttpResponse(json_data) def deleteEmailAccount(self): - try: - - userID = self.request.session['userID'] - currentACL = ACLManager.loadedACL(userID) - - - if not os.path.exists('/home/cyberpanel/postfix'): - proc = httpProc(self.request, 'mailServer/deleteEmailAccount.html', - { "status": 0}, 'deleteEmail') - return proc.render() - - websitesName = ACLManager.findAllSites(currentACL, userID) - websitesName = websitesName + ACLManager.findChildDomains(websitesName) + userID = self.request.session['userID'] + currentACL = ACLManager.loadedACL(userID) + if not os.path.exists('/home/cyberpanel/postfix'): proc = httpProc(self.request, 'mailServer/deleteEmailAccount.html', - {'websiteList': websitesName, "status": 1}, 'deleteEmail') + {"status": 0}, 'deleteEmail') return proc.render() - except BaseException as msg: - return redirect(loadLoginPage) + websitesName = ACLManager.findAllSites(currentACL, userID) + websitesName = websitesName + ACLManager.findChildDomains(websitesName) + + proc = httpProc(self.request, 'mailServer/deleteEmailAccount.html', + {'websiteList': websitesName, "status": 1}, 'deleteEmail') + return proc.render() def getEmailsForDomain(self): try: @@ -292,23 +275,20 @@ class MailServerManager(multi.Thread): return HttpResponse(json_data) def emailForwarding(self): - try: - userID = self.request.session['userID'] - currentACL = ACLManager.loadedACL(userID) - - if not os.path.exists('/home/cyberpanel/postfix'): - proc = httpProc(self.request, 'mailServer/emailForwarding.html', - { "status": 0}, 'emailForwarding') - return proc.render() - - websitesName = ACLManager.findAllSites(currentACL, userID) - websitesName = websitesName + ACLManager.findChildDomains(websitesName) + userID = self.request.session['userID'] + currentACL = ACLManager.loadedACL(userID) + if not os.path.exists('/home/cyberpanel/postfix'): proc = httpProc(self.request, 'mailServer/emailForwarding.html', - {'websiteList': websitesName, "status": 1}, 'emailForwarding') + {"status": 0}, 'emailForwarding') return proc.render() - except BaseException as msg: - return redirect(loadLoginPage) + + websitesName = ACLManager.findAllSites(currentACL, userID) + websitesName = websitesName + ACLManager.findChildDomains(websitesName) + + proc = httpProc(self.request, 'mailServer/emailForwarding.html', + {'websiteList': websitesName, "status": 1}, 'emailForwarding') + return proc.render() def fetchCurrentForwardings(self): try: @@ -582,26 +562,20 @@ class MailServerManager(multi.Thread): ####### def changeEmailAccountPassword(self): - try: - userID = self.request.session['userID'] - currentACL = ACLManager.loadedACL(userID) - - if ACLManager.currentContextPermission(currentACL, 'changeEmailPassword') == 0: - return ACLManager.loadError() - - if not os.path.exists('/home/cyberpanel/postfix'): - proc = httpProc(self.request, 'mailServer/changeEmailPassword.html', - {"status": 0}, 'changeEmailPassword') - return proc.render() - - websitesName = ACLManager.findAllSites(currentACL, userID) - websitesName = websitesName + ACLManager.findChildDomains(websitesName) + userID = self.request.session['userID'] + currentACL = ACLManager.loadedACL(userID) + if not os.path.exists('/home/cyberpanel/postfix'): proc = httpProc(self.request, 'mailServer/changeEmailPassword.html', - {'websiteList': websitesName, "status": 1}, 'changeEmailPassword') + {"status": 0}, 'changeEmailPassword') return proc.render() - except BaseException as msg: - return redirect(loadLoginPage) + + websitesName = ACLManager.findAllSites(currentACL, userID) + websitesName = websitesName + ACLManager.findChildDomains(websitesName) + + proc = httpProc(self.request, 'mailServer/changeEmailPassword.html', + {'websiteList': websitesName, "status": 1}, 'changeEmailPassword') + return proc.render() def submitPasswordChange(self): try: @@ -653,24 +627,17 @@ class MailServerManager(multi.Thread): ####### def dkimManager(self): - try: - userID = self.request.session['userID'] - currentACL = ACLManager.loadedACL(userID) + userID = self.request.session['userID'] + currentACL = ACLManager.loadedACL(userID) - if ACLManager.currentContextPermission(currentACL, 'dkimManager') == 0: - return ACLManager.loadError() + openDKIMInstalled = 1 - openDKIMInstalled = 1 + websitesName = ACLManager.findAllSites(currentACL, userID) + websitesName = websitesName + ACLManager.findChildDomains(websitesName) - websitesName = ACLManager.findAllSites(currentACL, userID) - websitesName = websitesName + ACLManager.findChildDomains(websitesName) - - proc = httpProc(self.request, 'mailServer/dkimManager.html', - {'websiteList': websitesName, 'openDKIMInstalled': openDKIMInstalled}, 'dkimManager') - return proc.render() - - except BaseException as msg: - return redirect(loadLoginPage) + proc = httpProc(self.request, 'mailServer/dkimManager.html', + {'websiteList': websitesName, 'openDKIMInstalled': openDKIMInstalled}, 'dkimManager') + return proc.render() def fetchDKIMKeys(self): try: