Commit 908886aa authored by Ryan Graham's avatar Ryan Graham Committed by ryang

* Fixed UnsupportedOperationException from occuring when using LDAP

* On the Advanced User Search unescape username in the search results

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@7494 b35dd754-fafc-0310-a699-88a17e54d16e
parent 596c7856
...@@ -44,6 +44,12 @@ ...@@ -44,6 +44,12 @@
Search Plugin Changelog Search Plugin Changelog
</h1> </h1>
<p><b>1.3.0</b> -- March 12, 2007</p>
<ul>
<li>Fixed UnsupportedOperationException from occuring when using LDAP.</li>
<li>On the Advanced User Search unescape username in the search results.</a>
</ul>
<p><b>1.3.0</b> -- February 28, 2007</p> <p><b>1.3.0</b> -- February 28, 2007</p>
<ul> <ul>
<li>Added the ability to disable specific fields from being searched.</li> <li>Added the ability to disable specific fields from being searched.</li>
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<name>Search</name> <name>Search</name>
<description>Provides support for Jabber Search (XEP-0055)</description> <description>Provides support for Jabber Search (XEP-0055)</description>
<author>Ryan Graham</author> <author>Ryan Graham</author>
<version>1.3.0</version> <version>1.3.1</version>
<date>02/28/2007</date> <date>03/12/2007</date>
<minServerVersion>3.1.0</minServerVersion> <minServerVersion>3.1.0</minServerVersion>
<adminconsole> <adminconsole>
......
...@@ -458,7 +458,7 @@ public class SearchPlugin implements Component, Plugin, PropertyEventListener { ...@@ -458,7 +458,7 @@ public class SearchPlugin implements Component, Plugin, PropertyEventListener {
// by providing our own searching. // by providing our own searching.
try { try {
userManager = UserManager.getInstance(); userManager = UserManager.getInstance();
searchFields = userManager.getSearchFields(); searchFields = new ArrayList<String>(userManager.getSearchFields());
} }
catch (UnsupportedOperationException uoe) { catch (UnsupportedOperationException uoe) {
// Use a SearchPluginUserManager instead. // Use a SearchPluginUserManager instead.
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
org.jivesoftware.wildfire.PresenceManager, org.jivesoftware.wildfire.PresenceManager,
org.jivesoftware.wildfire.user.*, org.jivesoftware.wildfire.user.*,
org.jivesoftware.wildfire.XMPPServer, org.jivesoftware.wildfire.XMPPServer,
org.xmpp.packet.JID,
org.xmpp.packet.Presence" org.xmpp.packet.Presence"
%> %>
...@@ -159,13 +160,13 @@ ...@@ -159,13 +160,13 @@
%> %>
</td> </td>
<td width="30%"> <td width="30%">
<a href="../../user-properties.jsp?username=<%= URLEncoder.encode(user.getUsername(), "UTF-8") %>"><%= user.getUsername() %></a> <a href="../../user-properties.jsp?username=<%= URLEncoder.encode(user.getUsername(), "UTF-8") %>"><%= JID.unescapeNode(user.getUsername()) %></a>
</td> </td>
<td width="35"> <td width="35">
<%= user.getName() %> &nbsp; <%= user.getName() %> &nbsp;
</td> </td>
<td width="35%"> <td width="35%">
<%= user.getEmail() %> &nbsp; <%= JiveGlobals.formatDate(user.getCreationDate()) %> &nbsp;
</td> </td>
<% // Don't allow editing or deleting if users are read-only. <% // Don't allow editing or deleting if users are read-only.
if (!UserManager.getUserProvider().isReadOnly()) { %> if (!UserManager.getUserProvider().isReadOnly()) { %>
......
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