Commit f4f061e6 authored by Daniel Henninger's avatar Daniel Henninger Committed by dhenninger

[JM-1299] HTML doesn't necessarily agree with XML.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/branches@10091 b35dd754-fafc-0310-a699-88a17e54d16e
parent 84ef0cf2
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
String defaultSearchFilter; String defaultSearchFilter;
// First check if the http session holds data from a previous post of this page // First check if the http session holds data from a previous post of this page
if (session.getAttribute("ldapUserSettings") != null && session.getAttribute("ldapVCardBean") != null) { if (session.getAttribute("ldapUserSettings") != null && session.getAttribute("ldapVCardBean") != null) {
@SuppressWarnings("unchecked")
Map<String, String> userSettings = (Map<String, String>) session.getAttribute("ldapUserSettings"); Map<String, String> userSettings = (Map<String, String>) session.getAttribute("ldapUserSettings");
defaultUsernameField = userSettings.get("ldap.usernameField"); defaultUsernameField = userSettings.get("ldap.usernameField");
defaultSearchFields = userSettings.get("ldap.searchFields"); defaultSearchFields = userSettings.get("ldap.searchFields");
...@@ -94,6 +95,7 @@ ...@@ -94,6 +95,7 @@
vcardBean.setAvatarStoredInDB(false); vcardBean.setAvatarStoredInDB(false);
} }
// Store the vcard db setting for later saving. // Store the vcard db setting for later saving.
@SuppressWarnings("unchecked")
Map<String,String> xmppSettings = (Map<String,String>)session.getAttribute("xmppSettings"); Map<String,String> xmppSettings = (Map<String,String>)session.getAttribute("xmppSettings");
if (xmppSettings != null) { if (xmppSettings != null) {
xmppSettings.put("ldap.override.avatar", vcardBean.getAvatarStoredInDB().toString()); xmppSettings.put("ldap.override.avatar", vcardBean.getAvatarStoredInDB().toString());
...@@ -160,7 +162,7 @@ ...@@ -160,7 +162,7 @@
sb.append("&userIndex=").append(request.getParameter("userIndex")); sb.append("&userIndex=").append(request.getParameter("userIndex"));
} }
%> %>
<a href="<%= sb.toString()%>" id="lbmessage" title="<fmt:message key="global.test" />" style="display:none;"/> <a href="<%= sb.toString()%>" id="lbmessage" title="<fmt:message key="global.test" />" style="display:none;"></a>
<script type="text/javascript"> <script type="text/javascript">
function loadMsg() { function loadMsg() {
var lb = new lightbox(document.getElementById('lbmessage')); var lb = new lightbox(document.getElementById('lbmessage'));
...@@ -200,7 +202,7 @@ ...@@ -200,7 +202,7 @@
<% } %> <% } %>
<form action="<%= currentPage%>" method="post"> <form action="<%= currentPage%>" method="post">
<input type="hidden" name="serverType" value="<%=serverType%>"> <input type="hidden" name="serverType" value="<%=serverType%>"/>
<!-- BEGIN jive-contentBox_bluebox --> <!-- BEGIN jive-contentBox_bluebox -->
<div class="jive-contentBox_bluebox"> <div class="jive-contentBox_bluebox">
......
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