OF-108: Avoid adding <br> tags for newlines in system properties (Peter Johnson)

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@13635 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/util/StringUtils.java

@@ -263,6 +263,20 @@ public class StringUtils {
      *         with their HTML escape sequences.
      */
     public static String escapeHTMLTags(String in) {
+    	return escapeHTMLTags(in, true);
+    }
+
+    /**
+     * This method takes a string which may contain HTML tags (ie, <b>,
+     * <table>, etc) and converts the '&lt'' and '>' characters to
+     * their HTML escape sequences.
+     *
+     * @param in the text to be converted.
+     * @param includeLF set to true to replace \n with <br>.
+     * @return the input string with the characters '&lt;' and '&gt;' replaced
+     *         with their HTML escape sequences.
+     */
+    public static String escapeHTMLTags(String in, boolean includeLF) {
         if (in == null) {
             return null;
         }
@@ -290,7 +304,7 @@ public class StringUtils {
                 last = i + 1;
                 out.append(GT_ENCODE);
             }
-            else if (ch == '\n') {
+            else if (ch == '\n' && includeLF == true) {
                 if (i > last) {
                     out.append(input, last, i - last);
                 }

src/web/server-properties.jsp

@@ -345,7 +345,7 @@ function dodelete(propName) {
             <fmt:message key="server.properties.value" />:
         </td>
         <td>
-            <textarea cols="45" rows="5" name="propValue" wrap="virtual"><%= (propValue != null ? StringUtils.escapeHTMLTags(propValue) : "") %></textarea>
+            <textarea cols="45" rows="5" name="propValue" wrap="virtual"><%= (propValue != null ? StringUtils.escapeHTMLTags(propValue, false) : "") %></textarea>
 
             <%  if (errors.containsKey("propValue")) { %>