diff --git a/emailPremium/views.py b/emailPremium/views.py index b99d820f5..566ef17d6 100755 --- a/emailPremium/views.py +++ b/emailPremium/views.py @@ -1890,12 +1890,18 @@ def RunServerLevelEmailChecks(request): else: return ACLManager.loadErrorJson() - if ACLManager.CheckForPremFeature('wp-manager'): + if ACLManager.CheckForPremFeature('email-debugger'): ob = CloudManager() res = ob.RunServerLevelEmailChecks() return res - except KeyError: - return redirect(loadLoginPage) + else: + dic = {'status': 0, 'error_message': 'Kindly purchase email debugger Add-on'} + json_data = json.dumps(dic) + return HttpResponse(json_data) + except BaseException as msg: + dic = {'status': 0, 'error_message': str(msg)} + json_data = json.dumps(dic) + return HttpResponse(json_data) def ResetEmailConfigurations(request): @@ -1910,10 +1916,15 @@ def ResetEmailConfigurations(request): if ACLManager.CheckForPremFeature('email-debugger'): ob = CloudManager() res = ob.ResetEmailConfigurations() - return res - except KeyError: - return redirect(loadLoginPage) + else: + dic = {'status': 0, 'error_message': 'Kindly purchase email debugger Add-on'} + json_data = json.dumps(dic) + return HttpResponse(json_data) + except BaseException as msg: + dic = {'status': 0, 'error_message': str(msg)} + json_data = json.dumps(dic) + return HttpResponse(json_data) def statusFunc(request): try: @@ -1929,8 +1940,14 @@ def statusFunc(request): ob = CloudManager(json.loads(request.body)) res = ob.statusFunc() return res - except KeyError: - return redirect(loadLoginPage) + else: + dic = {'status': 0, 'error_message': 'Kindly purchase email debugger Add-on'} + json_data = json.dumps(dic) + return HttpResponse(json_data) + except BaseException as msg: + dic = {'status': 0, 'error_message': str(msg)} + json_data = json.dumps(dic) + return HttpResponse(json_data) def ReadReport(request): try: @@ -2010,6 +2027,10 @@ def ReadReport(request): return 0 , Result except BaseException as msg: logging.CyberCPLogFileWriter.writeToFile("Result....3:" + str(msg)) + else: + dic = {'status': 0, 'error_message': 'Kindly purchase email debugger Add-on'} + json_data = json.dumps(dic) + return HttpResponse(json_data) except KeyError: return redirect(loadLoginPage) @@ -2022,10 +2043,14 @@ def debugEmailForSite(request): pass else: return ACLManager.loadErrorJson() - if ACLManager.CheckForPremFeature('wp-manager'): + if ACLManager.CheckForPremFeature('email-debugger'): ob = CloudManager(json.loads(request.body)) res = ob.debugEmailForSite() return res + else: + dic = {'status': 0, 'error_message': 'Kindly purchase email debugger Add-on'} + json_data = json.dumps(dic) + return HttpResponse(json_data) except KeyError: return redirect(loadLoginPage) @@ -2039,11 +2064,15 @@ def fixMailSSL(request): else: return ACLManager.loadErrorJson() admin = Administrator.objects.get(pk=userID) - if ACLManager.CheckForPremFeature('wp-manager'): + if ACLManager.CheckForPremFeature('email-debugger'): cm = CloudManager(json.loads(request.body), admin) res = cm.fixMailSSL(request) if os.path.exists(ProcessUtilities.debugPath): logging.CyberCPLogFileWriter.writeToFile("Result....3:" + str(res.content)) return res + else: + dic = {'status': 0, 'error_message': 'Kindly purchase email debugger Add-on'} + json_data = json.dumps(dic) + return HttpResponse(json_data) except KeyError: return redirect(loadLoginPage)