amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-30 15:45:26 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 2946be96e24ef28355163488376def0341ef650f

Browse Source 
Monotone-Revision: 41b11d3b1b18c4d1c7da8ba97062c553d70d8596

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-08-26T17:16:16
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2008-08-26 17:16:16 +00:00
parent 335d43c92c
commit 674e436631
4 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/generic.js
+20 -6
View File
@@ -140,7 +140,7 @@ function extractEmailAddress(mailTo) {
var email = "";
var emailre
= /(([a-zA-Z0-9\._-]+)*[a-zA-Z0-9_-]+@([a-zA-Z0-9\._-]+)*[a-zA-Z0-9_-]+)/g;
= /(([a-zA-Z0-9\._-]+)*[a-zA-Z0-9_-]+@([a-zA-Z0-9\._-]+)*[a-zA-Z0-9_-]+)/;
if (emailre.test(mailTo)) {
emailre.exec(mailTo);
email = RegExp.$1;
@@ -155,18 +155,30 @@ function extractEmailName(mailTo) {
var tmpMailTo = mailTo.replace("&lt;", "<");
tmpMailTo = tmpMailTo.replace("&gt;", ">");
var emailNamere = /([ ]+)?(.+)\ </;
var emailNamere = /([^ ]+)\ </;
if (emailNamere.test(tmpMailTo)) {
emailNamere.exec(tmpMailTo);
emailName = RegExp.$2;
emailName = RegExp.$1;
}
return emailName;
}
function extractSubject(mailTo) {
var subject = "";
var subjectre = /\?subject=([^&]+)/;
if (subjectre.test(mailTo)) {
subjectre.exec(mailTo);
subject = RegExp.$1;
}
return subject;
}
function sanitizeMailTo(dirtyMailTo) {
var emailName = extractEmailName(dirtyMailTo);
var email = "" + extractEmailAddress(dirtyMailTo);
var email = extractEmailAddress(dirtyMailTo);
var mailto = "";
if (emailName && emailName.length > 0)
@@ -234,6 +246,7 @@ function openMailComposeWindow(url, wId) {
function openMailTo(senderMailTo) {
var addresses = senderMailTo.split(",");
var sanitizedAddresses = new Array();
var subject = extractSubject(senderMailTo);
for (var i = 0; i < addresses.length; i++) {
var sanitizedAddress = sanitizeMailTo(addresses[i]);
if (sanitizedAddress.length > 0)
@@ -241,10 +254,11 @@ function openMailTo(senderMailTo) {
}
var mailto = sanitizedAddresses.join(",");
if (mailto.length > 0)
openMailComposeWindow(ApplicationBaseURL
+ "../Mail/compose?mailto=" + mailto);
+ "../Mail/compose?mailto=" + mailto
+ ((subject.length > 0)?"?subject="+subject:""));
return false; /* stop following the link */
}