* fixed issue where a null pointer exception could occur when a LDAP <searchFilter> is being used

* replaced tab characters with spaces

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

src/plugins/search/changelog.html

@@ -44,6 +44,11 @@
 Search Plugin Changelog
 </h1>
 
+<p><b>1.1.3</b> -- December 7, 2005</b></p>
+<ul>
+     <li>Client Search - fixed issue where a null pointer exception could occur when a LDAP <searchFilter> is being used.
+</ul>
+
 <p><b>1.1.2</b> -- June 30, 2005</b></p>
 <ul>
      <li>Admin Console - fixed possible null pointer exception when during a search.

src/plugins/search/plugin.xml

@@ -5,8 +5,8 @@
     <name>Search</name>
     <description>Provides support for Jabber Search (JEP-0055)</description>
     <author>Ryan Graham</author>
-    <version>1.1.2</version>
-    <date>06/30/2005</date>
+    <version>1.1.3</version>
+    <date>12/07/2005</date>
     <minServerVersion>2.3.0</minServerVersion>
 	
 	<adminconsole>		

src/plugins/search/src/java/org/jivesoftware/messenger/plugin/SearchPlugin.java

@@ -17,6 +17,7 @@ import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.dom4j.Attribute;
 import org.dom4j.DocumentHelper;
@@ -59,6 +60,9 @@ import org.xmpp.packet.Packet;
  * @author Ryan Graham 
  */
 public class SearchPlugin implements Component, Plugin, PropertyEventListener {
+    public static final String PLUGIN_SEARCH_SERVICENAME = "plugin.search.serviceName";
+    public static final String PLUGIN_SEARCH_SERVICEENABLED = "plugin.search.serviceEnabled";
+   
     private XMPPServer server;
     private UserManager userManager;
     private ComponentManager componentManager;
@@ -194,7 +198,6 @@ public class SearchPlugin implements Component, Plugin, PropertyEventListener {
                 catch (ComponentException e) {
                     componentManager.getLog().error(e);
                 }
-
             }
             else if ("http://jabber.org/protocol/disco#info".equals(namespace)) {
                 try {
@@ -268,7 +271,7 @@ public class SearchPlugin implements Component, Plugin, PropertyEventListener {
     }
 
     private IQ processSetPacket(IQ packet) {
-        List<User> users = new ArrayList<User>();
+        Set<User> users = new HashSet<User>();
         
         Element incomingForm = packet.getChildElement();
         boolean isDataFormQuery = (incomingForm.element(QName.get("x", "jabber:x:data")) != null);
@@ -276,8 +279,8 @@ public class SearchPlugin implements Component, Plugin, PropertyEventListener {
         Hashtable<String, String> searchList = extractSearchQuery(incomingForm);
         Enumeration<String> searchIter = searchList.keys();
         while (searchIter.hasMoreElements()) {
-            String field = (String) searchIter.nextElement();
-            String query = (String) searchList.get(field);
+            String field = searchIter.nextElement();
+            String query = searchList.get(field);
             
             Collection<User> foundUsers = new ArrayList<User>();
             if (userManager != null) {
@@ -290,9 +293,8 @@ public class SearchPlugin implements Component, Plugin, PropertyEventListener {
                 foundUsers.addAll(findUsers(field, query));
             }
             
-            // Filter out all duplicate users.
             for (User user : foundUsers) {
-                if (!users.contains(user)) {
+                if (user != null) {
                     users.add(user);
                 }
             }
@@ -365,7 +367,7 @@ public class SearchPlugin implements Component, Plugin, PropertyEventListener {
         return searchList;
     }
     
-    private IQ replyDataFormResult(List<User> users, IQ packet) {
+    private IQ replyDataFormResult(Set<User> users, IQ packet) {
         XDataFormImpl searchResults = new XDataFormImpl(DataForm.TYPE_RESULT);
         
         XFormFieldImpl field = new XFormFieldImpl("FORM_TYPE");
@@ -415,7 +417,7 @@ public class SearchPlugin implements Component, Plugin, PropertyEventListener {
         return replyPacket;
     }
 
-    private IQ replyNonDataFormResult(List<User> users, IQ packet) {
+    private IQ replyNonDataFormResult(Set<User> users, IQ packet) {
         Element replyQuery = DocumentHelper.createElement(QName.get("query", "jabber:iq:search"));
         String serverName = XMPPServer.getInstance().getServerInfo().getName();
         
@@ -443,7 +445,7 @@ public class SearchPlugin implements Component, Plugin, PropertyEventListener {
     
     public void setServiceName(String name) {
         changeServiceName(name);
-        JiveGlobals.setProperty("plugin.search.serviceName", name);
+        JiveGlobals.setProperty(PLUGIN_SEARCH_SERVICENAME, name);
     }
     
     public boolean getServiceEnabled() {
@@ -452,23 +454,23 @@ public class SearchPlugin implements Component, Plugin, PropertyEventListener {
     
     public void setServiceEnabled(boolean enabled) {
         serviceEnabled = enabled;
-        JiveGlobals.setProperty("plugin.search.serviceEnabled", enabled ? "true" : "false");
+        JiveGlobals.setProperty(PLUGIN_SEARCH_SERVICEENABLED, enabled ? "true" : "false");
     }
     
     public void propertySet(String property, Map params) {
-        if (property.equals("plugin.search.serviceEnabled")) {
+        if (property.equals(PLUGIN_SEARCH_SERVICEENABLED)) {
             this.serviceEnabled = Boolean.parseBoolean((String)params.get("value"));
         }
-        else if (property.equals("plugin.search.serviceName")) {
+        else if (property.equals(PLUGIN_SEARCH_SERVICENAME)) {
             changeServiceName((String)params.get("value"));
         }
     }
 
     public void propertyDeleted(String property, Map params) {
-        if (property.equals("plugin.search.serviceEnabled")) {
+        if (property.equals(PLUGIN_SEARCH_SERVICEENABLED)) {
             this.serviceEnabled = true;
         }
-        else if (property.equals("plugin.search.serviceName")) {
+        else if (property.equals(PLUGIN_SEARCH_SERVICENAME)) {
             changeServiceName("search");
         }
     }

src/plugins/search/src/web/advance-user-search.jsp

@@ -25,7 +25,7 @@
     Set<String> searchFields = userManager.getSearchFields();
     List<String> selectedFields = new ArrayList<String>();
 
-	List<User> users = new ArrayList<User>();
+    Set<User> users = new HashSet<User>();
 
     if (criteria != null) {
         for (String searchField : searchFields) {
@@ -35,9 +35,8 @@
                 selectedFields.add(searchField);
                 Collection<User> foundUsers = userManager.findUsers(new HashSet<String>(Arrays.asList(searchField)), criteria);
 
-				//filter out duplicate users
                 for (User user : foundUsers) {
-	                if (!users.contains(user)) {
+                    if (user != null) {
                         users.add(user);
                     }
                 }
@@ -132,28 +131,30 @@ Users Found: <%=users.size() %>
         <td width="1%" align="center" valign="middle">
         <% if (presenceManager.isAvailable(user)) {
                Presence presence = presenceManager.getPresence(user);
-	            %>
-	                <% if (presence.getShow() == null) { %>
-	                <img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="user.properties.available" />">
-	                <% } %>
-	                <% if (presence.getShow() == Presence.Show.chat) { %>
-	                <img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.chat_available" />">
-	                <% } %>
-	                <% if (presence.getShow() == Presence.Show.away) { %>
-	                <img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.away" />">
-	                <% } %>
-	                <% if (presence.getShow() == Presence.Show.xa) { %>
-	                <img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.extended" />">
-	                <% } %>
-	                <% if (presence.getShow() == Presence.Show.dnd) { %>
-	                <img src="images/user-red-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.not_disturb" />">
-	                <% } %>
                
-	            <%  } else { %>
+               if (presence.getShow() == null) { 
+               %> <img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="user.properties.available" />"> <% 
+               } 
+               
+               if (presence.getShow() == Presence.Show.chat) {
+               %> <img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.chat_available" />"> <% 
+               }
                
-	                <img src="images/user-clear-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="user.properties.offline" />">
+               if (presence.getShow() == Presence.Show.away) { 
+               %> <img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.away" />"> <% 
+               } 
                
-	            <%  } %>
+               if (presence.getShow() == Presence.Show.xa) { 
+               %> <img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.extended" />"> <% 
+               } 
+               
+               if (presence.getShow() == Presence.Show.dnd) { 
+               %> <img src="images/user-red-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.not_disturb" />"> <% 
+               }
+           } else { 
+           %> <img src="images/user-clear-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="user.properties.offline" />"> <% 
+           }
+        %>
        </td>
        <td width="30%">
            <a href="../../user-properties.jsp?username=<%= URLEncoder.encode(user.getUsername(), "UTF-8") %>"><%= user.getUsername() %></a>