LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

See ChangeLog. 

Monotone-Parent: dcd831afcbb347de38ec00c05b919923433a9f1f
Monotone-Revision: dbb4d0d0fcdbbccb83eb0faf29ecfd26bb48dbc0

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-05-08T18:58:57
maint-2.0.2
Francis Lachapelle 2012-05-08 18:58:57 +00:00
parent dfd0339f9d
commit 60555b9568
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2012-05-08 Francis Lachapelle <flachapelle@inverse.ca>
* UI/Contacts/UIxContactView.m (-primaryEmail): in the mailto
link, remove double-quotes and escape single-quotes from the fullname.
(-secondaryEmail): idem.
2012-05-01 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/WebServerResources/generic.js (accessToSubscribedFolder): use

22
UI/Contacts/UIxContactView.m
View File

@ -1,6 +1,6 @@
/*
Copyright (C) 2004 SKYRIX Software AG
Copyright (C) 2005-2011 Inverse inc.
Copyright (C) 2005-2012 Inverse inc.
This file is part of SOGo.
@ -135,13 +135,18 @@
- (NSString *) primaryEmail
{
NSString *email, *mailTo;
NSString *email, *fn, *mailTo;
email = [card preferredEMail];
if ([email length] > 0)
mailTo = [NSString stringWithFormat: @"<a href=\"mailto:%@\""
@" onclick=\"return openMailTo('%@ <%@>');\">"
@"%@</a>", email, [[card fn] stringByReplacingString: @"\"" withString: @""], email, email];
{
fn = [card fn];
fn = [fn stringByReplacingString: @"\"" withString: @""];
fn = [fn stringByReplacingString: @"'" withString: @"\\\'"];
mailTo = [NSString stringWithFormat: @"<a href=\"mailto:%@\""
@" onclick=\"return openMailTo('%@ <%@>');\">"
@"%@</a>", email, fn, email, email];
}
else
mailTo = nil;
@ -151,7 +156,7 @@
- (NSString *) secondaryEmail
{
NSString *email, *mailTo;
NSString *email, *fn, *mailTo;
NSMutableArray *emails;
emails = [NSMutableArray array];
@ -182,9 +187,12 @@
if ([email caseInsensitiveCompare: [card preferredEMail]] != NSOrderedSame)
{
fn = [card fn];
fn = [fn stringByReplacingString: @"\"" withString: @""];
fn = [fn stringByReplacingString: @"'" withString: @"\\\'"];
mailTo = [NSString stringWithFormat: @"<a href=\"mailto:%@\""
@" onclick=\"return openMailTo('%@ <%@>');\">"
@"%@</a>", email, [[card fn] stringByReplacingString: @"\"" withString: @""], email, email];
@"%@</a>", email, fn, email, email];
break;
}
}