cmailleux 2005/10/20 18:45:39 CEST
Modified files:
core/src/java/org/jahia/admin/users ManageUsers.java
core/src/java/org/jahia/engines/users
NewUserRegistration_Engine.java
core/src/java/org/jahia/services/usermanager
JahiaUserManagerDBProvider.java
Log:
Correct JIRA-392
Revision Changes Path
1.9 +15 -23
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.8&r2=1.9&f=h
1.7 +18 -26
jahia/core/src/java/org/jahia/engines/users/NewUserRegistration_Engine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/users/NewUserRegistration_Engine.java.diff?r1=1.6&r2=1.7&f=h
1.12 +1 -1
jahia/core/src/java/org/jahia/services/usermanager/JahiaUserManagerDBProvider.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/usermanager/JahiaUserManagerDBProvider.java.diff?r1=1.11&r2=1.12&f=h
Index: ManageUsers.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/admin/users/ManageUsers.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ManageUsers.java 5 Jul 2005 15:45:55 -0000 1.8
+++ ManageUsers.java 20 Oct 2005 16:45:38 -0000 1.9
@@ -1,4 +1,4 @@
-// $Id: ManageUsers.java,v 1.8 2005/07/05 15:45:55 shuber Exp $
+// $Id: ManageUsers.java,v 1.9 2005/10/20 16:45:38 cmailleux Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -14,15 +14,6 @@
package org.jahia.admin.users;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Properties;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
import org.jahia.admin.homepages.HomePageTool;
import org.jahia.bin.Jahia;
import org.jahia.bin.JahiaAdministration;
@@ -40,18 +31,17 @@
import org.jahia.services.pages.ContentPage;
import org.jahia.services.pages.JahiaPageBaseService;
import org.jahia.services.sites.JahiaSite;
-import org.jahia.services.usermanager.JahiaGroupManagerService;
-import org.jahia.services.usermanager.JahiaSiteUserManagerService;
-import org.jahia.services.usermanager.JahiaUser;
-import org.jahia.services.usermanager.JahiaUserManagerService;
+import org.jahia.services.usermanager.*;
import org.jahia.services.version.EntryLoadRequest;
import org.jahia.utils.JahiaTools;
import org.jahia.utils.LanguageCodeConverters;
-import java.util.Set;
-import org.jahia.services.usermanager.UserProperty;
-import java.util.Enumeration;
-import org.jahia.services.usermanager.UserProperties;
-import java.util.Map;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.util.*;
/**
* desc: This class is used by the administration to manage users
@@ -459,10 +449,12 @@
}
}
- JahiaUser usr = uMgr.createUser(username, passwd, username + ":" +
jahiaSite.getID(), jahiaSite.getID(), userProps);
+ JahiaUser usr = null;
+
if(!username.equals(((JahiaUser)uMgr.getUserList(0).get(0)).getUsername()))
+ usr = uMgr.createUser(username, passwd, username + ":" +
jahiaSite.getID(), jahiaSite.getID(), userProps);
if (usr == null) {
userMessage =
JahiaResourceBundle.getAdminResource("org.jahia.admin.userMessage.unableCreateUser.label",
- jParams, jParams.getLocale());
+ jParams,
jParams.getLocale());
userMessage += " " + username;
return false;
} else {
@@ -470,10 +462,10 @@
ServicesRegistry.getInstance().getJahiaSiteUserManagerService();
siteUserManager.addMember(jahiaSite.getID(), usr);
userMessage =
JahiaResourceBundle.getAdminResource("org.jahia.admin.userMessage.user.label",
- jParams, jParams.getLocale());
+ jParams,
jParams.getLocale());
userMessage += " [" + username + "] ";
userMessage +=
JahiaResourceBundle.getAdminResource("org.jahia.admin.userMessage.created.label",
- jParams, jParams.getLocale());
+ jParams,
jParams.getLocale());
}
// Lookup for home page settings and set it.
Index: NewUserRegistration_Engine.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/users/NewUserRegistration_Engine.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NewUserRegistration_Engine.java 5 Jul 2005 15:46:16 -0000 1.6
+++ NewUserRegistration_Engine.java 20 Oct 2005 16:45:38 -0000 1.7
@@ -1,29 +1,24 @@
package org.jahia.engines.users;
-import org.jahia.engines.*;
+import org.jahia.data.JahiaData;
+import org.jahia.engines.EngineMessage;
+import org.jahia.engines.EngineMessages;
import org.jahia.engines.EngineToolBox;
-import org.jahia.params.ProcessingContext;
-import org.jahia.params.ParamBean;
-import org.jahia.params.SessionState;
+import org.jahia.engines.JahiaEngine;
+import org.jahia.engines.validation.EngineValidationHelper;
import org.jahia.exceptions.JahiaException;
-import org.jahia.data.JahiaData;
import org.jahia.exceptions.JahiaSessionExpirationException;
-import java.util.HashMap;
-import javax.servlet.http.HttpSession;
+import org.jahia.params.ParamBean;
+import org.jahia.params.ProcessingContext;
+import org.jahia.params.SessionState;
import org.jahia.registries.ServicesRegistry;
-import java.util.Map;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.Enumeration;
-import java.util.Properties;
-import org.jahia.services.usermanager.JahiaUser;
-import org.jahia.engines.EngineMessages;
-import org.jahia.engines.EngineMessage;
-import org.jahia.engines.validation.EngineValidationHelper;
import org.jahia.services.usermanager.JahiaGroup;
import org.jahia.services.usermanager.JahiaGroupManagerService;
+import org.jahia.services.usermanager.JahiaUser;
import org.jahia.services.usermanager.JahiaUserManagerService;
+import java.util.*;
+
public class NewUserRegistration_Engine implements JahiaEngine {
private static final String EDIT_JSP = "newuserregistration.jsp";
@@ -217,9 +212,11 @@
}
}
+ JahiaUserManagerService uMgr = ServicesRegistry.getInstance().
+ getJahiaUserManagerService();
if (allValuesValid) {
// now let's check if username already exists.
- JahiaUser existingUser =
ServicesRegistry.getInstance().getJahiaUserManagerService().lookupUser(jParams.getSiteID(),
userName);
+ JahiaUser existingUser =
uMgr.lookupUser(jParams.getSiteID(), userName);
if (existingUser != null) {
allValuesValid = false;
EngineMessage errorMessage = new EngineMessage(
@@ -252,15 +249,10 @@
}
if (allValuesValid) {
- JahiaUser newUser = ServicesRegistry.getInstance().
- getJahiaUserManagerService().
- createUser(userName,
- password1,
- userName + ":" +
- Integer.toString(jParams.
- getSiteID()),
- jParams.getSiteID(),
- userProperties);
+ JahiaUser newUser = null;
+
if(!userName.equals(((JahiaUser)uMgr.getUserList(0).get(0)).getUsername()))
+ newUser = uMgr.createUser(userName, password1, userName +
":" + Integer.toString(jParams. getSiteID()),
+ jParams.getSiteID(),
userProperties);
if (newUser != null) {
ServicesRegistry.getInstance().
getJahiaSiteUserManagerService().addMember(jParams.
Index: JahiaUserManagerDBProvider.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/usermanager/JahiaUserManagerDBProvider.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JahiaUserManagerDBProvider.java 6 Oct 2005 15:56:07 -0000 1.11
+++ JahiaUserManagerDBProvider.java 20 Oct 2005 16:45:39 -0000 1.12
@@ -128,7 +128,7 @@
JahiaGroup usersGroup = groupService.getUsersGroup (siteID);
JahiaGroup guestGroup = groupService.getGuestGroup (siteID);
if ((usersGroup == null) || (guestGroup == null)) {
- logger.error ("Ccould not get the [users] or/and [guest] group
instance.");
+ logger.error ("Could not get the [users] or/and [guest] group
instance.");
return null;
}
