diff --git a/plogical/acl.py b/plogical/acl.py index 7e8afbea6..8c622f755 100644 --- a/plogical/acl.py +++ b/plogical/acl.py @@ -566,6 +566,8 @@ class ACLManager: php = "74" elif phpVersion == "PHP 8.0": php = "80" + elif phpVersion == "PHP 8.1": + php = "81" return php diff --git a/websiteFunctions/website.py b/websiteFunctions/website.py index 44766bb34..62e8558e8 100755 --- a/websiteFunctions/website.py +++ b/websiteFunctions/website.py @@ -864,7 +864,6 @@ class WebsiteManager: json_data = stdoutput.splitlines()[-1] - data_ret = {'status': 1, 'error_message': 'None', 'plugins': json_data} json_data = json.dumps(data_ret) return HttpResponse(json_data) @@ -3257,6 +3256,15 @@ class WebsiteManager: execPath = execPath + " changePHP --phpVersion '" + phpVersion + "' --path " + completePathToConfigFile ProcessUtilities.popenExecutioner(execPath) + try: + website = Websites.objects.get(domain=self.domain) + website.phpSelection = data['phpSelection'] + website.save() + except: + website = ChildDomains.objects.get(domain=self.domain) + website.phpSelection = data['phpSelection'] + website.save() + data_ret = {'status': 1, 'changePHP': 1, 'error_message': "None"} json_data = json.dumps(data_ret) return HttpResponse(json_data)