From eac2efe9eb4613cc046bb2d4b69758cccb8b9004 Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Fri, 8 Nov 2019 22:22:11 +0500
Subject: [PATCH] bug fix: redirect to login

---
 mailServer/mailserverManager.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/mailServer/mailserverManager.py b/mailServer/mailserverManager.py
index ce081ae3a..919e27e15 100755
--- a/mailServer/mailserverManager.py
+++ b/mailServer/mailserverManager.py
@@ -56,8 +56,7 @@ class MailServerManager:
             return render(self.request, 'mailServer/createEmailAccount.html',
                           {'websiteList': websitesName, "status": 1})
         except BaseException, msg:
-            logging.CyberCPLogFileWriter.writeToFile(str(msg))
-            return HttpResponse(str(msg))
+            return redirect(loadLoginPage)
 
 
     def listEmails(self):
@@ -138,8 +137,7 @@ class MailServerManager:
             return render(self.request, 'mailServer/deleteEmailAccount.html',
                           {'websiteList': websitesName, "status": 1})
         except BaseException, msg:
-            logging.CyberCPLogFileWriter.writeToFile(str(msg))
-            return HttpResponse(str(msg))
+            return redirect(loadLoginPage)
 
     def getEmailsForDomain(self):
         try:
@@ -243,7 +241,7 @@ class MailServerManager:
 
             return render(self.request, 'mailServer/emailForwarding.html', {'websiteList': websitesName, "status": 1})
         except BaseException, msg:
-            return HttpResponse(str(msg))
+            return redirect(loadLoginPage)
 
     def fetchCurrentForwardings(self):
         try:
@@ -519,7 +517,7 @@ class MailServerManager:
             return render(self.request, 'mailServer/changeEmailPassword.html',
                           {'websiteList': websitesName, "status": 1})
         except BaseException, msg:
-            return HttpResponse(str(msg))
+            return redirect(loadLoginPage)
 
     def submitPasswordChange(self):
         try:
@@ -587,7 +585,7 @@ class MailServerManager:
                           {'websiteList': websitesName, 'openDKIMInstalled': openDKIMInstalled})
 
         except BaseException, msg:
-            return HttpResponse(str(msg))
+            return redirect(loadLoginPage)
 
     def fetchDKIMKeys(self):
         try: