From 60555b95682e59cb50f4e164a6861bbdcc9287f6 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 8 May 2012 18:58:57 +0000
Subject: [PATCH] See ChangeLog.

Monotone-Parent: dcd831afcbb347de38ec00c05b919923433a9f1f
Monotone-Revision: dbb4d0d0fcdbbccb83eb0faf29ecfd26bb48dbc0

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-05-08T18:58:57
---
 ChangeLog                    |  6 ++++++
 UI/Contacts/UIxContactView.m | 22 +++++++++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 47e33fe24..4255b1745 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/UI/Contacts/UIxContactView.m b/UI/Contacts/UIxContactView.m
index 53fb24428..0433e9a9a 100644
--- a/UI/Contacts/UIxContactView.m
+++ b/UI/Contacts/UIxContactView.m
@@ -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;
 	    }
 	}