From 69a125b98014159bb4a64c48aac4a7aa215e9531 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 2 Jun 2009 21:51:17 +0000
Subject: [PATCH] See ChangeLog

Monotone-Parent: d0922ce075360a9cfb2cbf684f4b1552ebfdb435
Monotone-Revision: f84e8d517a23517ef7550171fec8fa0d26a53ef2

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-06-02T21:51:17
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                     |  7 +++
 .../Appointments/SOGoAppointmentObject.m      | 43 +++++++++++--------
 2 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a4f912793..fd29a2e69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-06-02  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* SoObjects/Appointments/SOGoAppointmentObject.m
+	([SOGoAppointmentObject -postCalDAVEventRequestTo:from:]): remove
+	alarms from invitation and set organizer of master event when
+	dealing with a recurrent event.
+
 2009-06-02  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* Tools/sogo-contacts-removedoubles.m: new maintenance utility
diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 6de6bfb73..20008507f 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -219,23 +219,28 @@
 {
   if (![theUID isEqualToString: theOwner])
     {
-      SOGoAppointmentObject *object;
+      SOGoAppointmentObject *attendeeObject;
       NSString *iCalString;
 
-      object = [self _lookupEvent: [theEvent uid] forUID: theUID];
+      attendeeObject = [self _lookupEvent: [theEvent uid] forUID: theUID];
       
       // We must add an occurence to a non-existing event. We have
       // to handle this with care, as in the postCalDAVEventRequestTo:from:
-      if ([object isNew] && [theEvent recurrenceId])
+      if ([attendeeObject isNew] && [theEvent recurrenceId])
 	{
-	  SOGoAppointmentObject *ownerEventObject;
+	  SOGoAppointmentObject *ownerObject;
 	  NSArray *attendees;
+	  iCalEvent *ownerEvent;
 	  iCalPerson *person;
 	  SOGoUser *user;
 	  BOOL found;
 	  int i;
 
-	  user = [SOGoUser userWithLogin: theUID  roles: nil];
+	  // We check if the attendee that was added to a single occurence is
+	  // present in the master component. If not, we add it with a participation
+	  // status set to "DECLINED".
+
+	  user = [SOGoUser userWithLogin: theUID roles: nil];
 	  person = [iCalPerson elementWithTag: @"attendee"];
 	  [person setCn: [user cn]];
 	  [person setEmail: [[user allEmails] objectAtIndex: 0]];
@@ -243,14 +248,11 @@
 	  [person setRsvp: @"TRUE"];
 	  [person setRole: @"REQ-PARTICIPANT"];
 	  
-	  ownerEventObject = [self _lookupEvent: [theEvent uid] forUID: theOwner];
-	  theEvent = [[[theEvent parent] events] objectAtIndex: 0];	  
-	  attendees = [theEvent attendees];
+	  ownerObject = [self _lookupEvent: [theEvent uid] forUID: theOwner];
+	  ownerEvent = [[[theEvent parent] events] objectAtIndex: 0];
+	  attendees = [ownerEvent attendees];
 	  found = NO;
 	  
-	  // We check if the attendee that was added to a single occurence is
-	  // present in the master component. If not, we add it with a participation
-	  // status set to "DECLINED"
 	  for (i = 0; i < [attendees count]; i++)
 	    {
 	      if ([[attendees objectAtIndex: i] hasSameEmailAddress: person])
@@ -262,9 +264,11 @@
 	  
 	  if (!found)
 	    {
-	      [theEvent addToAttendees: person];
-	      iCalString = [[theEvent parent] versitString];
-	      [ownerEventObject saveContentString: iCalString];
+	      // Update the master event in the owner's calendar with the
+	      // status of the new attendee set as "DECLINED".
+	      [ownerEvent addToAttendees: person];
+	      iCalString = [[ownerEvent parent] versitString];
+	      [ownerObject saveContentString: iCalString];
 	    }
 	} 
       else
@@ -272,7 +276,8 @@
 	  iCalString = [[theEvent parent] versitString];
 	}
       
-      [object saveContentString: iCalString];
+      // Save the event in the attendee's calendar
+      [attendeeObject saveContentString: iCalString];
     }
 }
 
@@ -776,16 +781,18 @@
   NSEnumerator *recipientsEnum;
   NSString *recipient, *uid, *ownerUID;
   iCalEvent *newEvent, *oldEvent, *emailEvent;
-  iCalPerson *person;
+  iCalPerson *person, *eventOwner;
   BOOL isUpdate, hasChanged;
   
   elements = [NSMutableArray array];
   ownerUID = [[LDAPUserManager sharedUserManager]
 	       getUIDForEmail: originator];
+  eventOwner = [self iCalPersonWithUID: ownerUID];
   emailEvent = [self component: NO secure: NO];
   newEvent = [self component: NO secure: NO];
+  [newEvent removeAllAlarms];
   [[newEvent parent] setMethod: @""];
-
+  
   recipientsEnum = [recipients objectEnumerator];
   while ((recipient = [recipientsEnum nextObject]))
     if ([[recipient lowercaseString] hasPrefix: @"mailto:"])
@@ -897,6 +904,8 @@
 		    [person setRsvp: @"TRUE"];
 		    [person setRole: @"REQ-PARTICIPANT"];
 		    [newEvent addToAttendees: person];
+		    if ([[newEvent organizer] isVoid])
+		      [newEvent setOrganizer: eventOwner];
 		    [ownerEventObject saveContentString: [[newEvent parent] versitString]];
 		  }
 	      }