Monotone-Parent: f344a8f89281014e1cb44ad2830da364e111324e
Monotone-Revision: c8525121d7db7aef92d05d9e761787cb3679156c Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-11-27T22:06:39 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
parent
9b58554ca0
commit
87efde3721
|
@ -34,8 +34,31 @@ function onLoginClick(event) {
|
||||||
|
|
||||||
function onLoginCallback(http) {
|
function onLoginCallback(http) {
|
||||||
if (http.readyState == 4) {
|
if (http.readyState == 4) {
|
||||||
if (isHttpStatus204(http.status))
|
if (isHttpStatus204(http.status)) {
|
||||||
window.location.href = ApplicationBaseURL + $("userName").value;
|
var userName = $("userName").value;
|
||||||
|
var address = "" + window.location.href;
|
||||||
|
var baseAddress = ApplicationBaseURL + $("userName").value;
|
||||||
|
var altBaseAddress;
|
||||||
|
if (baseAddress[0] == "/") {
|
||||||
|
var parts = address.split("/");
|
||||||
|
var hostpart = parts[2];
|
||||||
|
var protocol = parts[0];
|
||||||
|
baseAddress = protocol + "//" + hostpart + baseAddress;
|
||||||
|
}
|
||||||
|
var altBaseAddress;
|
||||||
|
var parts = baseAddress.split("/");
|
||||||
|
parts.splice(3, 0);
|
||||||
|
altBaseAddress = parts.join("/");
|
||||||
|
|
||||||
|
var newAddress;
|
||||||
|
if ((address.startsWith(baseAddress)
|
||||||
|
|| address.startsWith(altBaseAddress))
|
||||||
|
&& !address.endsWith("/logoff"))
|
||||||
|
newAddress = address;
|
||||||
|
else
|
||||||
|
newAddress = baseAddress;
|
||||||
|
window.location.href = newAddress;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue