From 712517a6561a58b88d5be20bf2f04f3c16bde1e1 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 19 Sep 2006 21:11:53 +0000 Subject: [PATCH] Monotone-Parent: cd791802b57399943d944e80382992d9a7043113 Monotone-Revision: 285b909701dbd3013603eaa63851c1a2b4fa6901 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-09-19T21:11:53 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/MailerUI.js | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js index e45003462..4d92bd654 100644 --- a/UI/WebServerResources/MailerUI.js +++ b/UI/WebServerResources/MailerUI.js @@ -801,20 +801,29 @@ function onMenuDeleteMessage(event) /* contacts */ function newContactFromEmail(sender) { + var mailto = sender.parentNode.parentNode.menuTarget.innerHTML; + var emailre = /([a-zA-Z][\w\.-]*[a-zA-Z0-9]@[a-zA-Z0-9][\w\.-]*[a-zA-Z0-9]\.[a-zA-Z][a-zA-Z\.]*[a-zA-Z])/g; - - emailre.exec(sender.parentNode.parentNode.menuTarget.innerHTML); + emailre.exec(mailto); email = RegExp.$1; + var namere = /(\w[\w\ _-]+)\ (<|<)/; + var c_name = ''; + if (namere.test(mailto)) { + namere.exec(mailto); + c_name += RegExp.$1; + } + if (email.length > 0) { emailre.exec(""); - w = window.open(UserFolderURL + "Contacts/new?contactEmail=" + email, - "SOGo_new_contact", - "width=680,height=520,resizable=1,scrollbars=1,toolbar=0," - + "location=0,directories=0,status=0,menubar=0," - + "copyhistory=0"); + var url = UserFolderURL + "Contacts/new?contactEmail=" + email; + if (c_name) + url += "&contactFN=" + c_name; + w = window.open(url, null, + "width=546,height=490,resizable=1,scrollbars=1,toolbar=0," + + "location=0,directories=0,status=0,menubar=0,copyhistory=0"); w.focus(); }