Commit 0059bb8d authored by Gaston Dombiak's avatar Gaston Dombiak Committed by gaston

Removed references to old groupchat server.


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@163 b35dd754-fafc-0310-a699-88a17e54d16e
parent 7eb06aad
......@@ -9,8 +9,7 @@
java.text.DateFormat,
java.util.HashMap,
java.util.Map,
org.jivesoftware.messenger.XMPPServerInfo,
org.jivesoftware.messenger.chat.ChatServer"
org.jivesoftware.messenger.XMPPServerInfo"
%>
<%
// Handle a cancel
......@@ -39,7 +38,6 @@
boolean save = ParamUtils.getBooleanParameter(request,"save");
boolean success = false;
String name = ParamUtils.getParameter(request,"servername");
String chat = ParamUtils.getParameter(request,"chatname");
String muc = ParamUtils.getParameter(request,"mucname");
......@@ -51,14 +49,10 @@
if (name == null) {
errors.put("servername","servername");
}
if (chat == null) {
errors.put("chatname","chatname");
}
if (muc == null) {
if (muc == null || muc.indexOf('.') >= 0) {
errors.put("mucname","mucname");
}
if (errors.size() == 0) {
admin.getChatServer().setChatServerName(chat);
admin.getMultiUserChatServer().setServiceName(muc);
admin.getXMPPServer().getServerInfo().setName(name);
success = true;
......@@ -67,8 +61,6 @@
else {
name = admin.getServerInfo().getName() == null
? "" : admin.getServerInfo().getName();
chat = admin.getChatServer().getChatServerName() == null
? "" : admin.getChatServer().getChatServerName();
muc = admin.getMultiUserChatServer().getServiceName() == null
? "" : admin.getMultiUserChatServer().getServiceName();
}
......@@ -112,23 +104,6 @@ Use the form below to edit server properties.
<% } %>
</td>
</tr>
<tr>
<td class="jive-label">
Chat server name:
</td>
<td>
<input type="text" size="30" maxlength="150" name="chatname"
value="<%= chat %>">
<% if (errors.get("chatname") != null) { %>
<span class="jive-error-text">
Please enter a valid name.
</span>
<% } %>
</td>
</tr>
<tr>
<td class="jive-label">
Multi User Chat server name:
......
......@@ -9,8 +9,7 @@
<%@ page import="org.jivesoftware.util.*,
org.jivesoftware.messenger.XMPPServerInfo,
java.util.Iterator,
org.jivesoftware.messenger.ServerPort,
org.jivesoftware.messenger.chat.ChatServer"
org.jivesoftware.messenger.ServerPort"
%>
<!-- Define Administration Bean -->
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
......@@ -69,16 +68,6 @@ Below is a list of information for this <fmt:message key="short.title" bundle="$
>Edit <img src="images/edit-16x16.gif" width="17" height="17" border="0"></a>
</td>
</tr>
<c:if test="${!empty admin.chatServer}">
<tr>
<td class="jive-label">
Chat Server Name:
</td>
<td colspan=2>
<c:out value="${admin.chatServer.chatServerName}" />
</td>
</tr>
</c:if>
<c:if test="${!empty admin.multiUserChatServer}">
<tr>
<td class="jive-label">
......
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