summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c <none@none>2010-02-03 11:24:30 +0000
committeralexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c <none@none>2010-02-03 11:24:30 +0000
commit07ef16f1bbeb4dec50ac1e92aeb413258b40450e (patch)
treec5bdb9b8dcc389e24cdc68d8602c14dd24e5f1e6
parent8dbccf7b55870c6f38cca353003dc463a5a2553e (diff)
downloadetherpad-07ef16f1bbeb4dec50ac1e92aeb413258b40450e.tar.gz
etherpad-07ef16f1bbeb4dec50ac1e92aeb413258b40450e.tar.bz2
etherpad-07ef16f1bbeb4dec50ac1e92aeb413258b40450e.zip
fixed superdomain handling
--HG-- extra : convert_revision : svn%3Ab2ef00c0-3703-41da-baef-cfe82387ac0c/trunk%4021
-rw-r--r--etherpad/src/etherpad/pro/pro_utils.js20
1 files changed, 9 insertions, 11 deletions
diff --git a/etherpad/src/etherpad/pro/pro_utils.js b/etherpad/src/etherpad/pro/pro_utils.js
index c539223..1dc2468 100644
--- a/etherpad/src/etherpad/pro/pro_utils.js
+++ b/etherpad/src/etherpad/pro/pro_utils.js
@@ -44,18 +44,16 @@ function getProRequestSubdomain() {
return d.split('.')[0];
}
-function getRequestSuperdomain() {
- var parts = request.domain.split('.').reverse();
- parts.pop(); // Remove one level
- while (parts.length > 0) {
- var domain = parts.reverse().join('.');
- if (SUPERDOMAINS[domain]) {
- return domain;
- }
- parts = parts.pop(); // Remove next level
+function getRequestSuperdomain() {
+ var parts = request.domain.split('.');
+ while (parts.length > 0) {
+ var domain = parts.join('.');
+ if (SUPERDOMAINS[domain]) {
+ return domain;
+ }
+ parts.shift(); // Remove next level
}
- return "foo";
-}
+}
function isProDomainRequest() {
// the result of this function never changes within the same request.