From 4a9bc9ddb8298a0e578927c4098bc148ba4d19fa Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 14 Oct 2010 18:22:46 +0000
Subject: [PATCH] Monotone-Parent: c669e35445e941613544b7d8f01e9f5c509c6d6d
 Monotone-Revision: 77e266118db7711a96eaa7860269a06901b65f60

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-10-14T18:22:46
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                        | 5 +++++
 UI/WebServerResources/generic.js | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 574cf8768..0e167c071 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-10-14  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/WebServerResources/generic.js: (triggerAjaxRequest): save the
+	content in the request object in the case a retry is needed.
+	(onCASRecoverIFrameLoaded): on the first retry, the content
+	parameter is passed back to "triggerAjaxRequest".
+
 	* OpenChange/MAPIStoreMailContext.m
 	(-getMessageProperties:inRow:atURL:): new method.
 	(-getMessageTableChildproperty:atURL:withTag:inFolder:withFID:):
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 53e638da3..f8c7eca44 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -265,9 +265,14 @@ function onCASRecoverIFrameLoaded(event) {
             triggerAjaxRequest(request.url,
                                request.callback,
                                request.callbackData,
+                               request.content,
                                request.paramHeaders,
                                1);
         }
+        else {
+            var logoffUrl = UserFolderURL + "logoff";
+            window.location.href = logoffUrl;
+        }
         this.request = null;
     }
     this.parentNode.removeChild(this);
@@ -335,6 +340,7 @@ function triggerAjaxRequest(url, callback, userdata, content, headers, attempt)
         http.open("POST", url, true);
         http.url = url;
         http.paramHeaders = headers;
+        http.content = content;
         http.callback = callback;
         http.callbackData = userdata;
         http.onreadystatechange = function() { onAjaxRequestStateChange(http); };