listWebsitesJson is now using an actual list, as well as ipFile usin…

…g with open()
usmannasir · Dec 14, 2023 · d4b242c · d4b242c
1 parent 9d33f64
commit d4b242c
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/cli/cyberPanel.py b/cli/cyberPanel.py
@@ -141,12 +141,11 @@ def listWebsitesJson(self):
 
             websites = Websites.objects.all()
             ipFile = "/etc/cyberpanel/machineIP"
-            f = open(ipFile)
-            ipData = f.read()
+            with open(ipFile, 'r') as f:
+                ipData = f.read()
             ipAddress = ipData.split('\n', 1)[0]
 
-            json_data = "["
-            checker = 0
+            json_data = []
 
             for items in websites:
                 if items.state == 0:
@@ -155,14 +154,7 @@ def listWebsitesJson(self):
                     state = "Active"
                 dic = {'domain': items.domain, 'adminEmail': items.adminEmail, 'ipAddress': ipAddress,
                        'admin': items.admin.userName, 'package': items.package.packageName, 'state': state}
-
-                if checker == 0:
-                    json_data = json_data + json.dumps(dic)
-                    checker = 1
-                else:
-                    json_data = json_data + ',' + json.dumps(dic)
-
-            json_data = json_data + ']'
+                json_data.append(dic)
             final_json = json.dumps(json_data)
             print(final_json)