From 627c6dd0128cabdb32f2d2598380892136a846d2 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 27 Aug 2008 21:55:55 +0000
Subject: [PATCH] Monotone-Parent: 4af6f242db41c32f7b5a930b008be8a78af1a375
 Monotone-Revision: 3ef512531577e1fefe46485057610ae57aade728

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-08-27T21:55:55
Monotone-Branch: ca.inverse.sogo
---
 UI/WebServerResources/SOGoRootPage.js | 99 ++++++++++++++-------------
 1 file changed, 52 insertions(+), 47 deletions(-)

diff --git a/UI/WebServerResources/SOGoRootPage.js b/UI/WebServerResources/SOGoRootPage.js
index 569adb285..ac856113a 100644
--- a/UI/WebServerResources/SOGoRootPage.js
+++ b/UI/WebServerResources/SOGoRootPage.js
@@ -40,57 +40,62 @@ function onLoginClick(event) {
 }
 
 function onLoginCallback(http) {
-  if (http.readyState == 4) {
-    if (isHttpStatus204(http.status)) {
+    if (http.readyState == 4) {
+        var noCookiesErrorMessage = $("noCookiesErrorMessage");
+        var loginErrorMessage = $("loginErrorMessage");
 
-      // Make sure browser's cookies are enabled
-      var cookieExists = 0;
-      var ca = document.cookie.split(';');
-      for (var i = 0; i < ca.length; i++) {
-	var c = ca[i];
-	while (c.charAt(0) == ' ') c = c.substring(1, c.length);
-	if (c.indexOf("0xHIGHFLYxSOGo-0.9=") == 0) {
-	  cookieExists = 1;
-	  break;
-	}
-      }
-      if (cookieExists === 0) {
-	$("noCookiesErrorMessage").show();
-	return false;
-      }
+        if (isHttpStatus204(http.status)) {
+            // Make sure browser's cookies are enabled
+            var cookieExists = 0;
+            var ca = document.cookie.split(';');
+            for (var i = 0; i < ca.length; i++) {
+                var c = ca[i];
+                while (c.charAt(0) == ' ') c = c.substring(1, c.length);
+                if (c.indexOf("0xHIGHFLYxSOGo-0.9=") == 0) {
+                    cookieExists = 1;
+                    break;
+                }
+            }
+            if (cookieExists === 0) {
+                loginErrorMessage.hide();
+                noCookiesErrorMessage.show();
+                return false;
+            }
       
-      // Redirect to proper page
-      var userName = $("userName").value;
-      if (typeof(loginSuffix) != "undefined"
-	  && loginSuffix.length > 0
-	  && !userName.endsWith(loginSuffix))
-	userName += loginSuffix;
-      var address = "" + window.location.href;
-      var baseAddress = ApplicationBaseURL + encodeURI(userName);
-      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("/");
+            // Redirect to proper page
+            var userName = $("userName").value;
+            if (typeof(loginSuffix) != "undefined"
+                && loginSuffix.length > 0
+                && !userName.endsWith(loginSuffix))
+                userName += loginSuffix;
+            var address = "" + window.location.href;
+            var baseAddress = ApplicationBaseURL + encodeURI(userName);
+            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;
+            var newAddress;
+            if ((address.startsWith(baseAddress)
+                 || address.startsWith(altBaseAddress))
+                && !address.endsWith("/logoff"))
+                newAddress = address;
+            else
+                newAddress = baseAddress;
+            window.location.href = newAddress;
+        }
+        else {
+            loginErrorMessage.show();
+            noCookiesErrorMessage.hide();
+        }
     }
-    else
-      $("loginErrorMessage").show();
-  }
 }
 
 FastInit.addOnLoad(initLogin);