Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r3bc7def5ee7185bd2da8f977a21428225f6481e1 -rb0952eab3024458158903e62579ab202ee2a6838 Binary files differ Index: lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java =================================================================== diff -u -r7df862bfcb167264522788713a14201c8fe44362 -rb0952eab3024458158903e62579ab202ee2a6838 --- lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java (.../LoginRequestServlet.java) (revision 7df862bfcb167264522788713a14201c8fe44362) +++ lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java (.../LoginRequestServlet.java) (revision b0952eab3024458158903e62579ab202ee2a6838) @@ -135,14 +135,14 @@ } ExtServerOrgMap serverMap = getService().getExtServerOrgMap(serverId); - boolean prefix = Boolean.parseBoolean(usePrefix); + boolean prefix = usePrefix == null ? true : Boolean.parseBoolean(usePrefix); try { ExtUserUseridMap userMap = null; if ((firstName == null) && (lastName == null)) { userMap = getService().getExtUserUseridMap(serverMap, extUsername, prefix); } else { userMap = getService().getImplicitExtUserUseridMap(serverMap, extUsername, firstName, lastName, - langIsoCode, countryIsoCode, email); + langIsoCode, countryIsoCode, email, prefix); } Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java =================================================================== diff -u -r228482c7a091c7691a9fc9651e46a8d98e29a6e1 -rb0952eab3024458158903e62579ab202ee2a6838 --- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java (.../LearningDesignRepositoryServlet.java) (revision 228482c7a091c7691a9fc9651e46a8d98e29a6e1) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java (.../LearningDesignRepositoryServlet.java) (revision b0952eab3024458158903e62579ab202ee2a6838) @@ -289,7 +289,8 @@ String lang = request.getParameter(CentralConstants.PARAM_LANG); String modeStr = request.getParameter(CentralConstants.PARAM_MODE); String method = request.getParameter(CentralConstants.PARAM_METHOD); - + String usePrefix = request.getParameter(CentralConstants.PARAM_USE_PREFIX); + String firstName = request.getParameter(LoginRequestDispatcher.PARAM_FIRST_NAME); String lastName = request.getParameter(LoginRequestDispatcher.PARAM_LAST_NAME); String email = request.getParameter(LoginRequestDispatcher.PARAM_EMAIL); @@ -326,11 +327,12 @@ } else { ExtUserUseridMap userMap = null; + boolean prefix = usePrefix == null ? true : Boolean.parseBoolean(usePrefix); if (firstName == null && lastName == null) { - userMap = integrationService.getExtUserUseridMap(serverMap, username); + userMap = integrationService.getExtUserUseridMap(serverMap, username, prefix); } else { userMap = integrationService.getImplicitExtUserUseridMap(serverMap, username, firstName, lastName, - lang, country, email); + lang, country, email, prefix); } // create group for external course if necessary Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java =================================================================== diff -u -r7df862bfcb167264522788713a14201c8fe44362 -rb0952eab3024458158903e62579ab202ee2a6838 --- lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java (.../IIntegrationService.java) (revision 7df862bfcb167264522788713a14201c8fe44362) +++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java (.../IIntegrationService.java) (revision b0952eab3024458158903e62579ab202ee2a6838) @@ -69,7 +69,8 @@ String lastName, String language, String country, - String email) + String email, + boolean prefix) throws UserInfoFetchException; ExtUserUseridMap getImplicitExtUserUseridMap( Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java =================================================================== diff -u -r7df862bfcb167264522788713a14201c8fe44362 -rb0952eab3024458158903e62579ab202ee2a6838 --- lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java (.../IntegrationService.java) (revision 7df862bfcb167264522788713a14201c8fe44362) +++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java (.../IntegrationService.java) (revision b0952eab3024458158903e62579ab202ee2a6838) @@ -220,14 +220,14 @@ } public ExtUserUseridMap getImplicitExtUserUseridMap(ExtServerOrgMap serverMap, String extUsername, - String firstName, String lastName, String language, String country, String email) + String firstName, String lastName, String language, String country, String email, boolean prefix) throws UserInfoFetchException { Map properties = new HashMap(); properties.put("extServerOrgMap.sid", serverMap.getSid()); properties.put("extUsername", extUsername); List list = service.findByProperties(ExtUserUseridMap.class, properties); if (list == null || list.size() == 0) { - return createImplicitExtUserUseridMap(serverMap, extUsername, firstName, lastName, language, country, email); + return createImplicitExtUserUseridMap(serverMap, extUsername, firstName, lastName, language, country, email, prefix); } else { return (ExtUserUseridMap) list.get(0); } @@ -321,11 +321,11 @@ // compatibility method public ExtUserUseridMap createImplicitExtUserUseridMap(ExtServerOrgMap serverMap, String extUsername, - String firstName, String lastName, String language, String country, String email) + String firstName, String lastName, String language, String country, String email, boolean prefix) throws UserInfoFetchException { String[] userData = { "", firstName, lastName, "", "", "", "", "", "", "", "", email, country, language }; String password = HashUtil.sha1(RandomPasswordGenerator.nextPassword(10)); - return createExtUserUseridMap(serverMap, extUsername, password, userData, true); + return createExtUserUseridMap(serverMap, extUsername, password, userData, prefix); } private String[] getUserDataFromExtServer(ExtServerOrgMap serverMap, String extUsername)