From 4320805ece29b0e6b8fae01149c1ddebf16ae6c6 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Wed, 23 Dec 2009 21:14:18 +0000
Subject: [PATCH] See ChangeLog

Monotone-Parent: 5c327b5b1200ffed4317126e637f1e5a4a6947fb
Monotone-Revision: 9b5272463fac61370796a5551a285c8f7d3dd24c

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-12-23T21:14:18
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                         | 9 ++++++++-
 UI/Templates/ContactsUI/UIxContactFoldersView.wox | 2 +-
 UI/Templates/SchedulerUI/UIxCalMainView.wox       | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 24ebbdc72..79f45b181 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,14 @@
 	invoke labelForKey prior to setPage: - resulting
 	in the wrong resources manager being selected.
 	This fixes: http://www.scalableogo.org/bugs/view.php?id=286
-	
+
+	* UI/Templates/ContactsUI/UIxContactFoldersView.wox
+	UI/Templates/SchedulerUI/UIxCalMainView.wox
+	Modified the uploadForm in those two templates (to add
+	const:href="") in order to avoid SOPE sessions being
+	created upon access to the calendar or address book module.
+	This fixes: http://www.scalableogo.org/bugs/view.php?id=208
+
 2009-12-22  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* Removed all the Kolab-related stuff (more specifically,
diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index 01513ff06..dabf717c7 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -30,7 +30,7 @@
     <div>
       <h3><var:string label:value="Import Cards"/></h3>
       <p><var:string label:value="Select a vCard or LDIF file."/></p>
-      <form name="uploadForm" id="uploadForm" method="post"
+      <form const:href="" name="uploadForm" id="uploadForm" method="post"
         enctype="multipart/form-data"
         onsubmit="return AIM.submit(this, {'onStart' : validateUploadForm, 
         'onComplete' : uploadCompleted})">
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 1b6f2339d..d82ca51be 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -103,7 +103,7 @@
     <div>
       <h3><var:string label:value="Import Events"/></h3>
       <p><var:string label:value="Select an iCalendar file (.ics)."/></p>
-      <form name="uploadForm" id="uploadForm" method="post"
+      <form const:href="" name="uploadForm" id="uploadForm" method="post"
         enctype="multipart/form-data"
         onsubmit="return AIM.submit(this, {'onStart' : validateUploadForm, 
         'onComplete' : uploadCompleted})">