amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-01 03:22:43 +00:00
Code Issues Projects Releases Wiki Activity

See ChangeLog.

Browse Source 
Monotone-Parent: 0b55311518f426ab169d4fd0db8cfe9a54c3e1e6
Monotone-Revision: dd1c46e2753c2224bf847ca7bf850d63b8f97372

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-06-30T17:26:06
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2010-06-30 17:26:06 +00:00
parent a7a47ba59b
commit e8ecf7e53b
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -6,6 +6,9 @@
2010-06-30 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/UIxPreferences.js (savePreferences): added
email validation of forward address (if enabled).
* UI/WebServerResources/MailerUI.js (onDocumentKeydown): improved
scrolling when using the arrows keys.

3
UI/WebServerResources/UIxMailToSelection.js
View File

@@ -134,8 +134,6 @@ function addressFieldLostFocus(sender) {
var addresses = sender.value.split(',');
if (addresses.length > 0) {
var emailRE = /^([\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+\.)*[\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+@((((([a-z0-9]{1}[a-z0-9\-]{0,62}[a-z0-9]{1})|[a-z])\.)+[a-z]{2,6})|(\d{1,3}\.){3}\d{1,3}(\:\d{1,5})?)$/i;
var first = true;
for (var i = 0; i < addresses.length; i++) {
var words = addresses[i].split(' ');
@@ -143,6 +141,7 @@ function addressFieldLostFocus(sender) {
for (var j = 0; j < words.length; j++) {
var word = words[j].strip().replace(/<(.+)>/, "$1");
if (word.length > 0) {
// Use the regexp defined in generic.js
if (emailRE.test(word)) {
phrase.push('<' + word + '>');
if (first) {

2
UI/WebServerResources/UIxPreferences.js
View File

@@ -35,7 +35,7 @@ function savePreferences(sender) {
}
if ($("enableForward") && $("enableForward").checked) {
if ($("forwardAddress").value.strip().length == 0) {
if (!emailRE.test($("forwardAddress").value)) {
alert(_("Please specify an address to which you want to forward your messages."));
sendForm = false;
}

4
UI/WebServerResources/generic.js
View File

@@ -45,6 +45,10 @@ var Alarms = new Array();
var activeAjaxRequests = 0;
var removeFolderRequestCount = 0;
// Email validation regexp
var emailRE = /^([\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+\.)*[\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+@((((([a-z0-9]{1}[a-z0-9\-]{0,62}[a-z0-9]{1})|[a-z])\.)+[a-z]{2,6})|(\d{1,3}\.){3}\d{1,3}(\:\d{1,5})?)$/i;
function createElement(tagName, id, classes,
attributes, htmlAttributes,
parentNode) {