Skip to content

O
Openfire
Commit c0d5d772 authored by Gaston Dombiak's avatar Gaston Dombiak Committed by gaston
Browse files
Options

1. Added checking for room name. JM-283 

2. Improved presentation of errors. JM-283


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@1337 b35dd754-fafc-0310-a699-88a17e54d16e
parent 7b1ffd26
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 74 deletions
src/web/muc-room-edit-form.jsp
View file @ c0d5d772
...@@ -23,7 +23,9 @@ ...@@ -23,7 +23,9 @@
org.xmpp.packet.Message, org.xmpp.packet.Message,
org.xmpp.packet.JID, org.xmpp.packet.JID,
org.jivesoftware.messenger.auth.UnauthorizedException, org.jivesoftware.messenger.auth.UnauthorizedException,
org.jivesoftware.util.LocaleUtils" org.jivesoftware.util.LocaleUtils,
org.jivesoftware.stringprep.Stringprep,
org.jivesoftware.stringprep.StringprepException"
errorPage="error.jsp" errorPage="error.jsp"
%> %>
...@@ -99,6 +101,16 @@ ...@@ -99,6 +101,16 @@
errors.put("roomName","roomName"); errors.put("roomName","roomName");
} }
else { else {
// Check that the room name is a valid node
try {
roomName = Stringprep.nodeprep(roomName);
}
catch (StringprepException e) {
errors.put("roomName","roomName");
}
}
if (errors.size() == 0) {
// Check that the requested room ID is available // Check that the requested room ID is available
room = webManager.getMultiUserChatServer().getChatRoom(roomName); room = webManager.getMultiUserChatServer().getChatRoom(roomName);
if (room != null) { if (room != null) {
...@@ -293,7 +305,42 @@ ...@@ -293,7 +305,42 @@
<jsp:include page="top.jsp" flush="true" /> <jsp:include page="top.jsp" flush="true" />
<jsp:include page="title.jsp" flush="true" /> <jsp:include page="title.jsp" flush="true" />
<% if (success || addsuccess) { %> <% if (!errors.isEmpty()) { %>
<div class="jive-error">
<table cellpadding="0" cellspacing="0" border="0">
<tbody>
<tr>
<td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"/></td>
<td class="jive-icon-label">
<% if (errors.get("roomconfig_roomname") != null) { %>
<fmt:message key="muc.room.edit.form.valid_hint_name" />
<% } else if (errors.get("roomconfig_roomdesc") != null) { %>
<fmt:message key="muc.room.edit.form.valid_hint_description" />
<% } else if (errors.get("roomconfig_maxusers") != null) { %>
<fmt:message key="muc.room.edit.form.valid_hint_max_room" />
<% } else if (errors.get("roomconfig_roomsecret2") != null) { %>
<fmt:message key="muc.room.edit.form.new_password" />
<% } else if (errors.get("roomconfig_whois") != null) { %>
<fmt:message key="muc.room.edit.form.role" />
<% } else if (errors.get("roomName") != null) { %>
<fmt:message key="muc.room.edit.form.valid_hint" />
<% } else if (errors.get("room_already_exists") != null) { %>
<fmt:message key="muc.room.edit.form.error_created_id" />
<% } else if (errors.get("not_enough_permissions") != null) { %>
<fmt:message key="muc.room.edit.form.error_created_privileges" />
<% } else if (errors.get("room_topic") != null) { %>
<fmt:message key="muc.room.edit.form.valid_hint_subject" />
<% } %>
</td>
</tr>
</tbody>
</table>
</div>
<br>
<% } else if (success || addsuccess) { %>
<div class="jive-success"> <div class="jive-success">
<table cellpadding="0" cellspacing="0" border="0"> <table cellpadding="0" cellspacing="0" border="0">
...@@ -344,28 +391,6 @@ ...@@ -344,28 +391,6 @@
<p><fmt:message key="muc.room.edit.form.change_room" /></p> <p><fmt:message key="muc.room.edit.form.change_room" /></p>
<% } else { %> <% } else { %>
<p><fmt:message key="muc.room.edit.form.persistent_room" /></p> <p><fmt:message key="muc.room.edit.form.persistent_room" /></p>
<% if (errors.containsKey("room_already_exists") || errors.containsKey("not_enough_permissions")) { %>
<div class="jive-error">
<table cellpadding="0" cellspacing="0" border="0">
<tbody>
<tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label">
<% if (errors.containsKey("room_already_exists")) { %>
<fmt:message key="muc.room.edit.form.error_created_id" />
<% } else if (errors.containsKey("not_enough_permissions")) { %>
<fmt:message key="muc.room.edit.form.error_created_privileges" />
<% } %>
</td></tr>
</tbody>
</table>
</div><br>
<% } %>
<% } %> <% } %>
<form action="muc-room-edit-form.jsp"> <form action="muc-room-edit-form.jsp">
<% if (!create) { %> <% if (!create) { %>
...@@ -381,51 +406,23 @@ ...@@ -381,51 +406,23 @@
<% if (create) { %> <% if (create) { %>
<tr> <tr>
<td><fmt:message key="muc.room.edit.form.room_id" />:</td> <td><fmt:message key="muc.room.edit.form.room_id" />:</td>
<td><input type="text" name="roomName" value="<%= roomName != null ? roomName : ""%>"> <td><input type="text" name="roomName" value="<%= roomName != null ? roomName : ""%>"> @<%= webManager.getMultiUserChatServer().getServiceDomain()%>
<% if (errors.get("roomName") != null) { %>
<span class="jive-error-text">
<fmt:message key="muc.room.edit.form.valid_hint" />
</span>
<% } %>
</td> </td>
</tr> </tr>
<% } %> <% } %>
<tr> <tr>
<td><fmt:message key="muc.room.edit.form.room_name" />:</td> <td><fmt:message key="muc.room.edit.form.room_name" />:</td>
<td><input type="text" name="roomconfig_roomname" value="<%= (naturalName == null ? "" : naturalName) %>"> <td><input type="text" name="roomconfig_roomname" value="<%= (naturalName == null ? "" : naturalName) %>">
<% if (errors.get("roomconfig_roomname") != null) { %>
<span class="jive-error-text">
<fmt:message key="muc.room.edit.form.valid_hint_name" />
</span>
<% } %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td><fmt:message key="muc.room.edit.form.description" />:</td> <td><fmt:message key="muc.room.edit.form.description" />:</td>
<td><input name="roomconfig_roomdesc" value="<%= (description == null ? "" : description) %>" type="text" size="40"> <td><input name="roomconfig_roomdesc" value="<%= (description == null ? "" : description) %>" type="text" size="40">
<% if (errors.get("roomconfig_roomdesc") != null) { %>
<span class="jive-error-text">
<fmt:message key="muc.room.edit.form.valid_hint_description" />
</span>
<% } %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td><fmt:message key="muc.room.edit.form.topic" />:</td> <td><fmt:message key="muc.room.edit.form.topic" />:</td>
<td><input name="room_topic" value="<%= (roomSubject == null ? "" : roomSubject) %>" type="text" size="40"> <td><input name="room_topic" value="<%= (roomSubject == null ? "" : roomSubject) %>" type="text" size="40">
<% if (errors.get("room_topic") != null) { %>
<span class="jive-error-text">
<fmt:message key="muc.room.edit.form.valid_hint_subject" />
</span>
<% } %>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -438,13 +435,6 @@ ...@@ -438,13 +435,6 @@
<option value="50" <% if ("50".equals(maxUsers)) out.write("selected");%>>50</option> <option value="50" <% if ("50".equals(maxUsers)) out.write("selected");%>>50</option>
<option value="0" <% if ("0".equals(maxUsers)) out.write("selected");%>><fmt:message key="muc.room.edit.form.none" /></option> <option value="0" <% if ("0".equals(maxUsers)) out.write("selected");%>><fmt:message key="muc.room.edit.form.none" /></option>
</select> </select>
<% if (errors.get("roomconfig_maxusers") != null) { %>
<span class="jive-error-text">
<fmt:message key="muc.room.edit.form.valid_hint_max_room" />
</span>
<% } %>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -465,13 +455,6 @@ ...@@ -465,13 +455,6 @@
<tr> <tr>
<td><fmt:message key="muc.room.edit.form.confirm_password" />:</td> <td><fmt:message key="muc.room.edit.form.confirm_password" />:</td>
<td><input type="password" name="roomconfig_roomsecret2" <% if(confirmPassword != null) { %> value="<%= confirmPassword %>" <% } %>> <td><input type="password" name="roomconfig_roomsecret2" <% if(confirmPassword != null) { %> value="<%= confirmPassword %>" <% } %>>
<% if (errors.get("roomconfig_roomsecret2") != null) { %>
<span class="jive-error-text">
<fmt:message key="muc.room.edit.form.new_password" />
</span>
<% } %>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -480,13 +463,6 @@ ...@@ -480,13 +463,6 @@
<option value="moderator" <% if ("moderator".equals(whois)) out.write("selected");%>><fmt:message key="muc.room.edit.form.moderator" /></option> <option value="moderator" <% if ("moderator".equals(whois)) out.write("selected");%>><fmt:message key="muc.room.edit.form.moderator" /></option>
<option value="anyone" <% if ("anyone".equals(whois)) out.write("selected");%>><fmt:message key="muc.room.edit.form.anyone" /></option> <option value="anyone" <% if ("anyone".equals(whois)) out.write("selected");%>><fmt:message key="muc.room.edit.form.anyone" /></option>
</select> </select>
<% if (errors.get("roomconfig_whois") != null) { %>
<span class="jive-error-text">
<fmt:message key="muc.room.edit.form.role" />
</span>
<% } %>
</td> </td>
</tr> </tr>
</tbody> </tbody>
......
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