diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index a4454136bf..79151a0fa3 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -2548,7 +2548,7 @@ - (NSArray *) davResourceType XMLNS_GROUPDAV, nil]; [colType addObject: gdVTodoCol]; } - if ([nameInContainer isEqualToString: @"personal"] || [nameInContainer isEqualToString: @"Personal"]) + if ([[nameInContainer lowercaseString] isEqualToString: @"personal"]) [colType addObject: [NSArray arrayWithObjects: @"schedule-outbox", XMLNS_CALDAV, nil]]; } diff --git a/SoObjects/Appointments/SOGoUserFolder+Appointments.m b/SoObjects/Appointments/SOGoUserFolder+Appointments.m index 0060637e50..ccedf2c6c8 100644 --- a/SoObjects/Appointments/SOGoUserFolder+Appointments.m +++ b/SoObjects/Appointments/SOGoUserFolder+Appointments.m @@ -190,7 +190,7 @@ - (NSArray *) davCalendarScheduleInboxURL - (NSArray *) davCalendarScheduleOutboxURL { - return [[context request] isMacOSXVenturaCalendarApp] ? [self _davSpecialCalendarURLWithName: @"Personal"] : [self _davSpecialCalendarURLWithName: @"personal"]; + return [[context request] isMacOSXVenturaCalendarApp] ? [self _davSpecialCalendarURLWithName: @"PERSONAL"] : [self _davSpecialCalendarURLWithName: @"personal"]; } - (NSArray *) _calendarProxiedUsersWithWriteAccess: (BOOL) write diff --git a/SoObjects/SOGo/SOGoFolder.m b/SoObjects/SOGo/SOGoFolder.m index 64958aadff..600873ab24 100644 --- a/SoObjects/SOGo/SOGoFolder.m +++ b/SoObjects/SOGo/SOGoFolder.m @@ -200,16 +200,16 @@ - (NSComparisonResult) _compareByNameInContainer: (SOGoFolder *) otherFolder selfName = [self realNameInContainer]; otherName = [otherFolder realNameInContainer]; - if ([selfName isEqualToString: @"personal"] || [selfName isEqualToString: @"Personal"]) + if ([[selfName lowercaseString] isEqualToString: @"personal"]) { - if ([otherName isEqualToString: @"personal"] || [otherName isEqualToString: @"Personal"]) + if ([[otherName lowercaseString] isEqualToString: @"personal"]) comparison = NSOrderedSame; else comparison = NSOrderedAscending; } else { - if ([otherName isEqualToString: @"personal"] || [otherName isEqualToString: @"Personal"]) + if ([[otherName lowercaseString] isEqualToString: @"personal"]) comparison = NSOrderedDescending; else comparison = NSOrderedSame; diff --git a/SoObjects/SOGo/SOGoParentFolder.m b/SoObjects/SOGo/SOGoParentFolder.m index 31121ddcc8..bb3775f17d 100644 --- a/SoObjects/SOGo/SOGoParentFolder.m +++ b/SoObjects/SOGo/SOGoParentFolder.m @@ -144,7 +144,7 @@ - (void) setBaseOCSPath: (NSString *) newOCSPath - (NSString *) defaultFolderName { - return @"Personal"; + return [[context request] isMacOSXVenturaCalendarApp] ? @"PERSONAL" : @"Personal"; } - (NSString *) collectedFolderName @@ -173,7 +173,7 @@ - (void) createSpecialFolder: (SOGoFolderType) folderType { if (folderType == SOGoPersonalFolder) { - folderName = [[context request] isMacOSXVenturaCalendarApp] ? @"Personal" : @"personal"; + folderName = [[context request] isMacOSXVenturaCalendarApp] ? @"PERSONAL" : @"personal"; folder = [subFolderClass objectWithName: folderName inContainer: self]; [folder setDisplayName: [self defaultFolderName]]; [folder setOCSPath: [NSString stringWithFormat: @"%@/%@", OCSPath, folderName]]; @@ -241,7 +241,7 @@ - (NSException *) fetchSpecialFolders: (NSString *) sql } if (folderType == SOGoPersonalFolder) { - if (![subFolders objectForKey: @"personal"] || ![subFolders objectForKey: @"Personal"]) + if (![subFolders objectForKey: @"personal"] || ![subFolders objectForKey: @"Personal"] || ![subFolders objectForKey: @"PERSONAL"]) [self createSpecialFolder: SOGoPersonalFolder]; } else if (folderType == SOGoCollectedFolder) diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m index ed9f783037..21f3562423 100644 --- a/SoObjects/SOGo/SOGoUser.m +++ b/SoObjects/SOGo/SOGoUser.m @@ -1059,7 +1059,7 @@ - (SOGoAppointmentFolders *) calendarsFolderInContext: (WOContext *) context - (SOGoAppointmentFolder *) personalCalendarFolderInContext: (WOContext *) context { - return [[self calendarsFolderInContext: context] lookupPersonalFolder: [[context request] isMacOSXVenturaCalendarApp] ? @"Personal" : @"personal" + return [[self calendarsFolderInContext: context] lookupPersonalFolder: [[context request] isMacOSXVenturaCalendarApp] ? @"PERSONAL" : @"personal" ignoringRights: YES]; }