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

See ChangeLog 

Monotone-Parent: be2628456056b13146b29cb36efc2deaf49d537f
Monotone-Revision: e58e01ba23d307338c0721fcb30c8c45fb1a15f4

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-04-14T21:26:35
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Francis Lachapelle 2011-04-14 21:26:35 +00:00
parent 71597fbdcf
commit 419de8d134
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2011-04-14 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/UIxContactEditor.js
(validateContactEditor): now uses the regexp defined in generic.js
(emailRE) to validate the email addresses. This fixes an issue
with valid addresses starting with an underscore (bug #1246).
* UI/MailerUI/UIxMailAccountActions.m (-composeAction): properly decode
submitted recipients and subjects (URL-encoded).

11
UI/WebServerResources/UIxContactEditor.js
View File

@ -2,7 +2,7 @@
/*
Copyright (C) 2005 SKYRIX Software AG
Copyright (C) 2006-2010 Inverse
Copyright (C) 2006-2011 Inverse
This file is part of OpenGroupware.org.
@ -22,11 +22,6 @@
02111-1307, USA.
*/
var uixEmailUsr =
"([a-zA-Z0-9][a-zA-Z0-9_.-]*|\"([^\\\\\x80-\xff\015\012\"]|\\\\[^\x80-\xff])+\")";
var uixEmailDomain =
"([a-zA-Z0-9][a-zA-Z0-9._-]*\\.)*[a-zA-Z0-9][a-zA-Z0-9._-]*\\.[a-zA-Z]{2,6}";
var uixEmailRegex = new RegExp("^"+uixEmailUsr+"\@"+uixEmailDomain+"$");
var dateRegex = /^[0-9]{4}-[0-9]{2}-[0-9]{2}$/;
var displayNameChanged = false;
@ -88,14 +83,14 @@ function validateContactEditor() {
var e = $('workMail');
if (e.value.length > 0
&& !uixEmailRegex.test(e.value)) {
&& !emailRE.test(e.value)) {
alert(_("invalidemailwarn"));
rc = false;
}
e = $('homeMail');
if (e.value.length > 0
&& !uixEmailRegex.test(e.value)) {
&& !emailRE.test(e.value)) {
alert(_("invalidemailwarn"));
rc = false;
}