From d06d4068664531942187fc4779c9c1da54b46721 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 9 Dec 2011 16:33:43 +0000 Subject: [PATCH] See ChangeLog. Monotone-Parent: 8c58bbcc380816930dac5d8da2d1d682049a6349 Monotone-Revision: b4900cbcd7c48cfd36bb5a262eec357e3ac1033a Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-12-09T16:33:43 --- ChangeLog | 11 +++++++---- UI/MainUI/SOGoRootPage.m | 12 +++++++++--- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index f51218421..a828c7cfa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,12 @@ +2011-12-09 Francis Lachapelle + + * UI/MainUI/SOGoRootPage.m (_cookieWithUsername:): the SOGoLogin + cookie now expires in one month. + 2011-12-09 Wolfgang Sourdeau - * UI/SOGoUI/UIxComponent.m (-isCalendarEnabled) - (-isContactsEnabled, -isMailEnabled, -isPreferencesEnabled): new - accessors. - (-userHasCalendarAccess, -userHasMailAccess): moved from UIxPageFrame. + * UI/SOGoUI/UIxComponent.m (-userHasCalendarAccess) + (-userHasMailAccess): moved from UIxPageFrame. * UI/Common/UIxToolbar.m (-cssClasses): new accessor that generates the CSS classes dynamically depending on the button diff --git a/UI/MainUI/SOGoRootPage.m b/UI/MainUI/SOGoRootPage.m index 21d494186..1d2ed529d 100644 --- a/UI/MainUI/SOGoRootPage.m +++ b/UI/MainUI/SOGoRootPage.m @@ -147,17 +147,23 @@ NSCalendarDate *date; appName = [[context request] applicationName]; + date = [NSCalendarDate calendarDate]; + [date setTimeZone: [NSTimeZone timeZoneWithAbbreviation: @"GMT"]]; if (username) { + // Cookie expires in one month loginCookie = [WOCookie cookieWithName: @"SOGoLogin" - value: [username stringByEncodingBase64]]; + value: [username stringByEncodingBase64] + path: nil + domain: nil + expires: [date dateByAddingYears:0 months:1 days:0 + hours:0 minutes:0 seconds:0] + isSecure: NO]; } else { loginCookie = [WOCookie cookieWithName: @"SOGoLogin" value: nil]; - date = [NSCalendarDate calendarDate]; - [date setTimeZone: [NSTimeZone timeZoneWithAbbreviation: @"GMT"]]; [loginCookie setExpires: [date yesterday]]; }