Monotone-Parent: 685c9ae25de2a186a85413b3e3a5372623cac3c9

Monotone-Revision: f26a67548e90f9e418185e415399c0936fd4c271

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-08-26T19:21:15
Monotone-Branch: ca.inverse.sogo

UI/MainUI/English.lproj/Localizable.strings

@@ -8,6 +8,7 @@
 "Connect" = "Connect";
 
 "Wrong username or password." = "Wrong username or password.";
+"cookiesNotEnabled" = "You cannot login because your browser's cookies are disabled. Please enable cookies in your browser's settings and try again.";
 
 "browserNotCompatible" = "We've detected that your browser version is currently not supported on this site. Our recommendation is to use Firefox. Click on the link bellow to download the most current version of this browser.";
 "alternativeBrowsers" = "Alternatively, you can also use the following compatible browsers";

UI/MainUI/French.lproj/Localizable.strings

@@ -8,6 +8,7 @@
 "Connect" = "Connexion";
 
 "Wrong username or password." = "Mauvais nom d'utilisateur ou mot de passe.";
+"cookiesNotEnabled" = "Vous ne pouvez vous authentifier car les témoins (cookies) de votre navigateur Web sont désactivés. Activez les témoins dans votre navigateur Web et essayez de nouveau.";
 
 "browserNotCompatible" = "La version de votre navigateur Web n'est présentement pas supportée par ce site. Nous recommandons d'utiliser Firefox. Vous trouverez un lien vers la plus récente version de ce navigateur ci-dessous:";
 "alternativeBrowsers" = "Comme alternative, vous pouvez aussi utiliser les navigateurs suivants:";

UI/Templates/MainUI/SOGoRootPage.wox

@@ -15,7 +15,8 @@
 	 type="text/javascript">var loginSuffix = '<var:string value="loginSuffix"/>';</script
 	></var:if>
       <img const:alt="*" id="splash" rsrc:src="lori-login.jpg"/><br/><br/>
-      <p id="loginErrorMessage"><var:string label:value="Wrong username or password."/></p>
+      <p id="noCookiesErrorMessage" style="display: none;"><var:string label:value="cookiesNotEnabled"/></p>
+      <p id="loginErrorMessage" style="display: none;"><var:string label:value="Wrong username or password."/></p>
       <label><var:string label:value="Username:"/><br/>
 	<input class="textField" id="userName" name="userName"
 	  type="text" var:value="userName" /></label><br/>

UI/WebServerResources/SOGoRootPage.css

@@ -48,9 +48,9 @@ DIV#loginButton IMG#progressIndicator
   margin-top: 5px;
   margin-left: 5px; }
 
+#noCookiesErrorMessage,
 #loginErrorMessage
-{ display: none;
-  color: #f00;
+{ color: #f00;
   text-align: center; }
 
 P.browser

UI/WebServerResources/SOGoRootPage.js

@@ -40,41 +40,57 @@ function onLoginClick(event) {
 }
 
 function onLoginCallback(http) {
-    if (http.readyState == 4) {
-        if (isHttpStatus204(http.status)) {
-            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("/");
+  if (http.readyState == 4) {
+    if (isHttpStatus204(http.status)) {
 
-            var newAddress;
-            if ((address.startsWith(baseAddress)
-                 || address.startsWith(altBaseAddress))
-                && !address.endsWith("/logoff"))
-                newAddress = address;
-            else
-                newAddress = baseAddress;
-            window.location.href = newAddress;
-        }
-        else {
-            var message = $("loginErrorMessage");
-            message.setStyle({ display: "block" });
-        }
+      // 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;
+      }
+      
+      // 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;
     }
+    else
+      $("loginErrorMessage").show();
+  }
 }
 
 FastInit.addOnLoad(initLogin);