inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.0 to HEAD

Browse Source 
11943: Fix for ETHREEOH-879 & ETHREEOH-783: Multi-valued properties not allowed in Alfresco 3.0 (due to java.lang.UnsupportedOperationException)
   11944: Fix for ETHREEOH-865
   11947: Build fix for site service unit test failures.  This will be reviewed since it works round the issue rather than tackle why runAs is now failing.
   11952: ETHREEOH-845, ETHREEOH-871, ETHREEOH-853, ETHREEOH-839
   11953: ETHREEOH-483 Unable to upload files [with Flash 10 installed] Fixed to fit into yui 2.6.0
   11954: Added missing 'protocolOrder' configuration value.
   11956: Fix for ETHREEOH-895
   11957: Fix for ETHREEOH-891.
   11958: Readded generated source line for RemoteAPI project.
   11959: ETHREEOH-483 Unable to upload files [with Flash 10 installed] Missed to add this image
   11960: Removed JDK6 specific method.
   11962: Fixed missing setup of the share mapper class name when the <class> config tag is used. ALFCOM-2060.
   11964: fix for ETHREEOH-266 - restrict length of webapp to 150 chars.
   11965: Merged 2.2 to 3.0
      11926: Fox for ETHREEOH-725 User doesn't receive email to his box when rule 'Send an Email to specified users' is created 
   11966: ETHREEOH-872: Editing Email-notify-rules fails w/ ClassCastException
   11967: MT - test fixes (post runAs merge)
   11968: Changed Windows x64 NetBIOS warning message to be a debug message. ETHREEOH-897.
   11971: ETHREEOH-829 Case issue when inserting Document Share links into a discussion using richtext editor
   11973: Fix for ETHREEOH-890 - users with apostrophe in their login name can now login to Alfresco Explorer (and Share).

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12490 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2008-12-18 13:58:20 +00:00
parent 9cd516909e
commit 26d7b9669f
7 changed files with 72 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
source/java/org/alfresco/web/bean/users/CreateUserWizard.java
View File

@@ -54,6 +54,7 @@ import org.alfresco.util.Pair;
import org.alfresco.web.app.Application;
import org.alfresco.web.app.context.UIContextService;
import org.alfresco.web.app.servlet.FacesHelper;
import org.alfresco.web.bean.LoginBean;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.bean.spaces.CreateSpaceWizard;
import org.alfresco.web.bean.wizard.BaseWizardBean;
@@ -113,13 +114,13 @@ public class CreateUserWizard extends BaseWizardBean
/** ContentUsageService bean reference */
transient private ContentUsageService contentUsageService;
/** ref to the company home space folder */
private NodeRef companyHomeSpaceRef = null;
/** ref to the default home location */
private NodeRef defaultHomeSpaceRef;
/**
* @param authenticationService The AuthenticationService to set.
*/
@@ -128,13 +129,11 @@ public class CreateUserWizard extends BaseWizardBean
this.authenticationService = authenticationService;
}
/**
* @return authenticationService
*/
private AuthenticationService getAuthenticationService()
{
//check for null for cluster environment
if (authenticationService == null)
{
authenticationService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getAuthenticationService();
@@ -142,8 +141,6 @@ public class CreateUserWizard extends BaseWizardBean
return authenticationService;
}
/**
* @param personService The person service.
*/
@@ -152,13 +149,11 @@ public class CreateUserWizard extends BaseWizardBean
this.personService = personService;
}
/**
* @return personService
*/
private PersonService getPersonService()
{
//check for null for cluster environment
if (personService == null)
{
personService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getPersonService();
@@ -166,7 +161,6 @@ public class CreateUserWizard extends BaseWizardBean
return personService;
}
/**
* @param tenantService The tenantService to set.
*/
@@ -180,7 +174,6 @@ public class CreateUserWizard extends BaseWizardBean
*/
private TenantService getTenantService()
{
//check for null for cluster environment
if(tenantService == null)
{
tenantService = (TenantService) FacesHelper.getManagedBean(FacesContext.getCurrentInstance(), "tenantService");
@@ -201,7 +194,6 @@ public class CreateUserWizard extends BaseWizardBean
*/
private PermissionService getPermissionService()
{
//check for null for cluster environment
if (permissionService == null)
{
permissionService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getPermissionService();
@@ -222,7 +214,6 @@ public class CreateUserWizard extends BaseWizardBean
*/
private OwnableService getOwnableService()
{
//check for null for cluster environment
if (ownableService == null)
{
ownableService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getOwnableService();
@@ -243,7 +234,6 @@ public class CreateUserWizard extends BaseWizardBean
*/
private ContentUsageService getContentUsageService()
{
//check for null for cluster environment
if (contentUsageService == null)
{
contentUsageService = (ContentUsageService) FacesHelper.getManagedBean(FacesContext.getCurrentInstance(), "ContentUsageService");
@@ -255,9 +245,9 @@ public class CreateUserWizard extends BaseWizardBean
* Initialises the wizard
*/
@Override
public void init(Map<String, String> arg0)
public void init(Map<String, String> params)
{
super.init(arg0);
super.init(params);
// reset all variables
this.firstName = "";
@@ -606,21 +596,15 @@ public class CreateUserWizard extends BaseWizardBean
*/
public void validatePassword(FacesContext context, UIComponent component, Object value) throws ValidatorException
{
String pass = (String) value;
if (pass.length() < 5 || pass.length() > 12)
int minPasswordLength = Application.getClientConfig(context).getMinPasswordLength();
String pass = (String)value;
if (pass.length() < minPasswordLength || pass.length() > 256)
{
String err = "Password must be between 5 and 12 characters in length.";
String err = MessageFormat.format(Application.getMessage(context, LoginBean.MSG_PASSWORD_LENGTH),
new Object[]{minPasswordLength, 256});
throw new ValidatorException(new FacesMessage(err));
}
for (int i = 0; i < pass.length(); i++)
{
if (Character.isLetterOrDigit(pass.charAt(i)) == false)
{
String err = "Password can only contain characters or digits.";
throw new ValidatorException(new FacesMessage(err));
}
}
}
/**
@@ -628,20 +612,20 @@ public class CreateUserWizard extends BaseWizardBean
*/
public void validateUsername(FacesContext context, UIComponent component, Object value) throws ValidatorException
{
String pass = (String) value;
if (pass.length() < 5 || pass.length() > 12)
int minUsernameLength = Application.getClientConfig(context).getMinUsernameLength();
String name = ((String)value).trim();
if (name.length() < minUsernameLength || name.length() > 256)
{
String err = "Username must be between 5 and 12 characters in length.";
String err = MessageFormat.format(Application.getMessage(context, LoginBean.MSG_USERNAME_LENGTH),
new Object[]{minUsernameLength, 256});
throw new ValidatorException(new FacesMessage(err));
}
for (int i = 0; i < pass.length(); i++)
if (name.indexOf('"') != -1 || name.indexOf('\\') != -1)
{
if (Character.isLetterOrDigit(pass.charAt(i)) == false)
{
String err = "Username can only contain characters or digits.";
throw new ValidatorException(new FacesMessage(err));
}
String err = MessageFormat.format(Application.getMessage(context, LoginBean.MSG_USER_ERR),
new Object[]{"\", \\"});
throw new ValidatorException(new FacesMessage(err));
}
}