shuber 2005/06/06 15:57:27 CEST
Modified files:
core/src/java/org/jahia/admin/users ManageUsers.java
core/src/webapp/jsp/jahia/administration/user_management
user_create.jsp
Log:
Remove default password generation when no password is submitted for a new
user
Revision Changes Path
1.6 +4 -5
jahia/core/src/java/org/jahia/admin/users/ManageUsers.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/admin/users/ManageUsers.java.diff?r1=1.5&r2=1.6&f=h
1.4 +0 -1
jahia/core/src/webapp/jsp/jahia/administration/user_management/user_create.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/administration/user_management/user_create.jsp.diff?r1=1.3&r2=1.4&f=h
Index: ManageUsers.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/admin/users/ManageUsers.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ManageUsers.java 11 May 2005 09:54:17 -0000 1.5
+++ ManageUsers.java 6 Jun 2005 13:57:26 -0000 1.6
@@ -1,4 +1,4 @@
-// $Id: ManageUsers.java,v 1.5 2005/05/11 09:54:17 tdraier Exp $
+// $Id: ManageUsers.java,v 1.6 2005/06/06 13:57:26 shuber Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -421,10 +421,9 @@
}
String passwd = request.getParameter("passwd").trim();
if ("".equals(passwd)) {
- passwd = username + "123";
- logger.warn("ATTENTION !! No password for user " +
- username + ". Create the default one : " + passwd + "\n" +
- "This is not secure !!! Please redefine another password as
soon as possible for this user.");
+ userMessage =
JahiaResourceBundle.getAdminResource("org.jahia.admin.userMessage.passwdLeast6Chars.label",
+ jParams, jParams.getLocale());
+ return false;
} else {
String passwdConfirm =
request.getParameter("passwdconfirm").trim();
if (!passwdConfirm.equals(passwd)) {
Index: user_create.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/administration/user_management/user_create.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- user_create.jsp 24 Mar 2005 16:28:16 -0000 1.3
+++ user_create.jsp 6 Jun 2005 13:57:26 -0000 1.4
@@ -56,7 +56,6 @@
<li> <jahia:adminResourceBundle
resourceName="org.jahia.admin.users.ManageUsers.userNameUniq.label"/></li>
<li> <jahia:adminResourceBundle
resourceName="org.jahia.admin.users.ManageUsers.onlyCharacters.label"/></li>
<li> <jahia:adminResourceBundle
resourceName="org.jahia.admin.users.ManageUsers.inputMaxCharacter.label"/></li>
- <li> <jahia:adminResourceBundle
resourceName="org.jahia.admin.users.ManageUsers.defaultPassword.label"/></li>
</ul>
<br>
</td>
