This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit ebfdb7779872e628db88e071deae5e29bd909651 Author: Kevin Morin <morin@codelutin.com> Date: Thu Aug 3 11:38:58 2017 +0200 fixes #9321 mauvaise suppression d'un validateur --- .../validators/FaxToMailEmailsValidator.java | 20 ++++++++++++++++++++ faxtomail-service/src/main/resources/validators.xml | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailsValidator.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailsValidator.java new file mode 100644 index 00000000..9001b936 --- /dev/null +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailsValidator.java @@ -0,0 +1,20 @@ +package com.franciaflex.faxtomail.services.validators; + +import com.opensymphony.xwork2.validator.validators.EmailValidator; + +/** + * Surcharge du validateur d'email par default de struts + * pour autoriser plusieurs emails séparés par des points-virgule + */ +public class FaxToMailEmailsValidator extends EmailValidator { + + // see XW-371 + public static final String EMAIL_ADDRESSES_PATTERN = + "\\b^['_a-z0-9-\\+]+(\\.['_a-z0-9-\\+]+)*@[a-z0-9-]+(\\.[a-z0-9-]+)*\\.([a-z]{2,6})" + + "(\\s*;\\s*['_a-z0-9-\\+]+(\\.['_a-z0-9-\\+]+)*@[a-z0-9-]+(\\.[a-z0-9-]+)*\\.([a-z]{2,6}))*" + + "$\\b"; + + public FaxToMailEmailsValidator() { + setRegex(EMAIL_ADDRESSES_PATTERN); + } +} diff --git a/faxtomail-service/src/main/resources/validators.xml b/faxtomail-service/src/main/resources/validators.xml index 742d5d09..56e1156c 100644 --- a/faxtomail-service/src/main/resources/validators.xml +++ b/faxtomail-service/src/main/resources/validators.xml @@ -48,5 +48,5 @@ <!-- les validateur specifiques --> <validator name="email" class="com.opensymphony.xwork2.validator.validators.EmailValidator"/> - <validator name="emails" class="com.opensymphony.xwork2.validator.validators.EmailValidator"/> + <validator name="emails" class="com.franciaflex.faxtomail.services.validators.FaxToMailEmailsValidator"/> </validators> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.