From 9ed1d57ec2c22a3382e02caaa4f13937e6863b11 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Mon, 24 Feb 2014 16:07:55 -0500
Subject: [PATCH] Fix auto-acceptation of resources as attendees

Fixes #2541
---
 .../Appointments/SOGoAppointmentObject.m      | 95 +++++++++++--------
 1 file changed, 54 insertions(+), 41 deletions(-)

diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 8fa6a1174..6deb4ca10 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -545,51 +545,64 @@
 			[fbInfo removeObjectAtIndex: i];
 		    }
 		}
-	      
-	      if ([fbInfo count])
-		{
-		  // If we always force the auto-accept if numberOfSimultaneousBookings == 0 (ie., no limit
-		  // is imposed) or if numberOfSimultaneousBookings is greater than the number of
-		  // overlapping events
-		  if ([user numberOfSimultaneousBookings] == 0 ||
-		      [user numberOfSimultaneousBookings] > [fbInfo count])
+
+              // Find the attendee associated to the current UID
+              for (i = 0; i < [theAttendees count]; i++)
+                {
+                  currentAttendee = [theAttendees objectAtIndex: i];
+                  if ([[currentAttendee uid] isEqualToString: currentUID])
+                    break;
+                  else
+                    currentAttendee = nil;
+                }
+
+              if (currentAttendee)
+                {
+                  if ([fbInfo count])
                     {
+                      // If we always force the auto-accept if numberOfSimultaneousBookings == 0 (ie., no limit
+                      // is imposed) or if numberOfSimultaneousBookings is greater than the number of
+                      // overlapping events
+                      if ([user numberOfSimultaneousBookings] == 0 ||
+                          [user numberOfSimultaneousBookings] > [fbInfo count])
+                        {
+                          [[currentAttendee attributes] removeObjectForKey: @"RSVP"];
+                          [currentAttendee setParticipationStatus: iCalPersonPartStatAccepted];
+                        }
+                      else
+                        {
+                          iCalCalendar *calendar;
+                          NSDictionary *values;
+                          NSString *reason;
+                          iCalEvent *event;
+
+                          calendar =  [iCalCalendar parseSingleFromSource: [[fbInfo objectAtIndex: 0] objectForKey: @"c_content"]];
+                          event = [[calendar events] lastObject];
+
+                          values = [NSDictionary dictionaryWithObjectsAndKeys:
+                                                   [NSString stringWithFormat: @"%d", [user numberOfSimultaneousBookings]], @"NumberOfSimultaneousBookings",
+                                                 [user cn], @"Cn",
+                                                 [user systemEmail], @"SystemEmail",
+                                          ([event summary] ? [event summary] : @""), @"EventTitle",
+                                                       [[fbInfo objectAtIndex: 0] objectForKey: @"startDate"], @"StartDate",
+                                                 nil];
+
+                          reason = [values keysWithFormat: [self labelForKey: @"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\". The conflicting event is \"%{EventTitle}\", and starts on %{StartDate}."]];
+
+                          return [NSException exceptionWithHTTPStatus:403
+                                                               reason: reason];
+                        }
+                    }
+                  else
+                    {
+                      // No conflict, we auto-accept. We do this for resources automatically if no
+                      // double-booking is observed. If it's not the desired behavior, just don't
+                      // set the resource as one!
                       [[currentAttendee attributes] removeObjectForKey: @"RSVP"];
                       [currentAttendee setParticipationStatus: iCalPersonPartStatAccepted];
                     }
-		  else
-		    {
-		      iCalCalendar *calendar;
-		      NSDictionary *values;
-		      NSString *reason;
-		      iCalEvent *event;
-		      
-		      calendar =  [iCalCalendar parseSingleFromSource: [[fbInfo objectAtIndex: 0] objectForKey: @"c_content"]];
-		      event = [[calendar events] lastObject];
-		      
-		      values = [NSDictionary dictionaryWithObjectsAndKeys: 
-					       [NSString stringWithFormat: @"%d", [user numberOfSimultaneousBookings]], @"NumberOfSimultaneousBookings",
-					     [user cn], @"Cn",
-					     [user systemEmail], @"SystemEmail",
-				             ([event summary] ? [event summary] : @""), @"EventTitle",
-					     [[fbInfo objectAtIndex: 0] objectForKey: @"startDate"], @"StartDate",
-					     nil];
-
-		      reason = [values keysWithFormat: [self labelForKey: @"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\". The conflicting event is \"%{EventTitle}\", and starts on %{StartDate}."]];
-
-		      return [NSException exceptionWithHTTPStatus:403
-					  reason: reason];
-		    }
-		}
-	      else
-		{
-		  // No conflict, we auto-accept. We do this for resources automatically if no
-		  // double-booking is observed. If it's not the desired behavior, just don't
-		  // set the resource as one!
-                  [[currentAttendee attributes] removeObjectForKey: @"RSVP"];
-		  [currentAttendee setParticipationStatus: iCalPersonPartStatAccepted];
-		}
-  	    }
+                }
+            }
     }
 
   return nil;