OO-894 replace emoticons with inline data uri in emails

src/main/java/org/olat/core/util/filter/FilterFactory.java

@@ -25,6 +25,7 @@ import org.olat.core.util.filter.impl.ConditionalHTMLCommentsFilter;
 import org.olat.core.util.filter.impl.NekoHTMLFilter;
 import org.olat.core.util.filter.impl.OWASPAntiSamyXSSFilter;
 import org.olat.core.util.filter.impl.SimpleHTMLTagsFilter;
+import org.olat.core.util.filter.impl.SmileysCssToDataUriFilter;
 import org.olat.core.util.filter.impl.XMLValidCharacterFilter;
 
 /**
@@ -44,6 +45,7 @@ public class FilterFactory {
 	private static final Filter htmlTagsAndDesescapingFilter = new NekoHTMLFilter();
 	private static final Filter conditionalCommentsFilter = new ConditionalHTMLCommentsFilter();
 	private static final Filter xmlValidCharacterFilter = new XMLValidCharacterFilter();
+	private static final Filter smileysCssToDataUriFilter = new SmileysCssToDataUriFilter();
 
 	/**
 	 * Get an instance of the HTML tag filter
@@ -101,4 +103,12 @@ public class FilterFactory {
 	public static Filter getBaseURLToMediaRelativeURLFilter(String mapperBaseURL) {
 		return new AddBaseURLToMediaRelativeURLFilter(mapperBaseURL);
 	}
+
+	/**
+	 * Get a filter that replaces TinyMCE image tags with data uri images, e.g. for HTML emails
+	 * @return
+	 */
+	public static Filter getSmileysCssToDataUriFilter() {
+		return smileysCssToDataUriFilter;
+	}
 }

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

@@ -55,6 +55,8 @@ import org.olat.core.id.Identity;
 import org.olat.core.util.FileUtils;
 import org.olat.core.util.StringHelper;
 import org.olat.core.util.Util;
+import org.olat.core.util.filter.FilterFactory;
+import org.olat.core.util.filter.impl.SmileysCssToDataUriFilter;
 import org.olat.core.util.mail.ContactList;
 import org.olat.core.util.mail.MailModule;
 import org.olat.user.UserManager;
@@ -272,7 +274,7 @@ public class ContactForm extends FormBasicController {
 	 * @return email body text
  	 */
  	public String getBody() {
- 		return tbody.getValue();
+ 		return tbody.getValue(FilterFactory.getSmileysCssToDataUriFilter());
 	}
  	
  	public File[] getAttachments() {