Skip to content

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

Don't allow users to be edited/deleted if they are read-only (JM-194). 

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@5211 b35dd754-fafc-0310-a699-88a17e54d16e
parent ff11bc42
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 4 deletions
src/i18n/wildfire_i18n_en.properties
View file @ ec358a61
...@@ -106,6 +106,7 @@ ...@@ -106,6 +106,7 @@
## Updated key: 'group.summary.no_groups' ## Updated key: 'group.summary.no_groups'
## Added key: 'setup.sidebar.profile' ## Added key: 'setup.sidebar.profile'
## Added key: 'user.read_only' ## Added key: 'user.read_only'
## Updated key: 'user.properties.info'
## Added key: 'session.details.priority' ## Added key: 'session.details.priority'
# Wildfire # Wildfire
...@@ -1544,8 +1545,7 @@ user.password.update_pwd=Update Password ...@@ -1544,8 +1545,7 @@ user.password.update_pwd=Update Password
# User properties Page # User properties Page
user.properties.title=User Properties user.properties.title=User Properties
user.properties.info=Below is a summary of user properties. To edit properties, click the "Edit" \ user.properties.info=Below is a summary of user properties.
button below.
user.properties.created=New user created successfully. user.properties.created=New user created successfully.
user.properties.update=User properties updated successfully. user.properties.update=User properties updated successfully.
user.properties.available=Available user.properties.available=Available
...@@ -1875,4 +1875,4 @@ calendar.weekend = 0,6 ...@@ -1875,4 +1875,4 @@ calendar.weekend = 0,6
calendar.close = Close calendar.close = Close
calendar.today = Today calendar.today = Today
calendar.time_part = (Shift-)Click or drag to change value calendar.time_part = (Shift-)Click or drag to change value
calendar.time = Time: calendar.time = Time:
\ No newline at end of file
src/web/user-create.jsp
View file @ ec358a61
...@@ -104,6 +104,12 @@ ...@@ -104,6 +104,12 @@
</head> </head>
<body> <body>
<% if (UserManager.getUserProvider().isReadOnly()) { %>
<div class="error">
<fmt:message key="user.read_only"/>
</div>
<% } %>
<p><fmt:message key="user.create.info" /></p> <p><fmt:message key="user.create.info" /></p>
<%--<c:set var="submit" value="${param.create}"/>--%> <%--<c:set var="submit" value="${param.create}"/>--%>
...@@ -227,5 +233,19 @@ ...@@ -227,5 +233,19 @@
document.f.username.focus(); document.f.username.focus();
</script> </script>
<% // Disable the form if a read-only user provider.
if (UserManager.getUserProvider().isReadOnly()) { %>
<script language="Javascript" type="text/javascript">
function disable() {
var limit = document.forms[0].elements.length;
for (i=0;i<limit;i++) {
document.forms[0].elements[i].disabled = true;
}
}
disable();
</script>
<% } %>
</body> </body>
</html> </html>
\ No newline at end of file
src/web/user-delete.jsp
View file @ ec358a61
...@@ -92,7 +92,8 @@ ...@@ -92,7 +92,8 @@
<input type="submit" name="cancel" value="<fmt:message key="global.cancel" />"> <input type="submit" name="cancel" value="<fmt:message key="global.cancel" />">
</form> </form>
<% if (UserManager.getUserProvider().isReadOnly()) { %> <% // Disable the form if a read-only user provider.
if (UserManager.getUserProvider().isReadOnly()) { %>
<script language="Javascript" type="text/javascript"> <script language="Javascript" type="text/javascript">
function disable() { function disable() {
......
src/web/user-password.jsp
View file @ ec358a61
...@@ -60,6 +60,12 @@ ...@@ -60,6 +60,12 @@
</head> </head>
<body> <body>
<% if (UserManager.getUserProvider().isReadOnly()) { %>
<div class="error">
<fmt:message key="user.read_only"/>
</div>
<% } %>
<% if (errors) { %> <% if (errors) { %>
<div class="jive-error"> <div class="jive-error">
...@@ -139,5 +145,19 @@ ...@@ -139,5 +145,19 @@
document.passform.password.focus(); document.passform.password.focus();
</script> </script>
<% // Disable the form if a read-only user provider.
if (UserManager.getUserProvider().isReadOnly()) { %>
<script language="Javascript" type="text/javascript">
function disable() {
var limit = document.forms[0].elements.length;
for (i=0;i<limit;i++) {
document.forms[0].elements[i].disabled = true;
}
}
disable();
</script>
<% } %>
</body> </body>
</html> </html>
src/web/user-properties.jsp
View file @ ec358a61
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
<%@ page import="java.net.URLEncoder"%> <%@ page import="java.net.URLEncoder"%>
<%@ page import="java.util.Collection"%> <%@ page import="java.util.Collection"%>
<%@ page import="java.util.Iterator"%> <%@ page import="java.util.Iterator"%>
<%@ page import="org.jivesoftware.wildfire.user.UserManager"%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %> <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
...@@ -226,10 +227,14 @@ ...@@ -226,10 +227,14 @@
<br><br> <br><br>
<% if (!UserManager.getUserProvider().isReadOnly()) { %>
<form action="user-edit-form.jsp"> <form action="user-edit-form.jsp">
<input type="hidden" name="username" value="<%= user.getUsername() %>"> <input type="hidden" name="username" value="<%= user.getUsername() %>">
<input type="submit" value="<fmt:message key="global.edit_properties" />"> <input type="submit" value="<fmt:message key="global.edit_properties" />">
</form> </form>
<% } %>
</body> </body>
</html> </html>
\ No newline at end of file
src/web/user-summary.jsp
View file @ ec358a61
...@@ -154,8 +154,11 @@ ...@@ -154,8 +154,11 @@
<th nowrap><fmt:message key="user.create.username" /></th> <th nowrap><fmt:message key="user.create.username" /></th>
<th nowrap><fmt:message key="user.create.name" /></th> <th nowrap><fmt:message key="user.create.name" /></th>
<th nowrap><fmt:message key="user.summary.created" /></th> <th nowrap><fmt:message key="user.summary.created" /></th>
<% // Don't allow editing or deleting if users are read-only.
if (!UserManager.getUserProvider().isReadOnly()) { %>
<th nowrap><fmt:message key="user.summary.edit" /></th> <th nowrap><fmt:message key="user.summary.edit" /></th>
<th nowrap><fmt:message key="global.delete" /></th> <th nowrap><fmt:message key="global.delete" /></th>
<% } %>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -215,6 +218,8 @@ ...@@ -215,6 +218,8 @@
<td width="26%"> <td width="26%">
<%= JiveGlobals.formatDate(user.getCreationDate()) %> <%= JiveGlobals.formatDate(user.getCreationDate()) %>
</td> </td>
<% // Don't allow editing or deleting if users are read-only.
if (!UserManager.getUserProvider().isReadOnly()) { %>
<td width="1%" align="center"> <td width="1%" align="center">
<a href="user-edit-form.jsp?username=<%= URLEncoder.encode(user.getUsername(), "UTF-8") %>" <a href="user-edit-form.jsp?username=<%= URLEncoder.encode(user.getUsername(), "UTF-8") %>"
title="<fmt:message key="global.click_edit" />" title="<fmt:message key="global.click_edit" />"
...@@ -225,6 +230,7 @@ ...@@ -225,6 +230,7 @@
title="<fmt:message key="global.click_delete" />" title="<fmt:message key="global.click_delete" />"
><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a> ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
</td> </td>
<% } %>
</tr> </tr>
<% <%
......
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