From 60f96d15bdc174c844fc6d23649b8423cbe2486d Mon Sep 17 00:00:00 2001 From: CalDescent Date: Sat, 30 Oct 2021 17:47:57 +0100 Subject: [PATCH] When specifying a domain without a subdomain, add a www. version automatically. Longer term we will probably need a 301 redirect in these cases for SEO purposes, but this is a nice convenience feature for now. --- src/main/java/org/qortal/settings/Settings.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/qortal/settings/Settings.java b/src/main/java/org/qortal/settings/Settings.java index 0e542c3c..8c5ac410 100644 --- a/src/main/java/org/qortal/settings/Settings.java +++ b/src/main/java/org/qortal/settings/Settings.java @@ -504,14 +504,15 @@ public class Settings { return this.domainMapLoggingEnabled; } - public List getDomainMap() { - return this.domainMap; - } - public Map getSimpleDomainMap() { HashMap map = new HashMap<>(); for (DomainMap dMap : this.domainMap) { map.put(dMap.getDomain(), dMap.getName()); + + // If the domain doesn't include a subdomain then add a www. alternative + if (dMap.getDomain().chars().filter(c -> c == '.').count() == 1) { + map.put("www.".concat(dMap.getDomain()), dMap.getName()); + } } return map; }