Merge pull request #80 from Redor/openfire

OF-842: Additional properties in User Properties view

src/i18n/openfire_i18n_en.properties

@@ -535,6 +535,9 @@
 ##      Added key: 'setup.host.settings.encryption_key_invalid'
 ##      Added key: 'server.properties.delete_confirm'
 ##      Added key: 'server.properties.encrypt_confirm'
+##
+## 3.10.0
+##      Added key: 'user.properties.additional_propertie'
 
 # Openfire
 
@@ -2453,6 +2456,7 @@ user.properties.locked_set=This account has a lockout scheduled.
 user.properties.locksuccess=User locked out successfully.
 user.properties.unlocksuccess=User unlocked successfully.
 user.properties.isadmin=User has administrative privileges.
+user.properties.additional_properties=Additional Properties
 
 # User roster Page
 

src/web/user-properties.jsp

@@ -32,6 +32,7 @@
 <%@ page import="org.xmpp.packet.JID"%><%@ page import="org.xmpp.packet.Presence"%>
 <%@ page import="java.net.URLEncoder" %>
 <%@ page import="java.util.Collection" %>
+<%@ page import="java.util.Map" %>
 <%@ page import="org.jivesoftware.util.StringUtils" %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
@@ -302,6 +303,25 @@
 </table>
 </div>
 
+<br>
+<div class="jive-table">
+	<table cellpadding="0" cellspacing="0" border="0" width="100%">
+		<thead>
+			<tr>
+				<th colspan="2"><fmt:message key="user.properties.additional_properties" /></th>
+			</tr>
+		</thead>
+		<tbody>
+			<% for(Map.Entry<String, String> properties : user.getProperties().entrySet()) { %>
+			<tr>
+				<td class="c1"><%= StringUtils.escapeHTMLTags(properties.getKey()) %>:</td>
+				<td><%= StringUtils.escapeHTMLTags(properties.getValue()) %></td>
+			</tr>
+			<% } %>
+		</tbody>
+	</table>
+</div>
+
 <br><br>
 
 <% if (user != null && !UserManager.getUserProvider().isReadOnly()) { %>