fix(calendar): fix commit f1257088

fix(calendar): prevent to return the same user twice in ldap groups
fix(calendar): Ensure organizers are properly removed from attendee's calendars. Fix issue where organizers were also set as attendees. Removed organizer in attendees list.
2024-12-23 09:51:50 +01:00 · 2024-12-23 09:51:41 +01:00 · 2024-12-18 15:53:24 +01:00
2 changed files with 17 additions and 2 deletions
@@ -379,7 +379,7 @@ NSNumber *iCalDistantFutureNumber = nil;
  currentAttendee = [attendees nextObject];
  while (!isAttendee
 	 && currentAttendee)
-    if ([user hasEmail: [currentAttendee rfc822Email]])
+    if ([user hasEmail: [currentAttendee rfc822Email]] && ![self isOrganizer:[currentAttendee rfc822Email]]) // Exclude organizer if in attendees
      isAttendee = YES;
    else
      currentAttendee = [attendees nextObject];
@@ -2306,7 +2306,7 @@ _makeLDAPChanges (NGLdapConnection *ldapConnection,

 - (NSArray *) membersForGroupWithUID: (NSString *) uid
 {
-  NSMutableArray *dns, *uids;
+  NSMutableArray *dns, *uids, *userLogins;
  NSString *dn, *login;
  SOGoUserManager *um;
  NSDictionary *d, *contactInfos;
@@ -2327,6 +2327,7 @@ _makeLDAPChanges (NGLdapConnection *ldapConnection,
      members = [NSMutableArray new];
      uids = [NSMutableArray array];
      dns = [NSMutableArray array];
+      userLogins = [NSMutableArray array];

      // We check if it's a static group
      // Fetch "members" - we get DNs
@@ -2358,6 +2359,13 @@ _makeLDAPChanges (NGLdapConnection *ldapConnection,
              pool = [NSAutoreleasePool new];
              dn = [dns objectAtIndex: i];
              login = [um getLoginForDN: [dn lowercaseString]];
+              if([userLogins containsObject: login])
+              {
+                [pool release];
+                continue; //user alrady fetch
+              }
+              if(login != nil)
+                [userLogins addObject: login];
              user = [SOGoUser userWithLogin: login  roles: nil];
              if (user)
                {
@@ -2385,6 +2393,13 @@ _makeLDAPChanges (NGLdapConnection *ldapConnection,
            {
              pool = [NSAutoreleasePool new];
              login = [uids objectAtIndex: i];
+              if([userLogins containsObject: login])
+              {
+                [pool release];
+                continue; //user alrady fetch
+              }
+              if(login != nil)
+                [userLogins addObject: login];
              user = [SOGoUser userWithLogin: login  roles: nil];
              if (user)
                {
Author	SHA1	Message	Date
Hivert Quentin	e4a9e98797	fix(calendar): fix commit `f1257088`	2024-12-23 09:51:50 +01:00
Hivert Quentin	af0b108481	fix(calendar): prevent to return the same user twice in ldap groups	2024-12-23 09:51:41 +01:00
smizrahi	393f1694e5	fix(calendar): Ensure organizers are properly removed from attendee's calendars. Fix issue where organizers were also set as attendees. Removed organizer in attendees list.	2024-12-18 15:53:24 +01:00