Skip to content
Snippets Groups Projects
Commit 4090bfd6 authored by srosse's avatar srosse
Browse files

OO-1822: better tokenizer for external emails

parent 48dec6c8
No related branches found
No related tags found
No related merge requests found
...@@ -237,8 +237,8 @@ public class MembersMailController extends FormBasicController { ...@@ -237,8 +237,8 @@ public class MembersMailController extends FormBasicController {
String value = externalAddressesEl.getValue(); String value = externalAddressesEl.getValue();
StringBuilder errors = new StringBuilder(); StringBuilder errors = new StringBuilder();
if(StringHelper.containsNonWhitespace(value)) { if(StringHelper.containsNonWhitespace(value)) {
for(StringTokenizer tokenizer= new StringTokenizer(value, ",\n", false); tokenizer.hasMoreTokens(); ) { for(StringTokenizer tokenizer= new StringTokenizer(value, ",\r\n", false); tokenizer.hasMoreTokens(); ) {
String email = tokenizer.nextToken(); String email = tokenizer.nextToken().trim();
if(!MailHelper.isValidEmailAddress(email)) { if(!MailHelper.isValidEmailAddress(email)) {
if(errors.length() > 0) errors.append(", "); if(errors.length() > 0) errors.append(", ");
errors.append(email); errors.append(email);
...@@ -445,15 +445,13 @@ public class MembersMailController extends FormBasicController { ...@@ -445,15 +445,13 @@ public class MembersMailController extends FormBasicController {
if(externalEl != null && externalEl.isAtLeastSelected(1)) { if(externalEl != null && externalEl.isAtLeastSelected(1)) {
String value = externalAddressesEl.getValue(); String value = externalAddressesEl.getValue();
if(StringHelper.containsNonWhitespace(value)) { if(StringHelper.containsNonWhitespace(value)) {
for(StringTokenizer tokenizer= new StringTokenizer(value, ",\n", false); tokenizer.hasMoreTokens(); ) { for(StringTokenizer tokenizer= new StringTokenizer(value, ",\r\n", false); tokenizer.hasMoreTokens(); ) {
String email = tokenizer.nextToken(); String email = tokenizer.nextToken().trim();
contactList.add(new EMailIdentity(email, getLocale())); contactList.add(new EMailIdentity(email, getLocale()));
} }
} }
} }
doSendEmailToMember(ureq, contactList); doSendEmailToMember(ureq, contactList);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment