From b1bd3db867f65a81d83f51caa4ad7b44d3dfb114 Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Fri, 30 Apr 2021 15:21:57 +0500
Subject: [PATCH] bug fix:
 https://www.facebook.com/groups/cyberpanel/permalink/2780021555642808/

---
 plogical/httpProc.py | 50 +++++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/plogical/httpProc.py b/plogical/httpProc.py
index 5b94b0ff9..2224101a4 100755
--- a/plogical/httpProc.py
+++ b/plogical/httpProc.py
@@ -13,36 +13,42 @@ class httpProc:
 
     def render(self):
         try:
-            from loginSystem.models import Administrator
-            from plogical.acl import ACLManager
             userID = self.request.session['userID']
-            currentACL = ACLManager.loadedACL(userID)
+            try:
+                from loginSystem.models import Administrator
+                from plogical.acl import ACLManager
 
-            ### Permissions Check
+                currentACL = ACLManager.loadedACL(userID)
 
-            if self.function != None:
-                if not currentACL['admin']:
-                    if not currentACL[self.function]:
-                        templateName = 'baseTemplate/error.html'
-                        return render(self.request, templateName, {'error_message': 'You are not authorized to access %s' % (self.function)})
+                ### Permissions Check
 
-            ###
+                if self.function != None:
+                    if not currentACL['admin']:
+                        if not currentACL[self.function]:
+                            templateName = 'baseTemplate/error.html'
+                            return render(self.request, templateName, {'error_message': 'You are not authorized to access %s' % (self.function)})
 
-            if self.data == None:
-                self.data = {}
+                ###
 
-            ipFile = "/etc/cyberpanel/machineIP"
-            f = open(ipFile)
-            ipData = f.read()
-            ipAddress = ipData.split('\n', 1)[0]
-            self.data['ipAddress'] = ipAddress
+                if self.data == None:
+                    self.data = {}
 
-            self.data.update(currentACL)
+                ipFile = "/etc/cyberpanel/machineIP"
+                f = open(ipFile)
+                ipData = f.read()
+                ipAddress = ipData.split('\n', 1)[0]
+                self.data['ipAddress'] = ipAddress
 
-            return render(self.request, self.templateName, self.data)
-        except BaseException as msg:
-            templateName = 'baseTemplate/error.html'
-            return render(self.request, templateName, {'error_message': str(msg)})
+                self.data.update(currentACL)
+
+                return render(self.request, self.templateName, self.data)
+            except BaseException as msg:
+                templateName = 'baseTemplate/error.html'
+                return render(self.request, templateName, {'error_message': str(msg)})
+        except:
+            from loginSystem.views import loadLoginPage
+            from django.shortcuts import redirect
+            return redirect(loadLoginPage)
 
     def renderPre(self):
         if self.data == None: