Commit b121d7dc authored by Derek DeMoro's avatar Derek DeMoro Committed by derek

Show new conference name.


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@1177 b35dd754-fafc-0310-a699-88a17e54d16e
parent 411ef7a6
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<%-- Define Administration Bean --%> <%-- Define Administration Bean --%>
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
<c:set var="admin" value="${admin.manager}" /> <c:set var="admin" value="${admin.manager}" />
<% admin.init(request, response, session, application, out ); %> <% admin.init(pageContext); %>
<% // Get parameters <% // Get parameters
boolean save = request.getParameter("save") != null; boolean save = request.getParameter("save") != null;
...@@ -45,23 +45,26 @@ ...@@ -45,23 +45,26 @@
// Handle a save // Handle a save
Map errors = new HashMap(); Map errors = new HashMap();
if (save) { if (save) {
// Make sure that the MUC Service is lower cased.
muc = muc.toLowerCase();
// do validation // do validation
if (muc == null || muc.indexOf('.') >= 0) { if (muc == null || muc.indexOf('.') >= 0) {
errors.put("mucname","mucname"); errors.put("mucname","mucname");
} }
if (errors.size() == 0) { if (errors.size() == 0) {
admin.getMultiUserChatServer().setServiceName(muc); admin.getMultiUserChatServer().setServiceName(muc);
response.sendRedirect("muc-server-props-edit-form.jsp?success=true"); response.sendRedirect("muc-server-props-edit-form.jsp?success=true&mucname="+muc);
return; return;
} }
} }
else { else if(muc == null) {
name = admin.getServerInfo().getName() == null ? "" : admin.getServerInfo().getName(); name = admin.getServerInfo().getName() == null ? "" : admin.getServerInfo().getName();
muc = admin.getMultiUserChatServer().getServiceName() == null ? "" : admin.getMultiUserChatServer().getServiceName(); muc = admin.getMultiUserChatServer().getServiceName() == null ? "" : admin.getMultiUserChatServer().getServiceName();
} }
name = admin.getServerInfo().getName(); name = admin.getServerInfo().getName();
if (errors.size() == 0) { if (errors.size() == 0 && muc == null) {
muc = admin.getMultiUserChatServer().getServiceName(); muc = admin.getMultiUserChatServer().getServiceName();
} }
%> %>
...@@ -109,7 +112,8 @@ ...@@ -109,7 +112,8 @@
<% } %> <% } %>
<form action="muc-server-props-edit-form.jsp?save" method="post"> <form action="muc-server-props-edit-form.jsp" method="post">
<input type="hidden" name="save" value="true">
<fieldset> <fieldset>
<legend><fmt:message key="groupchat.service.properties.legend" /></legend> <legend><fmt:message key="groupchat.service.properties.legend" /></legend>
......
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