mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-04-14 01:38:51 +00:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -990,12 +990,12 @@
|
||||
{
|
||||
NSString *calendarName, *mailDate, *mailText, *fullSenderEmail, *senderEmail, *fullRecipientEmail, *recipientEmail;
|
||||
NSDictionary *senderIdentity, *recipientIdentity;
|
||||
SOGoAptMailReceipt *page;
|
||||
NGMutableHashMap *headerMap;
|
||||
NGMimeMessage *msg;
|
||||
SOGoUser *currentUser;
|
||||
SOGoDomainDefaults *dd;
|
||||
id <SOGoAuthenticator> authenticator;
|
||||
SOGoUser *currentUser, *ownerUser;
|
||||
NGMutableHashMap *headerMap;
|
||||
SOGoAptMailReceipt *page;
|
||||
SOGoDomainDefaults *dd;
|
||||
NGMimeMessage *msg;
|
||||
|
||||
calendarName = [[self container] displayName];
|
||||
|
||||
@@ -1028,8 +1028,8 @@
|
||||
[headerMap setObject: fullSenderEmail forKey: @"from"];
|
||||
|
||||
// Recipient is fixed, which is the calendar owner
|
||||
currentUser = [SOGoUser userWithLogin: self->owner];
|
||||
recipientIdentity = [currentUser primaryIdentity];
|
||||
ownerUser = [SOGoUser userWithLogin: self->owner];
|
||||
recipientIdentity = [ownerUser primaryIdentity];
|
||||
recipientEmail = [recipientIdentity objectForKey: @"email"];
|
||||
fullRecipientEmail = [recipientIdentity keysWithFormat: @"%{fullName} <%{email}>"];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user