Merge OpenOLAT 8.4 to OpenOLAT default branch with 0850b25451c0fba42eaf6caf032dc462ef5b5dbc

src/main/java/org/olat/modules/co/ContactForm.java

@@ -162,7 +162,7 @@ public class ContactForm extends FormBasicController {
 			//a new ContactList, put it into contactLists
 			contactLists.put(emailList.getName(), emailList);
 			//and add its name in the form
-			addContactFormEmailTo("<" + emailList.getName() + ">");
+			addContactFormEmailTo("[" + emailList.getName() + "]");
 		}
 	}
 
@@ -250,12 +250,12 @@ public class ContactForm extends FormBasicController {
 		String sep = "";
 		int i = 0;
 		int j = -1;
-		i = value.indexOf("<", j + 1);
-		j = value.indexOf(">", j + 2);
+		i = value.indexOf("[", j + 1);
+		j = value.indexOf("]", j + 2);
 		while (i > -1 && j > 0) {
 			String contactListName = value.substring(i + 1, j);
-			i = value.indexOf("<", j + 1);
-			j = value.indexOf(">", j + 2);
+			i = value.indexOf("[", j + 1);
+			j = value.indexOf("]", j + 2);
 			if (contactLists.containsKey(contactListName)) {
 				ContactList found = contactLists.get(contactListName);
 				retVal += sep + found.toString();
@@ -373,7 +373,7 @@ public class ContactForm extends FormBasicController {
 		setFormTitle("header.newcntctmsg");
 		String fullName = userManager.getUserDisplayName(emailFrom);
 		if(StringHelper.containsNonWhitespace(fullName)) {
-			fullName = "<" + fullName + ">";
+			fullName = "[" + fullName + "]";
 		}
 		tfrom = uifactory.addTextElement("ttfrom", NLS_CONTACT_FROM, 255, fullName, formLayout);
 		tfrom.setEnabled(false);