Skip to content

O
Openfire
Commit 16530919 authored by Bill Lynch's avatar Bill Lynch Committed by bill
Browse files
Options

More fixes... 


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@385 b35dd754-fafc-0310-a699-88a17e54d16e
parent a4151b33
Hide whitespace changes
Inline Side-by-side
Showing with 280 additions and 267 deletions
src/web/error-serverdown.jsp
View file @ 16530919
......@@ -19,4 +19,4 @@ Jive Messenger is currently down. Please see the
<a href="server-status.jsp">server status</a> page for more details.
</p>
<%@ include file="footer.jsp" %>
\ No newline at end of file
<jsp:include page="bottom.jsp" flush="true" />
\ No newline at end of file
src/web/license-details.jsp
View file @ 16530919
......@@ -120,4 +120,4 @@ current one.
--%>
<%@ include file="footer.jsp" %>
\ No newline at end of file
<jsp:include page="bottom.jsp" flush="true" />
\ No newline at end of file
src/web/muc-create-permission.jsp
View file @ 16530919
......@@ -210,4 +210,4 @@ Total Users: <%= userCount %>.
<br>
<input type="submit" value="Add">
<%@ include file="footer.jsp" %>
<jsp:include page="bottom.jsp" flush="true" />
src/web/muc-history-settings.jsp
View file @ 16530919
......@@ -17,10 +17,10 @@
<% admin.init(request, response, session, application, out ); %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs
String title = "MultiUser Chat History Settings";
String title = "Group Chat History Settings";
pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "muc-history-settings.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Group Chat History", "muc-history-settings.jsp"));
pageinfo.setPageID("muc-history");
%>
<jsp:include page="top.jsp" flush="true" />
......
src/web/muc-server-props-edit-form.jsp
View file @ 16530919
......@@ -29,7 +29,7 @@
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs
String title = "Edit MultiUser Chat Properties";
String title = "Group Chat Properties";
pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "muc-server-props-edit-form.jsp"));
......@@ -101,7 +101,7 @@ Use the form below to edit Multi-User Chat server properties.
</tr>
<tr>
<td class="c1">
Multi User Chat server name:
Group chat service name:
</td>
<td>
<input type="text" size="30" maxlength="150" name="mucname" value="<%= muc %>">.<%=name%>
......
src/web/muc-sysadmins.jsp
View file @ 16530919
......@@ -204,4 +204,4 @@ Total Users: <%= userCount %>.
</table>
<br>
<input type="submit" value="Add">
<%@ include file="footer.jsp" %>
\ No newline at end of file
<jsp:include page="bottom.jsp" flush="true" />
\ No newline at end of file
src/web/session-details.jsp
View file @ 16530919
......@@ -2,18 +2,26 @@
- $RCSfile$
- $Revision$
- $Date$
-
- Copyright (C) 2004 Jive Software. All rights reserved.
-
- This software is published under the terms of the GNU Public License (GPL),
- a copy of which is included in this distribution.
--%>
<%@ taglib uri="core" prefix="c"%>
<%@ page import="org.jivesoftware.util.*,
java.util.*,
org.jivesoftware.messenger.*,
java.text.DateFormat,
java.text.NumberFormat,
org.jivesoftware.admin.*,
org.jivesoftware.messenger.user.User" %>
org.jivesoftware.messenger.user.User"
errorPage="error.jsp"
%>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<%@ taglib uri="core" prefix="c"%>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% // Get parameters
String jid = ParamUtils.getParameter(request, "jid");
......@@ -65,175 +73,179 @@
pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "session-details.jsp"));
pageinfo.setSubPageID("session-details");
pageinfo.setSubPageID("session-summary");
%>
<%@ include file="top.jsp" %>
<jsp:include page="top.jsp" flush="true" />
<jsp:include page="title.jsp" flush="true" />
<p>
Below are session details for the session <b><%= address.toString() %></b>. If the
user <b><%= address.getName() %></b> has multiple sessions open, they will appear below.
</p>
<p>
<b>Session Details</b>
</p>
<div class="jive-table">
<table cellpadding="3" cellspacing="1" border="0" width="100%">
<tr>
<td class="jive-label">
Session ID:
</td>
<td>
<%= address.toString() %>
</td>
</tr>
<tr>
<td class="jive-label">
User Name &amp; Resource:
</td>
<td>
<% String n = address.getName(); %>
<% if (n == null || "".equals(n)) { %>
<i>Anonymous</i> - <%= address.getResource() %>
<% } else { %>
<a href="user-properties.jsp?username=<%= n %>"><%= n %></a>
- <%= address.getResource() %>
<% } %>
</td>
</tr>
<tr>
<td class="jive-label">
Status:
</td>
<td>
<%
int status = currentSess.getStatus();
if (status == Session.STATUS_CLOSED) {
%>
Closed
<%
} else if (status == Session.STATUS_CONNECTED) {
%>
Connected
<%
} else if (status == Session.STATUS_STREAMING) {
%>
Streaming
<%
} else if (status == Session.STATUS_AUTHENTICATED) {
%>
Authenticated
<%
} else {
%>
Unknown
<%
}
%>
</td>
</tr>
<tr>
<td class="jive-label">
Presence:
</td>
<td>
<%
int show = currentSess.getPresence().getShow();
if (show == Presence.SHOW_AWAY) {
%>
<img src="images/bullet-yellow-14x14.gif" width="14" height="14" border="0" title="Away">
Away - <%= currentSess.getPresence().getStatus() %>
<%
} else if (show == Presence.SHOW_CHAT) {
%>
<img src="images/bullet-green-14x14.gif" width="14" height="14" border="0" title="Available to Chat">
Available to Chat
<%
} else if (show == Presence.SHOW_DND) {
%>
<img src="images/bullet-red-14x14.gif" width="14" height="14" border="0" title="Do not Disturb">
Do Not Disturb - <%= currentSess.getPresence().getStatus() %>
<%
} else if (show == Presence.SHOW_NONE) {
%>
<img src="images/bullet-green-14x14.gif" width="14" height="14" border="0" title="Online">
Online
<%
} else if (show == Presence.SHOW_XA) {
%>
<img src="images/bullet-red-14x14.gif" width="14" height="14" border="0" title="Extended Away">
Extended Away - <%= currentSess.getPresence().getStatus() %>
<%
} else {
%>
Unknown/Not Recognized
<%
}
%>
</td>
</tr>
<tr>
<td class="jive-label">
Session Created:
</td>
<td>
<%= dateFormatter.format(currentSess.getCreationDate()) %>
</td>
</tr>
<tr>
<td class="jive-label">
Session Last Active:
</td>
<td>
<%= dateFormatter.format(currentSess.getLastActiveDate()) %>
</td>
</tr>
<tr>
<td class="jive-label">
Session Statistics:
</td>
<td>
Packets Received/Sent:
<%= numFormatter.format(currentSess.getNumClientPackets()) %>/<%= numFormatter.format(currentSess.getNumServerPackets()) %>
</td>
</tr>
<tr>
<td class="jive-label">
Client IP / Hostname:
</td>
<td>
<%= currentSess.getConnection().getInetAddress().getHostAddress() %>
/
<%= currentSess.getConnection().getInetAddress().getHostName() %>
</td>
</tr>
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<thead>
<tr>
<th colspan="2">
Session Details
</th>
</tr>
</thead>
<tbody>
<tr>
<td class="c1">
Session ID:
</td>
<td>
<%= address.toString() %>
</td>
</tr>
<tr>
<td class="c1">
User Name &amp; Resource:
</td>
<td>
<% String n = address.getName(); %>
<% if (n == null || "".equals(n)) { %>
<i>Anonymous</i> - <%= address.getResource() %>
<% } else { %>
<a href="user-properties.jsp?username=<%= n %>"><%= n %></a>
- <%= address.getResource() %>
<% } %>
</td>
</tr>
<tr>
<td class="c1">
Status:
</td>
<td>
<%
int status = currentSess.getStatus();
if (status == Session.STATUS_CLOSED) {
%>
Closed
<%
} else if (status == Session.STATUS_CONNECTED) {
%>
Connected
<%
} else if (status == Session.STATUS_STREAMING) {
%>
Streaming
<%
} else if (status == Session.STATUS_AUTHENTICATED) {
%>
Authenticated
<%
} else {
%>
Unknown
<%
}
%>
</td>
</tr>
<tr>
<td class="c1">
Presence:
</td>
<td>
<%
int show = currentSess.getPresence().getShow();
if (show == Presence.SHOW_AWAY) {
%>
<img src="images/bullet-yellow-14x14.gif" width="14" height="14" border="0" title="Away">
Away - <%= currentSess.getPresence().getStatus() %>
<%
} else if (show == Presence.SHOW_CHAT) {
%>
<img src="images/bullet-green-14x14.gif" width="14" height="14" border="0" title="Available to Chat">
Available to Chat
<%
} else if (show == Presence.SHOW_DND) {
%>
<img src="images/bullet-red-14x14.gif" width="14" height="14" border="0" title="Do not Disturb">
Do Not Disturb - <%= currentSess.getPresence().getStatus() %>
<%
} else if (show == Presence.SHOW_NONE) {
%>
<img src="images/bullet-green-14x14.gif" width="14" height="14" border="0" title="Online">
Online
<%
} else if (show == Presence.SHOW_XA) {
%>
<img src="images/bullet-red-14x14.gif" width="14" height="14" border="0" title="Extended Away">
Extended Away - <%= currentSess.getPresence().getStatus() %>
<%
} else {
%>
Unknown/Not Recognized
<%
}
%>
</td>
</tr>
<tr>
<td class="c1">
Session Created:
</td>
<td>
<%= dateFormatter.format(currentSess.getCreationDate()) %>
</td>
</tr>
<tr>
<td class="c1">
Session Last Active:
</td>
<td>
<%= dateFormatter.format(currentSess.getLastActiveDate()) %>
</td>
</tr>
<tr>
<td class="c1">
Session Statistics:
</td>
<td>
Packets Received/Sent:
<%= numFormatter.format(currentSess.getNumClientPackets()) %>/<%= numFormatter.format(currentSess.getNumServerPackets()) %>
</td>
</tr>
<tr>
<td class="c1">
Client IP / Hostname:
</td>
<td>
<%= currentSess.getConnection().getInetAddress().getHostAddress() %>
/
<%= currentSess.getConnection().getInetAddress().getHostName() %>
</td>
</tr>
</tbody>
</table>
</div>
......@@ -306,4 +318,4 @@ user <b><%= address.getName() %></b> has multiple sessions open, they will appea
</center>
</form>
<%@ include file="footer.jsp" %>
<jsp:include page="bottom.jsp" flush="true" />
src/web/session-row.jspf
View file @ 16530919
......@@ -150,7 +150,7 @@
<%= sess.getConnection().getInetAddress().getHostAddress() %>
</td>
<td width="1%" nowrap align="center">
<td width="1%" nowrap align="center" style="border-right:1px #ccc solid;">
<a href="session-summary.jsp?jid=<%= sess.getAddress() %>&close=true"
title="Click to kill session..."
onclick="return confirm('Are you sure you want to close this connection?');"
......
src/web/session-summary.jsp
View file @ 16530919
<%@ taglib uri="core" prefix="c"%><%--
<%--
- $RCSfile$
- $Revision$
- $Date$
-
- Copyright (C) 2004 Jive Software. All rights reserved.
-
- This software is published under the terms of the GNU Public License (GPL),
- a copy of which is included in this distribution.
--%>
<%@ page import="org.jivesoftware.util.*,
......@@ -9,34 +14,21 @@
org.jivesoftware.messenger.*,
java.util.Date,
org.jivesoftware.admin.*,
java.text.DateFormat" %>
java.text.DateFormat"
errorPage="error.jsp"
%>
<%@ taglib uri="core" prefix="c"%>
<%-- Define Administration Bean --%>
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
<% admin.init(request, response, session, application, out ); %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs
String title = "Session Summary";
pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "session-summary.jsp"));
pageinfo.setPageID("session-summary");
%>
<jsp:include page="top.jsp" flush="true" />
<jsp:include page="title.jsp" flush="true" />
<% // Get parameters
int start = ParamUtils.getIntParameter(request,"start",0);
int range = ParamUtils.getIntParameter(request,"range",15);
boolean close = ParamUtils.getBooleanParameter(request,"close");
String jid = ParamUtils.getParameter(request,"jid");
// Get the user manager
SessionManager sessionManager = admin.getSessionManager();
......@@ -67,6 +59,18 @@
// Date dateFormatter for all dates on this page:
DateFormat dateFormatter = DateFormat.getDateTimeInstance(DateFormat.MEDIUM,DateFormat.SHORT);
%>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs
String title = "Session Summary";
pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "session-summary.jsp"));
pageinfo.setPageID("session-summary");
%>
<jsp:include page="top.jsp" flush="true" />
<jsp:include page="title.jsp" flush="true" />
<% if ("success".equals(request.getParameter("close"))) { %>
<p class="jive-success-text">
......@@ -102,55 +106,54 @@ Active Sessions: <b><%= sessionCount %></b>,
</p>
<% } %>
<table cellpadding="3" cellspacing="1" border="0" width="600">
<tr class="tableHeader"><td colspan="8" align="left">Current Sessions</td></tr>
<tr><td colspan="8" class="text">
Below is a list of sessions on this server.
</tr>
<p>
Below is a list of sessions on this server.
</p>
</table>
<table class="jive-table" cellpadding="3" cellspacing="1" border="0" width="600">
<tr>
<th>&nbsp;</th>
<th>Name</th>
<th>Resource</th>
<th>Status</th>
<th nowrap colspan="2">Presence (if authenticated)</th>
<th nowrap>Client IP</th>
<th nowrap>Close Connection</th>
</tr>
<% // Get the iterator of sessions, print out session info if any exist.
SessionResultFilter filter = new SessionResultFilter();
filter.setStartIndex(start);
filter.setNumResults(range);
Iterator sessions = sessionManager.getSessions(filter);
if (!sessions.hasNext()) {
%>
<div class="jive-table">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<thead>
<tr>
<td colspan="8">
<th>&nbsp;</th>
<th>Name</th>
<th>Resource</th>
<th>Status</th>
<th nowrap colspan="2">Presence (if authenticated)</th>
<th nowrap>Client IP</th>
<th nowrap>Close Connection</th>
</tr>
</thead>
<tbody>
<% // Get the iterator of sessions, print out session info if any exist.
SessionResultFilter filter = new SessionResultFilter();
filter.setStartIndex(start);
filter.setNumResults(range);
Iterator sessions = sessionManager.getSessions(filter);
if (!sessions.hasNext()) {
%>
<tr>
<td colspan="8">
No Sessions
No Sessions
</td>
</tr>
</td>
</tr>
<% } %>
<% } %>
<% int count = start;
boolean current = false; // needed in session-row.jspf
String linkURL = "session-details.jsp";
while (sessions.hasNext()) {
Session sess = (Session)sessions.next();
count++;
%>
<%@ include file="session-row.jspf" %>
<% int count = start;
boolean current = false; // needed in session-row.jspf
String linkURL = "session-details.jsp";
while (sessions.hasNext()) {
Session sess = (Session)sessions.next();
count++;
%>
<%@ include file="session-row.jspf" %>
<% } %>
<% } %>
</tbody>
</table>
</div>
......
src/web/user-browser.jsp
View file @ 16530919
......@@ -112,7 +112,7 @@
</form>
<%@ include file="footer.jsp" %>
<jsp:include page="bottom.jsp" flush="true" />
<% } else if ("main".equals(panel)) { %>
......@@ -230,6 +230,6 @@
<% } %>
<%@ include file="footer.jsp" %>
<jsp:include page="bottom.jsp" flush="true" />
<% } %>
src/web/user-create.jsp
View file @ 16530919
......@@ -242,4 +242,4 @@ function checkFields() {
}
</script>
<%@ include file="footer.jsp" %>
<jsp:include page="bottom.jsp" flush="true" />
src/web/user-edit-form.jsp
View file @ 16530919
......@@ -161,4 +161,4 @@ Use the form below to edit user properties.
</form>
<%@ include file="footer.jsp" %>
\ No newline at end of file
<jsp:include page="bottom.jsp" flush="true" />
\ No newline at end of file
src/web/user-message.jsp
View file @ 16530919
<%@ taglib uri="core" prefix="c"%>
<%--
- $RCSfile$
- $Revision$
- $Date$
-
- Copyright (C) 2004 Jive Software. All rights reserved.
-
- This software is published under the terms of the GNU Public License (GPL),
- a copy of which is included in this distribution.
--%>
<%@ page import="org.jivesoftware.util.*,
......@@ -13,10 +17,11 @@
java.text.DateFormat,
java.util.HashMap,
org.jivesoftware.messenger.user.*,
java.util.Map" %>
java.util.Map"
errorPage="error.jsp"
%>
<c:set var="sbar" value="session" scope="page" />
<%@ taglib uri="core" prefix="c"%>
<% // Get parameters
String username = ParamUtils.getParameter(request,"username");
......@@ -30,16 +35,10 @@
String message = ParamUtils.getParameter(request,"message");
%>
<%-- Define Administration Bean --%>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% webManager.init(pageContext); %>
<%
// Handle a cancel
if (request.getParameter("cancel") != null) {
if (username == null) {
......@@ -91,10 +90,13 @@
sessionManager.sendServerMessage(XMPPAddress.parseJID(jid),null,message);
}
}
if(username != null){
response.sendRedirect("user-message.jsp?success=true&username=" + username + "&tabs=" + tabs);
if (username != null){
response.sendRedirect("user-message.jsp?success=true&username=" + username + "&tabs=" + tabs);
}
else {
response.sendRedirect("user-message.jsp?success=true");
}
return;
return;
}
}
......@@ -110,6 +112,7 @@
}
}
%>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs
String title = "Send Administrative Message";
......@@ -118,30 +121,25 @@
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "user-message.jsp"));
pageinfo.setPageID("user-message");
%>
<%@ include file="top.jsp" %>
<jsp:include page="title.jsp" flush="true" />
<% if (tabs && username != null) { %>
<br>
<c:set var="tab" value="message" />
<%@ include file="user-tabs.jsp" %>
<% } %>
<jsp:include page="top.jsp" flush="true" />
<jsp:include page="title.jsp" flush="true" />
<% if (success) { %>
<p class="jive-success-text">
Message was sent successfully!
</p>
<div class="jive-success">
<table cellpadding="0" cellspacing="0" border="0">
<tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label">
Message sent successfully.
</td></tr>
</tbody>
</table>
</div><br>
<% } %>
<p>
</p>
<script language="JavaScript" type="text/javascript">
function updateSelect(el) {
if (el.checked) {
......@@ -262,4 +260,4 @@ function updateSelect(el) {
document.f.message.focus();
</script>
<%@ include file="footer.jsp" %>
\ No newline at end of file
<jsp:include page="bottom.jsp" flush="true" />
\ No newline at end of file
src/web/user-password.jsp
View file @ 16530919
......@@ -154,4 +154,4 @@ Use the form below to change the user's password.
document.passform.password.focus();
</script>
<%@ include file="footer.jsp" %>
<jsp:include page="bottom.jsp" flush="true" />
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