This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit b0dbc813430a2772b385f578a14618d1692f23c5 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 17 14:32:00 2015 +0200 fixes #7533 Ne plus prendre en compte les noms de domaine dans les adresses expéditeur dans les réponses --- .../faxtomail/ui/swing/content/reply/ReplyFormUIModel.java | 3 ++- .../src/main/webapp/WEB-INF/content/admin/configuration-input.jsp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java index 4deecc8..e3fea53 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java @@ -308,7 +308,8 @@ public class ReplyFormUIModel extends AbstractSerializableBean { if (PROPERTY_FROM.equals(field)) { // valid if the email address is in the list of the authorized addresses // or if the domain is in the authorized domains, or if the domain list is empty - result = isEmailAllowed(getFrom()) || isDomainAllowed(getFrom()); + // 20150917 kmorin #7533 Ne plus prendre en compte les noms de domaine dans les adresses expéditeur dans les réponses + result = isEmailAllowed(getFrom());// || isDomainAllowed(getFrom()); } return result; } diff --git a/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp b/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp index aded7c7..7b31e82 100644 --- a/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp +++ b/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp @@ -664,7 +664,7 @@ </a> </div> - <br /> + <%-- <br /> <table class="table table-bordered"> <thead> @@ -708,7 +708,7 @@ <a class="btn btn-success btn-xs" ng-click="addReplyDomain()" ng-disabled="!newReplyDomain"> <span class="glyphicon glyphicon-plus"></span> </a> - </div> + </div> --%> </div> </div> </div> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.