Index: lams_build/lib/lams/lams.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v diff -u -r1.346 -r1.347 Binary files differ Index: lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java,v diff -u -r1.16 -r1.17 --- lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java 11 Sep 2012 21:39:50 -0000 1.16 +++ lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java 13 Sep 2012 17:44:43 -0000 1.17 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java,v diff -u -r1.12 -r1.13 --- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java 21 Mar 2012 13:33:48 -0000 1.12 +++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java 13 Sep 2012 17:44:43 -0000 1.13 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java,v diff -u -r1.13 -r1.14 --- lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java 11 Sep 2012 21:39:49 -0000 1.13 +++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java 13 Sep 2012 17:44:45 -0000 1.14 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java,v diff -u -r1.27 -r1.28 --- lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java 11 Sep 2012 21:39:49 -0000 1.27 +++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java 13 Sep 2012 17:44:45 -0000 1.28 @@ -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)