Skip to content

O
Openfire
Commit c8836d9b authored by Greg Thomas's avatar Greg Thomas Committed by Guus der Kinderen
Browse files
Options

Fix NPE on User Properties screen

parent c31c4ac2
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 24 deletions
src/web/user-properties.jsp
View file @ c8836d9b
...@@ -301,34 +301,37 @@ ...@@ -301,34 +301,37 @@
</table> </table>
</div> </div>
<br> <% if (user != null) { %>
<div class="jive-table"> <br>
<table cellpadding="0" cellspacing="0" border="0" width="100%"> <div class="jive-table">
<thead> <table cellpadding="0" cellspacing="0" border="0" width="100%">
<tr> <thead>
<th colspan="2"><fmt:message key="user.properties.additional_properties" /></th> <tr>
</tr> <th colspan="2"><fmt:message key="user.properties.additional_properties" /></th>
</thead> </tr>
<tbody> </thead>
<% for(Map.Entry<String, String> properties : user.getProperties().entrySet()) { %> <tbody>
<tr> <% for(Map.Entry<String, String> properties : user.getProperties().entrySet()) { %>
<td class="c1"><%= StringUtils.escapeHTMLTags(properties.getKey()) %>:</td> <tr>
<td><%= StringUtils.escapeHTMLTags(properties.getValue()) %></td> <td class="c1"><%= StringUtils.escapeHTMLTags(properties.getKey()) %>:</td>
</tr> <td><%= StringUtils.escapeHTMLTags(properties.getValue()) %></td>
<% } %> </tr>
</tbody> <% } %>
</table> </tbody>
</div> </table>
</div>
<br><br>
<% if (user != null && !UserManager.getUserProvider().isReadOnly()) { %> <% if (!UserManager.getUserProvider().isReadOnly()) { %>
<form action="user-edit-form.jsp"> <br><br>
<input type="hidden" name="username" value="<%= StringUtils.escapeForXML(user.getUsername()) %>">
<input type="submit" value="<fmt:message key="global.edit_properties" />">
</form>
<form action="user-edit-form.jsp">
<input type="hidden" name="username" value="<%= StringUtils.escapeForXML(user.getUsername()) %>">
<input type="submit" value="<fmt:message key="global.edit_properties" />">
</form>
<% } %>
<% } %> <% } %>
</body> </body>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023