oc-calendar: Fix recipient type for invitations
Take into account optional attendees setting the recipient type to MAPI_CC when they have the iCal role set to OPT-PARTICIPANT instead of harding always MAPI_TO (required) as was done before. This is a complementary fix for: https://github.com/Zentyal/sogo/pull/108pull/79/head^2
parent
a8e8ec535a
commit
539060d252
|
@ -273,7 +273,7 @@ static NSCharacterSet *hexCharacterSet = nil;
|
||||||
recipient->username = NULL;
|
recipient->username = NULL;
|
||||||
entryId = MAPIStoreExternalEntryId (cn, email);
|
entryId = MAPIStoreExternalEntryId (cn, email);
|
||||||
}
|
}
|
||||||
recipient->type = MAPI_TO;
|
recipient->type = [[person role] isEqualToString: @"OPT-PARTICIPANT"] ? MAPI_CC : MAPI_TO;
|
||||||
|
|
||||||
/* properties */
|
/* properties */
|
||||||
p = 0;
|
p = 0;
|
||||||
|
@ -283,7 +283,7 @@ static NSCharacterSet *hexCharacterSet = nil;
|
||||||
// PR_OBJECT_TYPE = MAPI_MAILUSER (see MAPI_OBJTYPE)
|
// PR_OBJECT_TYPE = MAPI_MAILUSER (see MAPI_OBJTYPE)
|
||||||
recipient->data[p] = MAPILongValue (msgData, MAPI_MAILUSER);
|
recipient->data[p] = MAPILongValue (msgData, MAPI_MAILUSER);
|
||||||
p++;
|
p++;
|
||||||
|
|
||||||
// PR_DISPLAY_TYPE = DT_MAILUSER (see MS-NSPI)
|
// PR_DISPLAY_TYPE = DT_MAILUSER (see MS-NSPI)
|
||||||
recipient->data[p] = MAPILongValue (msgData, 0);
|
recipient->data[p] = MAPILongValue (msgData, 0);
|
||||||
p++;
|
p++;
|
||||||
|
@ -383,7 +383,7 @@ static NSCharacterSet *hexCharacterSet = nil;
|
||||||
// PR_OBJECT_TYPE = MAPI_MAILUSER (see MAPI_OBJTYPE)
|
// PR_OBJECT_TYPE = MAPI_MAILUSER (see MAPI_OBJTYPE)
|
||||||
recipient->data[p] = MAPILongValue (msgData, MAPI_MAILUSER);
|
recipient->data[p] = MAPILongValue (msgData, MAPI_MAILUSER);
|
||||||
p++;
|
p++;
|
||||||
|
|
||||||
// PR_DISPLAY_TYPE = DT_MAILUSER (see MS-NSPI)
|
// PR_DISPLAY_TYPE = DT_MAILUSER (see MS-NSPI)
|
||||||
recipient->data[p] = MAPILongValue (msgData, 0);
|
recipient->data[p] = MAPILongValue (msgData, 0);
|
||||||
p++;
|
p++;
|
||||||
|
|
Loading…
Reference in New Issue