Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions i18n/src/main/resources/openfire_i18n.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1843,6 +1843,7 @@ session.details.version=Client Version
session.details.if_presence=Presence (if authenticated)
session.details.clientip=Client IP
session.details.close_connect=Close Connection
session.details.session_detail_current_index=Session {0}
session.details.session_detail=Current session details above.
session.details.back_button=Back to Summary
session.details.node=Cluster Node
Expand Down
1 change: 1 addition & 0 deletions i18n/src/main/resources/openfire_i18n_nl.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1710,6 +1710,7 @@ session.details.version=Client Versie
session.details.if_presence=Status informatie (indien aangemeld)
session.details.clientip=Client IP
session.details.close_connect=Verbinding verbreken
session.details.session_detail_current_index=Sessie {0}
session.details.session_detail=Informatie over de huidige sessie staat hierboven.
session.details.back_button=Terug naar overzicht
session.details.node=Node
Expand Down
49 changes: 24 additions & 25 deletions xmppserver/src/main/webapp/session-details.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,8 @@
}

// See if there are multiple sessions for this user:
Collection<ClientSession> sessions = null;
int sessionCount = sessionManager.getSessionCount(address.getNode());
if (!isAnonymous && sessionCount > 1) {
sessions = sessionManager.getSessions(address);
}
final Collection<ClientSession> sessions = sessionManager.getSessions(isAnonymous ? address : address.asBareJID());
final int sessionCount = sessions.size();

// Number dateFormatter for all numbers on this page:
NumberFormat numFormatter = NumberFormat.getNumberInstance();
Expand Down Expand Up @@ -667,39 +664,41 @@
<th nowrap><fmt:message key="session.details.close_connect" /></th>
</tr>

<% int count = 0;
<% pageContext.setAttribute("showName", true);
pageContext.setAttribute("showResource", false);
pageContext.setAttribute("showVersion", true);
pageContext.setAttribute("showClusterNode", true);
pageContext.setAttribute("showStatus", true);
pageContext.setAttribute("showPresence", true);
pageContext.setAttribute("showRxTx", true);
pageContext.setAttribute("showIp", true);

int count = 0;
int currentIndex = 0;
String linkURL = "session-details.jsp";
for (ClientSession sess : sessions) {
count++;
boolean current = sess.getAddress().equals(address);
if (current) {
currentIndex = count;
}
%>
<%@ include file="session-row.jspf" %>

<% } %>
<% }
pageContext.setAttribute("currentIndex", currentIndex);
%>

</table>
</div>

<br>

<table>
<tr>
<td style="width: 1%; white-space: nowrap">

<div class="jive-table">
<table>
<tr class="jive-current"><td><img src="images/blank.gif" width="12" height="12" alt=""></td></tr>
</table>
</div>

</td>
<td>

&nbsp; = <fmt:message key="session.details.session_detail" />

</td>
</tr>
</table>
<span class="jive-current">
<fmt:message key="session.details.session_detail_current_index">
<fmt:param><fmt:formatNumber value="${currentIndex}" /></fmt:param>
</fmt:message>
</span> = <fmt:message key="session.details.session_detail" />

<% } %>

Expand Down