diff --git a/ChangeLog b/ChangeLog index a3dc04b91..f77376bad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-01-07 Wolfgang Sourdeau + + * OpenChange/SOGoAppointmentObject+MAPIStore.m: same as below. + + * OpenChange/SOGoTaskObject+MAPIStore.m (-setMAPIProperties:): set + a value for CREATED and DTSTAMP + 2011-01-05 Wolfgang Sourdeau * OpenChange/MAPIStoreTasksMessageTable.m diff --git a/OpenChange/SOGoAppointmentObject+MAPIStore.m b/OpenChange/SOGoAppointmentObject+MAPIStore.m index dd79ed10b..21bfdf9c7 100644 --- a/OpenChange/SOGoAppointmentObject+MAPIStore.m +++ b/OpenChange/SOGoAppointmentObject+MAPIStore.m @@ -48,45 +48,11 @@ /* TODO: merge with tasks */ - (void) setMAPIProperties: (NSDictionary *) properties { - /* --dtstart=2007-06-01\ 22:00:00 --dtend=2007-06-01\ 22:35:00 - --busystatus=FREE --location=Home --subject=Check\ the\ Junk\ folder - - -> - 2010-11-19 14:55:06.504 samba[13652] message properties (31): - 2010-11-19 14:55:06.504 samba[13652] 0x810c001f (unknown): Home (GSCBufferString) - 2010-11-19 14:55:06.505 samba[13652] 0x00600040 (PR_START_DATE): 2007-06-01 22:00:00 -0400 (NSGDate) - 2010-11-19 14:55:06.504 samba[13652] 0x00610040 (PR_END_DATE): 2007-06-01 22:35:00 -0400 (NSGDate) - 2010-11-19 14:55:06.505 samba[13652] 0x30080040 (PR_LAST_MODIFICATION_TIME): 2010-11-19 14:55:06 -0500 (NSGDate) - 2010-11-19 14:55:06.504 samba[13652] 0x30070040 (PR_CREATION_TIME): 2010-11-19 14:55:06 -0500 (NSGDate) - 2010-11-19 14:55:06.504 samba[13652] 0x0e1d001f (PR_NORMALIZED_SUBJECT_UNICODE): Check the Junk folder (GSCBufferString) - - 2010-11-19 14:55:06.504 samba[13652] 0x81980040 (unknown): 2007-06-01 22:35:00 -0400 (NSGDate) - 2010-11-19 14:55:06.504 samba[13652] 0x0e1b000b (PR_HASATTACH): 0 (NSIntNumber) - 2010-11-19 14:55:06.504 samba[13652] 0x3ff10003 (PR_MESSAGE_LOCALE_ID): 4095 (NSIntNumber) - 2010-11-19 14:55:06.504 samba[13652] 0x0ff40003 (PR_ACCESS): 3 (NSIntNumber) - 2010-11-19 14:55:06.504 samba[13652] 0x0070001f (PR_CONVERSATION_TOPIC_UNICODE): Check the Junk folder (GSCBufferString) - 2010-11-19 14:55:06.504 samba[13652] 0x81e90003 (unknown): 30 (NSIntNumber) - 2010-11-19 14:55:06.504 samba[13652] 0x10f3001e (PR_URL_COMP_NAME): No Subject.EML (GSCBufferString) - 2010-11-19 14:55:06.504 samba[13652] 0x0ff70003 (PR_ACCESS_LEVEL): 1 (NSIntNumber) - 2010-11-19 14:55:06.504 samba[13652] 0x81990040 (unknown): 2007-06-01 22:00:00 -0400 (NSGDate) - 2010-11-19 14:55:06.504 samba[13652] 0x8224000b (unknown): 0 (NSIntNumber) - 2010-11-19 14:55:06.504 samba[13652] 0x82410003 (unknown): 0 (NSIntNumber) - 2010-11-19 14:55:06.504 samba[13652] 0x0e62000b (PR_URL_COMP_NAME_SET): 0 (NSIntNumber) - 2010-11-19 14:55:06.504 samba[13652] 0x66a10003 (PR_LOCALE_ID): 4095 (NSIntNumber) - 2010-11-19 14:55:06.504 samba[13652] 0x00170003 (PR_IMPORTANCE): 1 (NSIntNumber) - 2010-11-19 14:55:06.504 samba[13652] 0x818a0040 (unknown): 2007-06-01 22:35:00 -0400 (NSGDate) - 2010-11-19 14:55:06.504 samba[13652] 0x81900003 (PR_EMS_AB_INCOMING_MSG_SIZE_LIMIT): 0 (NSIntNumber) - 2010-11-19 14:55:06.504 samba[13652] 0x0e070003 (PR_MESSAGE_FLAGS): 1 (NSIntNumber) - 2010-11-19 14:55:06.505 samba[13652] 0x001a001e (PR_MESSAGE_CLASS): IPM.Appointment (GSCBufferString) - 2010-11-19 14:55:06.505 samba[13652] 0x00360003 (PR_SENSITIVITY): 0 (NSIntNumber) - 2010-11-19 14:55:06.505 samba[13652] 0x0e790003 (PR_TRUST_SENDER): 1 (NSIntNumber) - 2010-11-19 14:55:06.505 samba[13652] 0x67090040 (PR_LOCAL_COMMIT_TIME): 2010-11-19 14:55:06 -0500 (NSGDate) - 2010-11-19 14:55:06.505 samba[13652] 0x818f0040 (unknown): 2007-06-01 22:00:00 -0400 (NSGDate) - 2010-11-19 14:55:06.505 samba[13652] 0x81930003 (unknown): 0 (NSIntNumber) */ iCalCalendar *vCalendar; iCalEvent *vEvent; id value; SOGoUserDefaults *ud; + NSCalendarDate *now; iCalTimeZone *tz; iCalDateTime *start, *end; @@ -134,6 +100,13 @@ [end setDateTime: value]; } + now = [NSCalendarDate date]; + if ([self isNew]) + { + [vEvent setCreated: now]; + } + [vEvent setTimeStampAsDate: now]; + // MAPIStoreDumpMessageProperties (properties); ASSIGN (content, [vCalendar versitString]); } diff --git a/OpenChange/SOGoTaskObject+MAPIStore.m b/OpenChange/SOGoTaskObject+MAPIStore.m index 60cd35ca3..d8f00dbec 100644 --- a/OpenChange/SOGoTaskObject+MAPIStore.m +++ b/OpenChange/SOGoTaskObject+MAPIStore.m @@ -47,60 +47,7 @@ /* TODO: merge with events */ - (void) setMAPIProperties: (NSDictionary *) properties { - MAPIStoreDumpMessageProperties (properties); - - /* --sendtask --dtstart="2008-11-01 18:00:00" --cardname="openchangeclient" - --importance=HIGH --taskstatus=COMPLETED --body="my new task" - - 0x0e070003 (PR_MESSAGE_FLAGS): 9 (NSIntNumber) - 0x0e1d001f (PR_NORMALIZED_SUBJECT_UNICODE): openchangeclient (GSCBufferString) - 0x1000001f (PR_BODY_UNICODE): my new task (GSCBufferString) - 0x30070040 (PR_CREATION_TIME): 2010-11-19 16:30:29 -0500 (NSCalendarDate) - 0x30080040 (PR_LAST_MODIFICATION_TIME): 2010-11-19 16:30:29 -0500 (NSCalendarDate) - 0x811f0040 (unknown): 2008-11-01 18:00:00 -0400 (NSCalendarDate) - 0x811e0040 (unknown): 2008-11-01 18:00:00 -0400 (NSCalendarDate) - - 0x0e790003 (PR_TRUST_SENDER): 1 (NSIntNumber) - 0x0ff70003 (PR_ACCESS_LEVEL): 1 (NSIntNumber) - 0x001a001e (PR_MESSAGE_CLASS): IPM.Task (GSCBufferString) - 0x00360003 (PR_SENSITIVITY): 0 (NSIntNumber) - 0x10f3001e (PR_URL_COMP_NAME): No Subject.EML (GSCBufferString) - 0x81200003 (unknown): 2 (NSIntNumber) - 0x00170003 (PR_IMPORTANCE): 2 (NSIntNumber) - 0x66a10003 (PR_LOCALE_ID): 4095 (NSIntNumber) - 0x0ff40003 (PR_ACCESS): 3 (NSIntNumber) - 0x3ff10003 (PR_MESSAGE_LOCALE_ID): 4095 (NSIntNumber) - 0x0e1b000b (PR_HASATTACH): 0 (NSIntNumber) - 0x67090040 (PR_LOCAL_COMMIT_TIME): 2010-11-19 16:30:29 -0500 (NSCalendarDate) - 0x0070001f (PR_CONVERSATION_TOPIC_UNICODE): openchangeclient (GSCBufferString) - 0x0e62000b (PR_URL_COMP_NAME_SET): 0 (NSIntNumber) - - status: - 0x81200003 (unknown): 0 (NSIntNumber) - 0x0070001f (PR_CONVERSATION_TOPIC_UNICODE): openchangeclientNOTSTARTED (GSCBufferString) - - 0x81200003 (unknown): 1 (NSIntNumber) - 0x0070001f (PR_CONVERSATION_TOPIC_UNICODE): openchangeclientPROGRESS (GSCBufferString) - - 0x81200003 (unknown): 2 (NSIntNumber) - 0x0070001f (PR_CONVERSATION_TOPIC_UNICODE): openchangeclientCOMPLETED (GSCBufferString) - - 0x81200003 (unknown): 3 (NSIntNumber) - 0x0070001f (PR_CONVERSATION_TOPIC_UNICODE): openchangeclientWAITING (GSCBufferString) - - 0x81200003 (unknown): 4 (NSIntNumber) - 0x0070001f (PR_CONVERSATION_TOPIC_UNICODE): openchangeclientDEFERRED (GSCBufferString) - - importance: - 0x00170003 (PR_IMPORTANCE): 0 (NSIntNumber) - 0x0070001f (PR_CONVERSATION_TOPIC_UNICODE): openchangeclientLOW (GSCBufferString) - - 0x00170003 (PR_IMPORTANCE): 1 (NSIntNumber) - 0x0070001f (PR_CONVERSATION_TOPIC_UNICODE): openchangeclientNORMAL (GSCBufferString) - - 0x00170003 (PR_IMPORTANCE): 2 (NSIntNumber) - 0x0070001f (PR_CONVERSATION_TOPIC_UNICODE): openchangeclientHIGH (GSCBufferString) - */ + // MAPIStoreDumpMessageProperties (properties); iCalCalendar *vCalendar; iCalToDo *vToDo; @@ -109,6 +56,7 @@ iCalTimeZone *tz; iCalDateTime *date; NSString *status, *priority; + NSCalendarDate *now; vToDo = [self component: YES secure: NO]; vCalendar = [vToDo parent]; @@ -199,6 +147,13 @@ priority = @"0"; // None [vToDo setPriority: priority]; + now = [NSCalendarDate date]; + if ([self isNew]) + { + [vToDo setCreated: now]; + } + [vToDo setTimeStampAsDate: now]; + // due // value = [properties objectForKey: MAPIPropertyKey (PR_DUE_DATE)]; // if (value)