From 4fb5f650a86f615cb0c4f14f9525f7ac4084a1aa Mon Sep 17 00:00:00 2001 From: Richard Allitt Date: Sat, 16 Nov 2024 00:29:17 +0000 Subject: [PATCH] Typo fix and error message tweak --- control/templates/shared/add_vhost_test.html | 2 +- control/webapp/utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/control/templates/shared/add_vhost_test.html b/control/templates/shared/add_vhost_test.html index 306eea0..8339ae9 100644 --- a/control/templates/shared/add_vhost_test.html +++ b/control/templates/shared/add_vhost_test.html @@ -54,7 +54,7 @@

Test custom domain

{% if valid[domain] == (true, true) or valid[prefixed] == (true, true) %} - {% elif valid[domain] != (none, none) or valid[domain] != (none, none) %} + {% elif valid[domain] != (none, none) or valid[prefixed] != (none, none) %} {% endif %} diff --git a/control/webapp/utils.py b/control/webapp/utils.py index 0af8687..b4bc333 100644 --- a/control/webapp/utils.py +++ b/control/webapp/utils.py @@ -96,7 +96,7 @@ def validate_domain_docroot(owner, path): if not path: return path, None if any(ch in path for ch in string.whitespace + "\\" + '"' + "'"): - return path, "Document roots cannot contain spaces or quotes." + return path, "Document roots cannot contain spaces, backslashes or quotes." if path.startswith("public_html/"): path = path.replace("public_html/", "", 1) if isinstance(owner, Member):