diff --git a/SOPE/NGCards/IcalElements.m b/SOPE/NGCards/IcalElements.m index 467f9377e..153ea2bec 100644 --- a/SOPE/NGCards/IcalElements.m +++ b/SOPE/NGCards/IcalElements.m @@ -192,7 +192,7 @@ static inline id GetProperty(NSDictionary *_set, NSString *_name) { if ([val respondsToSelector:@selector(descriptionWithCalendarFormat:)]) { static NSTimeZone *gmt = nil; - if (gmt == nil) gmt = [NSTimeZone timeZoneWithAbbreviation:@"GMT"]; + if (gmt == nil) gmt = [NSTimeZone timeZoneForSecondsFromGMT: 0]; [val setTimeZone:gmt]; val = [val descriptionWithCalendarFormat:calfmt]; } diff --git a/SOPE/NGCards/NSCalendarDate+ICal.m b/SOPE/NGCards/NSCalendarDate+ICal.m index 4c491d109..d7bed495c 100644 --- a/SOPE/NGCards/NSCalendarDate+ICal.m +++ b/SOPE/NGCards/NSCalendarDate+ICal.m @@ -31,7 +31,7 @@ static NSTimeZone *gmt = nil; static inline void _setupGMT(void) { if (gmt == nil) - gmt = [[NSTimeZone timeZoneWithAbbreviation:@"GMT"] retain]; + gmt = [[NSTimeZone timeZoneForSecondsFromGMT: 0] retain]; } @implementation NSCalendarDate(iCalRepresentation) diff --git a/SOPE/NGCards/NSString+NGCards.m b/SOPE/NGCards/NSString+NGCards.m index 0006411c1..3ea618156 100644 --- a/SOPE/NGCards/NSString+NGCards.m +++ b/SOPE/NGCards/NSString+NGCards.m @@ -337,7 +337,7 @@ second = 0; } - utc = [NSTimeZone timeZoneWithAbbreviation: @"GMT"]; + utc = [NSTimeZone timeZoneForSecondsFromGMT: 0]; date = [NSCalendarDate dateWithYear: year month: month day: day hour: hour minute: minute second: second diff --git a/SOPE/NGCards/iCalFreeBusy.m b/SOPE/NGCards/iCalFreeBusy.m index 74b25a2c1..913e0cb78 100644 --- a/SOPE/NGCards/iCalFreeBusy.m +++ b/SOPE/NGCards/iCalFreeBusy.m @@ -107,7 +107,7 @@ NSCalendarDate *utcStart, *utcEnd; NSTimeZone *uTZ; - uTZ = [NSTimeZone timeZoneWithAbbreviation: @"GMT"]; + uTZ = [NSTimeZone timeZoneForSecondsFromGMT: 0]; utcStart = [start copy]; utcEnd = [end copy]; [utcStart setTimeZone: uTZ]; diff --git a/SoObjects/Appointments/MSExchangeFreeBusySOAPRequest.m b/SoObjects/Appointments/MSExchangeFreeBusySOAPRequest.m index 8e53215bc..32eddc865 100644 --- a/SoObjects/Appointments/MSExchangeFreeBusySOAPRequest.m +++ b/SoObjects/Appointments/MSExchangeFreeBusySOAPRequest.m @@ -40,7 +40,7 @@ if ((self = [super init])) { address = nil; - timeZone = [NSTimeZone timeZoneWithAbbreviation: @"GMT"]; + timeZone = [NSTimeZone timeZoneForSecondsFromGMT: 0]; [timeZone retain]; startDate = nil; endDate = nil; diff --git a/UI/MainUI/SOGoRootPage.m b/UI/MainUI/SOGoRootPage.m index 8ac49db3a..95660794c 100644 --- a/UI/MainUI/SOGoRootPage.m +++ b/UI/MainUI/SOGoRootPage.m @@ -109,7 +109,7 @@ appName = [[context request] applicationName]; date = [NSCalendarDate calendarDate]; - [date setTimeZone: [NSTimeZone timeZoneWithAbbreviation: @"GMT"]]; + [date setTimeZone: [NSTimeZone timeZoneForSecondsFromGMT: 0]]; if (username) { // Cookie expires in one month @@ -148,7 +148,7 @@ if (cookieReset) { date = [NSCalendarDate calendarDate]; - [date setTimeZone: [NSTimeZone timeZoneWithAbbreviation: @"GMT"]]; + [date setTimeZone: [NSTimeZone timeZoneForSecondsFromGMT: 0]]; [locationCookie setExpires: [date yesterday]]; } diff --git a/UI/MainUI/SOGoSAML2Actions.m b/UI/MainUI/SOGoSAML2Actions.m index eb7a01d2f..1d4eb1e33 100644 --- a/UI/MainUI/SOGoSAML2Actions.m +++ b/UI/MainUI/SOGoSAML2Actions.m @@ -94,7 +94,7 @@ cookie = nil; date = [NSCalendarDate calendarDate]; - [date setTimeZone: [NSTimeZone timeZoneWithAbbreviation: @"GMT"]]; + [date setTimeZone: [NSTimeZone timeZoneForSecondsFromGMT: 0]]; // We cleanup the memecached/database session cache. We do this before // invoking _logoutCookieWithDate: in order to obtain its value. @@ -147,7 +147,7 @@ appName = [rq applicationName]; [locationCookie setPath: [NSString stringWithFormat: @"/%@/", appName]]; date = [NSCalendarDate calendarDate]; - [date setTimeZone: [NSTimeZone timeZoneWithAbbreviation: @"GMT"]]; + [date setTimeZone: [NSTimeZone timeZoneForSecondsFromGMT: 0]]; [locationCookie setExpires: [date yesterday]]; return locationCookie; diff --git a/UI/MainUI/SOGoUserHomePage.m b/UI/MainUI/SOGoUserHomePage.m index a015e5a63..1f341fec9 100644 --- a/UI/MainUI/SOGoUserHomePage.m +++ b/UI/MainUI/SOGoUserHomePage.m @@ -509,7 +509,7 @@ response = [self redirectToLocation: [self _logoutRedirectURL]]; date = [NSCalendarDate calendarDate]; - [date setTimeZone: [NSTimeZone timeZoneWithAbbreviation: @"GMT"]]; + [date setTimeZone: [NSTimeZone timeZoneForSecondsFromGMT: 0]]; // We cleanup the memecached/database session cache. We do this before // invoking _logoutCookieWithDate: in order to obtain its value.