See ChangeLog
Monotone-Parent: 02a0c346903984d754efc6a1339191e14f2a9b9f Monotone-Revision: 81e5a2cbed9325efd0e582da75adabe4e79cff9f Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2012-08-27T09:40:18maint-2.0.2
parent
8d1303f41d
commit
23386cab11
|
@ -1,3 +1,9 @@
|
|||
2012-08-27 Ludovic Marcotte <lmarcotte@inverse.ca>
|
||||
|
||||
* SoObjects/Appointments/iCalPerson+SOGo.m (mailAddress):
|
||||
We now properly add double-quotes if we find a comma and
|
||||
the person's name isn't already double-quoted. Fixes #1649
|
||||
|
||||
2012-08-24 Francis Lachapelle <flachapelle@inverse.ca>
|
||||
|
||||
* UI/MailPartViewers/UIxMailPartHTMLViewer.m (_sanitizeContent):
|
||||
|
|
1
NEWS
1
NEWS
|
@ -12,6 +12,7 @@ Bug Fixes
|
|||
- fixed handling of exception dates with timezones in recurrent events
|
||||
- fixed validation of the interval in daily recurrent events with a day mask
|
||||
covering multiple days
|
||||
- fixed name quoting when sending invitations
|
||||
|
||||
1.3.17 (2012-07-26)
|
||||
-------------------
|
||||
|
|
|
@ -1,9 +1,10 @@
|
|||
/* SOGoCalendarComponent.m - this file is part of SOGo
|
||||
*
|
||||
* Copyright (C) 2006-2011 Inverse inc.
|
||||
* Copyright (C) 2006-2012 Inverse inc.
|
||||
*
|
||||
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
* Francis Lachapelle <flachapelle@inverse.ca>
|
||||
* Ludovic Marcotte <lmarcotte@inverse.ca>
|
||||
*
|
||||
* This file is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -951,6 +952,9 @@
|
|||
}
|
||||
}
|
||||
|
||||
//
|
||||
//
|
||||
//
|
||||
- (void) sendResponseToOrganizer: (iCalRepeatableEntityObject *) newComponent
|
||||
from: (SOGoUser *) from
|
||||
{
|
||||
|
@ -969,6 +973,9 @@
|
|||
}
|
||||
}
|
||||
|
||||
//
|
||||
//
|
||||
//
|
||||
- (void) sendReceiptEmailForObject: (iCalRepeatableEntityObject *) object
|
||||
addedAttendees: (NSArray *) theAddedAttendees
|
||||
deletedAttendees: (NSArray *) theDeletedAttendees
|
||||
|
@ -1069,6 +1076,9 @@
|
|||
|
||||
}
|
||||
|
||||
//
|
||||
//
|
||||
//
|
||||
- (iCalPerson *) findParticipantWithUID: (NSString *) uid
|
||||
{
|
||||
iCalEntityObject *component;
|
||||
|
@ -1080,6 +1090,9 @@
|
|||
return [component userAsAttendee: user];
|
||||
}
|
||||
|
||||
//
|
||||
//
|
||||
//
|
||||
- (iCalPerson *) iCalPersonWithUID: (NSString *) uid
|
||||
{
|
||||
iCalPerson *person;
|
||||
|
@ -1097,6 +1110,9 @@
|
|||
return person;
|
||||
}
|
||||
|
||||
//
|
||||
//
|
||||
//
|
||||
- (NSArray *) getUIDsForICalPersons: (NSArray *) iCalPersons
|
||||
{
|
||||
iCalPerson *currentPerson;
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
/* iCalPerson+SOGo.h - this file is part of SOGo
|
||||
*
|
||||
* Copyright (C) 2007-2009 Inverse inc.
|
||||
* Copyright (C) 2007-2012 Inverse inc.
|
||||
*
|
||||
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
* Ludovic Marcotte <lmarcotte@inverse.ca>
|
||||
*
|
||||
* This file is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
/* iCalPerson+SOGo.m - this file is part of SOGo
|
||||
*
|
||||
* Copyright (C) 2007-2009 Inverse inc.
|
||||
* Copyright (C) 2007-2012 Inverse inc.
|
||||
*
|
||||
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
* Ludovic Marcotte <lmarcotte@inverse.ca>
|
||||
*
|
||||
* This file is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -33,11 +34,23 @@ static SOGoUserManager *um = nil;
|
|||
- (NSString *) mailAddress
|
||||
{
|
||||
NSString *cn, *email, *mailAddress;
|
||||
unsigned int len;
|
||||
|
||||
cn = [self cnWithoutQuotes];
|
||||
email = [self rfc822Email];
|
||||
if ([cn length])
|
||||
mailAddress = [NSString stringWithFormat:@"%@ <%@>", cn, email];
|
||||
len = [cn length];
|
||||
|
||||
if (len)
|
||||
{
|
||||
// We must check if we have to double-quote properly the person's name,
|
||||
// in case for example we find a comma
|
||||
if ([cn characterAtIndex: 0] != '"' &&
|
||||
[cn characterAtIndex: len-1] != '"' &&
|
||||
[cn rangeOfString: @","].length)
|
||||
mailAddress = [NSString stringWithFormat:@"\"%@\" <%@>", cn, email];
|
||||
else
|
||||
mailAddress = [NSString stringWithFormat:@"%@ <%@>", cn, email];
|
||||
}
|
||||
else
|
||||
mailAddress = email;
|
||||
|
||||
|
|
Loading…
Reference in New Issue