refactor: replace calls to create GMT NSTimeZone instance

Fixes #3757
Alinto · Dec 11, 2019 · 2b33d45 · 2b33d45
1 parent eafbdd3
commit 2b33d45
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/SOPE/NGCards/IcalElements.m b/SOPE/NGCards/IcalElements.m
@@ -199,7 +199,7 @@ - (void)appendToResponse:(WOResponse *)_response inContext:(WOContext *)_ctx {
 
     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
@@ -32,7 +32,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
@@ -340,7 +340,7 @@ - (NSCalendarDate *) asCalendarDate
 	  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
@@ -107,7 +107,7 @@ - (void) addFreeBusyFrom: (NSCalendarDate *) start
   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
@@ -45,7 +45,7 @@ - (id) init
   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
@@ -112,7 +112,7 @@ - (WOCookie *) _cookieWithUsername: (NSString *) username
 
   appName = [[context request] applicationName];
   date = [NSCalendarDate calendarDate];
-  [date setTimeZone: [NSTimeZone timeZoneWithAbbreviation: @"GMT"]];
+  [date setTimeZone: [NSTimeZone timeZoneForSecondsFromGMT: 0]];
   if (username)
     {
       // Cookie expires in one month
@@ -151,7 +151,7 @@ - (WOCookie *) _authLocationCookie: (BOOL) cookieReset
   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
@@ -98,7 +98,7 @@ - (WOResponse *) saml2SingleLogoutServiceAction
   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.
@@ -151,7 +151,7 @@ - (WOCookie *) _authLocationResetCookieWithName: (NSString *) cookieName
   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
@@ -434,7 +434,7 @@ - (WOCookie *) _logoutCookieWithDate: (NSCalendarDate *) date
   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.