From 7ff9c56cd6f45246ee85933f55e38cdb526970b8 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Thu, 8 Apr 2010 21:25:39 +0800 Subject: Fix typo in previous conversion from SUPERDOMAINS --- etherpad/src/etherpad/pro/pro_utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etherpad/src/etherpad/pro/pro_utils.js b/etherpad/src/etherpad/pro/pro_utils.js index 2322262..1198b95 100644 --- a/etherpad/src/etherpad/pro/pro_utils.js +++ b/etherpad/src/etherpad/pro/pro_utils.js @@ -49,7 +49,7 @@ function getRequestSuperdomain() { var parts = request.domain.split('.'); while (parts.length > 0) { var domain = parts.join('.'); - if (domainEnabled[domain]) { + if (domainEnabled(domain)) { return domain; } parts.shift(); -- cgit v1.2.3 From b4ccd31eafa1a65a3fb58c9394b3f71b9779dea8 Mon Sep 17 00:00:00 2001 From: Peter Martischka Date: Thu, 8 Apr 2010 20:27:54 +0800 Subject: added localbox.info to the topdomains of the config file, i think it's better for testing --- etherpad/etc/etherpad.localdev-default.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etherpad/etc/etherpad.localdev-default.properties b/etherpad/etc/etherpad.localdev-default.properties index 07dce96..98327fd 100644 --- a/etherpad/etc/etherpad.localdev-default.properties +++ b/etherpad/etc/etherpad.localdev-default.properties @@ -15,7 +15,7 @@ listen = 9000 logDir = ./data/logs modulePath = ./src motdPage = /ep/pad/view/ro.3PfHCD0ApLc/latest?fullScreen=1&slider=0&sidebar=0 -topdomains = localhost +topdomains = localhost,localbox.info transportPrefix = /comet transportUseWildcardSubdomains = true useHttpsUrls = false -- cgit v1.2.3 From 4734aaece4c1ce3b27608e0de62b419ff7f2ca6e Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Thu, 8 Apr 2010 18:40:40 +0200 Subject: Revert "added localbox.info to the topdomains of the config file, i think it's better for testing" This reverts commit b4ccd31eafa1a65a3fb58c9394b3f71b9779dea8. --- etherpad/etc/etherpad.localdev-default.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etherpad/etc/etherpad.localdev-default.properties b/etherpad/etc/etherpad.localdev-default.properties index 98327fd..07dce96 100644 --- a/etherpad/etc/etherpad.localdev-default.properties +++ b/etherpad/etc/etherpad.localdev-default.properties @@ -15,7 +15,7 @@ listen = 9000 logDir = ./data/logs modulePath = ./src motdPage = /ep/pad/view/ro.3PfHCD0ApLc/latest?fullScreen=1&slider=0&sidebar=0 -topdomains = localhost,localbox.info +topdomains = localhost transportPrefix = /comet transportUseWildcardSubdomains = true useHttpsUrls = false -- cgit v1.2.3 From 698aa618998886d16bc4087d5d82a30f889ef560 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Thu, 8 Apr 2010 18:40:52 +0200 Subject: Revert "Fix typo in previous conversion from SUPERDOMAINS" This reverts commit 7ff9c56cd6f45246ee85933f55e38cdb526970b8. --- etherpad/src/etherpad/pro/pro_utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etherpad/src/etherpad/pro/pro_utils.js b/etherpad/src/etherpad/pro/pro_utils.js index 1198b95..2322262 100644 --- a/etherpad/src/etherpad/pro/pro_utils.js +++ b/etherpad/src/etherpad/pro/pro_utils.js @@ -49,7 +49,7 @@ function getRequestSuperdomain() { var parts = request.domain.split('.'); while (parts.length > 0) { var domain = parts.join('.'); - if (domainEnabled(domain)) { + if (domainEnabled[domain]) { return domain; } parts.shift(); -- cgit v1.2.3