massmail sms: fixes

Author: rkrenn

core/src/main/java/org/phoenixctms/ctsms/util/ServiceUtil.java

@@ -3435,7 +3435,7 @@ public static String getMassMailSubject(String format, Locales locale, String ma
 				throw L10nUtil.initServiceException(ServiceExceptionCodes.MASS_MAIL_INVALID_SUBJECT_FORMAT, format, e.getMessage());
 			}
 		}
-		return null;
+		return "";
 	}
 
 	private static Iterator<KeyValueString> getMassMailTemplateModelKeyValueIterator(Class vo, boolean enumerateEntities, boolean excludeEncryptedFields) throws Exception {

web/src/main/resources/org/phoenixctms/ctsms/web/massmail/labels.properties

@@ -129,7 +129,7 @@ mass_mail_usebeacon_tooltip=Embed a web beacon to see if the email message was r
 
 mass_mail_phone_to_email_format_label=Email address format for phone numbers:
 mass_mail_phone_to_email_format=Email address format for phone numbers
-mass_mail_phone_to_email_format_tooltip=The given format (eg. {0}@email2sms.linkmobility.eu) is used to convert phone contact details (eg. +43 123 1234567) to email adresses (eg. +431231234567@email2sms.linkmobility.eu).
+mass_mail_phone_to_email_format_tooltip=The given format (eg. {0}@email2sms.linkmobility.eu) is used to convert phone contact details (eg. +43 123 1234567) to email addresses (eg. +431231234567@email2sms.linkmobility.eu).
 
 message_field_set=Message
 

web/src/main/webapp/META-INF/includes/massmail/massMailMain.xhtml

@@ -771,7 +771,7 @@
 										<ui:param name="multiLineTextClass" value="ctsms-monospaced" />
 										<ui:param name="rendered" value="#{not massMailBean.in.html}" />
 										<ui:param name="showLength" value="true" />
-										<ui:param name="escapeHtml" value="false" />
+										<ui:param name="escapeHtml" value="true" />
 									</ui:include>
 
 								</h:panelGrid>

web/src/main/webapp/META-INF/includes/shared/multiLineOutputText.xhtml

@@ -17,7 +17,7 @@
 				rendered="#{showLength}"
 				styleClass="ctsms-text-length"
 				escape="false">
-				<f:param value="#{multiLineText.length()}" />
+				<f:param value="#{empty multiLineText ? 0 : multiLineText.length()}" />
 			</h:outputFormat>
 		</h:panelGroup>
 	</ui:composition>