diff --git a/websiteFunctions/website.py b/websiteFunctions/website.py index 283cca05f..fc602d76b 100755 --- a/websiteFunctions/website.py +++ b/websiteFunctions/website.py @@ -53,16 +53,19 @@ class WebsiteManager: self.childDomain = childDomain def createWebsite(self, request=None, userID=None, data=None): - url = "https://platform.cyberpersons.com/CyberpanelAdOns/Adonpermission" - test_domain_data = { - "name": "test-domain", - "IP": ACLManager.GetServerIP(), + url = "https://platform.cyberpersons.com/CyberpanelAdOns/Adonpermission" + data = { + "name": "all", + "IP": ACLManager.GetServerIP() } import requests - response = requests.post(url, data=json.dumps(test_domain_data)) - test_domain_status = response.json()['status'] + response = requests.post(url, data=json.dumps(data)) + Status = response.json()['status'] + + if (Status == 1) or ProcessUtilities.decideServer() == ProcessUtilities.ent: + test_domain_status = 1 currentACL = ACLManager.loadedACL(userID) adminNames = ACLManager.loadAllUsers(userID) @@ -114,14 +117,7 @@ class WebsiteManager: ## - test_domain_data = { - "name": "test-domain", - "IP": ACLManager.GetServerIP(), - } - - import requests - response = requests.post(url, data=json.dumps(test_domain_data)) - test_domain_status = response.json()['status'] + test_domain_status = 1 Data = {'packageList': packagesName, "owernList": adminNames, 'WPVersions': FinalVersions, 'Plugins': Plugins, 'Randam_String': rnpss.lower(), 'test_domain_data': test_domain_status} @@ -184,17 +180,6 @@ class WebsiteManager: response = requests.post(url, data=json.dumps(data)) Status = response.json()['status'] - test_domain_url = "https://platform.cyberpersons.com/CyberpanelAdOns/Adonpermission" - - test_domain_data = { - "name": "test-domain", - "IP": ACLManager.GetServerIP(), - } - - import requests - response = requests.post(test_domain_url, data=json.dumps(test_domain_data)) - test_domain_status = response.json()['status'] - Data['test_domain_data'] = test_domain_status rnpss = randomPassword.generate_pass(10) @@ -202,6 +187,7 @@ class WebsiteManager: if (Status == 1) or ProcessUtilities.decideServer() == ProcessUtilities.ent: Data['wpsite'] = WPobj + Data['test_domain_data'] = 1 try: DeleteID = request.GET.get('DeleteID', None) @@ -706,16 +692,18 @@ class WebsiteManager: currentACL = ACLManager.loadedACL(userID) websitesName = ACLManager.findAllSites(currentACL, userID) - test_domain_url = "https://platform.cyberpersons.com/CyberpanelAdOns/Adonpermission" - - test_domain_data = { - "name": "test-domain", - "IP": ACLManager.GetServerIP(), + url = "https://platform.cyberpersons.com/CyberpanelAdOns/Adonpermission" + data = { + "name": "all", + "IP": ACLManager.GetServerIP() } import requests - response = requests.post(test_domain_url, data=json.dumps(test_domain_data)) - test_domain_status = response.json()['status'] + response = requests.post(url, data=json.dumps(data)) + Status = response.json()['status'] + + if (Status == 1) or ProcessUtilities.decideServer() == ProcessUtilities.ent: + test_domain_status = 1 rnpss = randomPassword.generate_pass(10) proc = httpProc(request, 'websiteFunctions/createDomain.html',