Skip to content

O
Openfire
Commit 46a39fcb authored by Matt Tucker's avatar Matt Tucker Committed by matt
Browse files
Options

Fixes. 


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@863 b35dd754-fafc-0310-a699-88a17e54d16e
parent b182590b
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 189 deletions
documentation/dist/changelog.html
View file @ 46a39fcb
......@@ -69,32 +69,8 @@ Jive Messenger Changelog
</div>
<p>
<b>2.1.0 Beta 2</b> -- January 12, 2005
<b>2.1.0</b> -- January 14, 2005
<p>
<h2>New Features</h2>
<ul>
<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-107'>JM-107</a>] - Improved database upgrade process.</li>
<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-107'>JM-110</a>] - Added RPM installer.</li>
<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-107'>JM-115</a>] - IQ handlers can now be added and removed dynamically.</li>
<li>Shared roster group feature improvements.
<li>Plugins can now be dynamically unloaded and reloaded.
</ul>
<h2>Bug Fixes</h2>
<ul>
<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-114'>JM-107</a>] - Fixed freezes in the group chat code.</li>
<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-112'>JM-112</a>] - To and From values of certain IQ's are now correct.</li>
<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-113'>JM-113</a>] - Fixed regression in offline message support.</li>
<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-114'>JM-116</a>] - Fixed routing table logic for case when unavailable packet received.</li>
</ul>
</p>
<p>
<b>2.1.0 Beta 1</b> -- January 7, 2005
<p>
<h2>New Features</h2>
<ul>
<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-1'>JM-1</a>] - Flash XML streams are now supported.</li>
......@@ -113,8 +89,11 @@ Jive Messenger Changelog
<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-84'>JM-84</a>] - Zeroconf (Rendezvous) support added.</li>
<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-96'>JM-96</a>] - Improved installer which is simpler ans smaller.</li>
<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-97'>JM-97</a>] - Added support for deploying as Windows service.</li>
<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-97'>JM-105</a>] - Database version now included in schemas to assist with upgrading.</li>
<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-101'>JM-101</a>] - Added xml:lang support.</li>
<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-105'>JM-105</a>] - Database version now included in schemas to assist with upgrading.</li>
<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-107'>JM-107</a>] - Improved database upgrade process.</li>
<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-110'>JM-110</a>] - Added RPM installer.</li>
<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-115'>JM-115</a>] - IQ handlers can now be added and removed dynamically.</li>
</ul>
<h2>Bug Fixes</h2>
......@@ -148,6 +127,9 @@ Jive Messenger Changelog
<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-93'>JM-93</a>] - Group chat service now correctly passes through extended presence information in presence broadcasts.</li>
<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-94'>JM-94</a>] - Fixed exception in group chat when banning users.</li>
<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-98'>JM-98</a>] - Added room creation date to disco information.</li>
<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-112'>JM-112</a>] - To and From values of certain IQ's are now correct.</li>
<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-114'>JM-114</a>] - Fixed freezes in the group chat code.</li>
<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-116'>JM-116</a>] - Fixed routing table logic for case when unavailable packet received.</li>
</ul>
<p>
......
src/resources/jar/admin-sidebar.xml
View file @ 46a39fcb
......@@ -95,9 +95,9 @@
<sidebar id="sidebar-group-options" name="Group Options">
<item id="group-properties" name="Group Properties"
url="group-properties.jsp"
description="Click to edit the groups's properties" />
<item id="group-edit" name="Edit Group"
url="group-edit.jsp"
description="Click to edit the group" />
<item id="group-delete" name="Delete Group"
url="group-delete.jsp"
......
src/web/group-create.jsp
View file @ 46a39fcb
......@@ -83,7 +83,7 @@ errorPage="error.jsp"%>
}
}
// Successful, so redirect
response.sendRedirect("group-properties.jsp?success=true&group=" + URLEncoder.encode(newGroup.getName(), "UTF-8"));
response.sendRedirect("group-edit.jsp?creategroupsuccess=true&group=" + URLEncoder.encode(newGroup.getName(), "UTF-8"));
return;
}
catch (GroupAlreadyExistsException e) {
......
src/web/group-delete.jsp
View file @ 46a39fcb
......@@ -11,7 +11,8 @@
<%@ page import="org.jivesoftware.util.*,
org.jivesoftware.admin.*,
org.jivesoftware.messenger.group.Group"
org.jivesoftware.messenger.group.Group,
java.net.URLEncoder"
errorPage="error.jsp"
%>
......@@ -27,7 +28,7 @@
// Handle a cancel
if (cancel) {
response.sendRedirect("group-properties.jsp?group=" + groupName);
response.sendRedirect("group-edit.jsp?group=" + URLEncoder.encode(groupName, "UTF-8"));
return;
}
......@@ -49,16 +50,16 @@
String title = "Delete Group";
pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "group-delete.jsp?group="+groupName));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "group-delete.jsp?group="+URLEncoder.encode(groupName, "UTF-8")));
pageinfo.setSubPageID("group-delete");
pageinfo.setExtraParams("group="+groupName);
pageinfo.setExtraParams("group="+URLEncoder.encode(groupName, "UTF-8"));
%>
<jsp:include page="top.jsp" flush="true" />
<jsp:include page="title.jsp" flush="true" />
<p>
Are you sure you want to delete the group
<b><a href="group-properties.jsp?group=<%= group.getName() %>"><%= group.getName() %></a></b>
<b><a href="group-edit.jsp?group=<%= URLEncoder.encode(group.getName(), "UTF-8")%>"><%= group.getName() %></a></b>
from the system?
</p>
......
src/web/group-edit.jsp
View file @ 46a39fcb
......@@ -146,16 +146,17 @@ import="java.text.DateFormat,
}
success = groupInfoChanged || "true".equals(request.getParameter("success")) ||
"true".equals(request.getParameter("deletesuccess")) ||
"true".equals(request.getParameter("updatesuccess"));
"true".equals(request.getParameter("updatesuccess")) ||
"true".equals(request.getParameter("creategroupsuccess"));
%>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean"/>
<% // Title of this page and breadcrumbs
String title = "Edit Group";
pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "group-edit.jsp"));
pageinfo.setPageID("group-summary");
pageinfo.setExtraParams("group="+groupName);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "group-edit.jsp?group="+URLEncoder.encode(groupName, "UTF-8")));
pageinfo.setSubPageID("group-edit");
pageinfo.setExtraParams("group="+URLEncoder.encode(groupName, "UTF-8"));
%>
<jsp:include page="top.jsp" flush="true"/>
<jsp:include page="title.jsp" flush="true"/>
......@@ -189,6 +190,8 @@ import="java.text.DateFormat,
User(s) deleted successfully.
<% } else if ("true".equals(request.getParameter("updatesuccess"))) { %>
User(s) updated successfully.
<% } else if ("true".equals(request.getParameter("creategroupsuccess"))) { %>
Group created successfully.
<%
}
%>
......
src/web/group-properties.jsp deleted 100644 → 0
View file @ b182590b
<%--
- $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.*,
org.jivesoftware.messenger.user.*,
java.text.DateFormat,
java.util.*,
org.jivesoftware.admin.*,
org.jivesoftware.messenger.*,
org.jivesoftware.messenger.group.Group,
org.jivesoftware.messenger.group.GroupNotFoundException,
java.net.URLEncoder"
errorPage="error.jsp"
%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% // Get parameters //
boolean cancel = request.getParameter("cancel") != null;
boolean delete = request.getParameter("delete") != null;
String groupName = ParamUtils.getParameter(request,"group");
// Handle a cancel
if (cancel) {
response.sendRedirect("group-summary.jsp");
return;
}
// Handle a delete
if (delete) {
response.sendRedirect("group-delete.jsp?group=" + URLEncoder.encode(groupName, "UTF-8"));
return;
}
// Load the group object
Group group = null;
try {
group = webManager.getGroupManager().getGroup(groupName);
}
catch (GroupNotFoundException gnfe) {
group = webManager.getGroupManager().getGroup(groupName);
}
PresenceManager presenceManager = webManager.getPresenceManager();
// Date formatter for dates
DateFormat formatter = DateFormat.getDateInstance(DateFormat.MEDIUM);
%>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs
String title = "Group Properties";
pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "group-properties.jsp?group="+URLEncoder.encode(groupName)));
pageinfo.setSubPageID("group-properties");
pageinfo.setExtraParams("group="+groupName);
%>
<jsp:include page="top.jsp" flush="true" />
<jsp:include page="title.jsp" flush="true" />
<p>
Below is a summary of the group. To edit properties, click the "Edit" button below.
</p>
<% if (request.getParameter("success") != null) { %>
<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">
New group created successfully.
</td></tr>
</tbody>
</table>
</div><br>
<% } else if (request.getParameter("editsuccess") != null) { %>
<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">
Group updated successfully.
</td></tr>
</tbody>
</table>
</div><br>
<% } %>
<div class="jive-table">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<thead>
<tr>
<th colspan="2">
Group Properties
</th>
</tr>
</thead>
<tbody>
<tr>
<td class="c1">
Name:
</td>
<td>
<%= group.getName() %>
</td>
</tr>
<tr>
<td class="c1">
Description:
</td>
<td>
<% if (group.getDescription() == null || "".equals(group.getDescription().trim())) { %>
<span style="color:#999">
<i>Not set.</i>
</span>
<% } else { %>
<%= group.getDescription() %>
<% } %>
</td>
</tr>
</tbody>
</table>
</div>
<br><br>
<form action="group-edit.jsp">
<input type="hidden" name="group" value="<%= URLEncoder.encode(group.getName(), "UTF-8") %>">
<input type="submit" value="Edit Properties">
</form>
<jsp:include page="bottom.jsp" flush="true" />
\ No newline at end of file
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