Skip to content

O
Openfire
Commit 70d275c6 authored by Matt Tucker's avatar Matt Tucker Committed by matt
Browse files
Options

Added sorting. 

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@3824 b35dd754-fafc-0310-a699-88a17e54d16e
parent 8a01362d
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 83 deletions
src/web/group-edit.jsp
View file @ 70d275c6
...@@ -481,10 +481,8 @@ ...@@ -481,10 +481,8 @@
<!-- Add admins first --> <!-- Add admins first -->
<% <%
int memberCount = group.getMembers().size() + group.getAdmins().size(); int memberCount = group.getMembers().size() + group.getAdmins().size();
Iterator<JID> members = group.getMembers().iterator(); boolean showUpdateButtons = memberCount > 0;
Iterator<JID> admins = group.getAdmins().iterator(); boolean showRemoteJIDsWarning = false;
%>
<%
if (memberCount == 0) { if (memberCount == 0) {
%> %>
<tr> <tr>
...@@ -497,22 +495,24 @@ ...@@ -497,22 +495,24 @@
</tr> </tr>
<% <%
} }
%> else {
<% // Sort the list of members.
boolean showUpdateButtons = memberCount > 0; ArrayList<JID> allMembers = new ArrayList<JID>(memberCount);
boolean showRemoteJIDsWarning = false; allMembers.addAll(group.getMembers());
while (admins.hasNext()) { Collection<JID> admins = group.getAdmins();
JID jid = (JID)admins.next(); allMembers.addAll(admins);
boolean isLocal = webManager.getXMPPServer().isLocal(jid); Collections.sort(allMembers);
User user = null; for (JID jid:allMembers) {
if (isLocal) { boolean isLocal = webManager.getXMPPServer().isLocal(jid);
try { User user = null;
user = userManager.getUser(jid.getNode()); if (isLocal) {
} try {
catch (UserNotFoundException unfe) { user = userManager.getUser(jid.getNode());
// Ignore. }
catch (UserNotFoundException unfe) {
// Ignore.
}
} }
}
%> %>
<tr> <tr>
<td width="1%"> <td width="1%">
...@@ -547,72 +547,15 @@ ...@@ -547,72 +547,15 @@
<td><%= jid %><% showRemoteJIDsWarning = true; %> <font color="red"><b>*</b></font></td> <td><%= jid %><% showRemoteJIDsWarning = true; %> <font color="red"><b>*</b></font></td>
<% } %> <% } %>
<td align="center"> <td align="center">
<input type="checkbox" name="admin" value="<%= jid %>" checked> <input type="checkbox" name="admin" value="<%= jid %>" <% if (admins.contains(jid)) { %>checked<% } %>>
</td> </td>
<td align="center"> <td align="center">
<input type="checkbox" name="delete" value="<%= jid %>"> <input type="checkbox" name="delete" value="<%= jid %>">
</td> </td>
</tr> </tr>
<% <%
}
%>
<%
while (members.hasNext()) {
JID jid = (JID)members.next();
boolean isLocal = webManager.getXMPPServer().isLocal(jid);
User user = null;
if (isLocal) {
try {
user = userManager.getUser(jid.getNode());
}
catch (UserNotFoundException unfe) {
// Ignore.
}
} }
%>
<tr>
<td width="1%">
<% if (user != null && 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 { %>
<img src="images/user-clear-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="user.properties.offline" />">
<% } %>
</td>
<% if (user != null) { %>
<td><a href="user-properties.jsp?username=<%= URLEncoder.encode(user.getUsername(), "UTF-8") %>"><%= user.getUsername() %></a><% if (!isLocal) { showRemoteJIDsWarning = true; %> <font color="red"><b>*</b></font><%}%></td>
<% } else { %>
<td><%= jid %><% showRemoteJIDsWarning = true; %> <font color="red"><b>*</b></font></td>
<% } %>
<td align="center">
<input type="checkbox" name="admin" value="<%= jid %>">
</td>
<td align="center">
<input type="checkbox" name="delete" value="<%= jid %>">
</td>
</tr>
<%
} }
%>
<%
if (showUpdateButtons) { if (showUpdateButtons) {
%> %>
<tr> <tr>
......
src/web/muc-room-affiliations.jsp
View file @ 70d275c6
...@@ -204,7 +204,9 @@ ...@@ -204,7 +204,9 @@
</tr> </tr>
<% } <% }
else { else {
for (String user : room.getOwners()) { ArrayList<String> owners = new ArrayList<String>(room.getOwners());
Collections.sort(owners);
for (String user : owners) {
%> %>
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
...@@ -232,7 +234,9 @@ ...@@ -232,7 +234,9 @@
</tr> </tr>
<% } <% }
else { else {
for (String user : room.getAdmins()) { ArrayList<String> admins = new ArrayList<String>(room.getAdmins());
Collections.sort(admins);
for (String user : admins) {
%> %>
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
...@@ -260,7 +264,9 @@ ...@@ -260,7 +264,9 @@
</tr> </tr>
<% } <% }
else { else {
for (String user : room.getMembers()) { ArrayList<String> members = new ArrayList<String>(room.getMembers());
Collections.sort(members);
for (String user : members) {
String nickname = room.getReservedNickname(user); String nickname = room.getReservedNickname(user);
nickname = (nickname == null ? "" : " (" + nickname + ")"); nickname = (nickname == null ? "" : " (" + nickname + ")");
%> %>
...@@ -290,7 +296,9 @@ ...@@ -290,7 +296,9 @@
</tr> </tr>
<% } <% }
else { else {
for (String user : room.getOutcasts()) { ArrayList<String> outcasts = new ArrayList<String>(room.getOutcasts());
Collections.sort(outcasts);
for (String user : outcasts) {
%> %>
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
......
src/web/user-create.jsp
View file @ 70d275c6
...@@ -106,8 +106,8 @@ ...@@ -106,8 +106,8 @@
<p><fmt:message key="user.create.info" /></p> <p><fmt:message key="user.create.info" /></p>
<c:set var="submit" value="${param.create}"/> <%--<c:set var="submit" value="${param.create}"/>--%>
<c:set var="errors" value="${errors}"/> <%--<c:set var="errors" value="${errors}"/>--%>
<% if (!errors.isEmpty()) { %> <% if (!errors.isEmpty()) { %>
......
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