From 9b8d2bd38c530539474f9a4df4f2de7ce6208871 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 3 Feb 2010 14:56:38 +0000 Subject: [PATCH] Monotone-Parent: 3d0bbe013d1b7a38886f0e3d1d62c9816e3e515a Monotone-Revision: fc02a6979f68953ee505764e1eaec83c5676f0cb Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-02-03T14:56:38 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ UI/MainUI/SOGoRootPage.m | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cb9f56dc0..256421b53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-02-03 Wolfgang Sourdeau + + * UI/MainUI/SOGoRootPage.m (-_standardDefaultAction): add an + ending "/" to the active url to avoid a mismatch with the login + cookie path. + 2010-02-02 Wolfgang Sourdeau * SoObjects/Contacts/SOGoContactLDIFEntry.m diff --git a/UI/MainUI/SOGoRootPage.m b/UI/MainUI/SOGoRootPage.m index 9ea078371..d2df7610c 100644 --- a/UI/MainUI/SOGoRootPage.m +++ b/UI/MainUI/SOGoRootPage.m @@ -221,7 +221,15 @@ [login stringByEscapingURL]]]; } else - response = self; + { + oldLocation = [[context request] uri]; + if (![oldLocation hasSuffix: @"/"] + && ![oldLocation hasSuffix: @"/view"]) + response = [self redirectToLocation: + [NSString stringWithFormat: @"%@/", oldLocation]]; + else + response = self; + } return response; }