Loosen usercreate stuff for admins

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/UserValidator.java

@@ -14,7 +14,9 @@ import javax.inject.Named;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 
+import fi.insomnia.bortal.beans.PermissionBeanLocal;
 import fi.insomnia.bortal.beans.UserBeanLocal;
 import fi.insomnia.bortal.beans.UserBeanLocal;
+import fi.insomnia.bortal.enums.apps.UserPermission;
 import fi.insomnia.bortal.utilities.I18n;
 import fi.insomnia.bortal.utilities.I18n;
 
 
 @Named
 @Named
@@ -29,12 +31,15 @@ public class UserValidator implements Serializable {
 	private static final Integer PASSWORD_MIN_LENGTH = 8;
 	private static final Integer PASSWORD_MIN_LENGTH = 8;
 	@EJB
 	@EJB
 	private transient UserBeanLocal userbean;
 	private transient UserBeanLocal userbean;
+	@EJB
+	private transient PermissionBeanLocal permbean;
+
 	private static final Logger logger = LoggerFactory.getLogger(UserValidator.class);
 	private static final Logger logger = LoggerFactory.getLogger(UserValidator.class);
 
 
 	public void validateEmail(FacesContext context, UIComponent ui, Object value) {
 	public void validateEmail(FacesContext context, UIComponent ui, Object value) {
 		String email = (String) value;
 		String email = (String) value;
 
 
-		if (email.indexOf('@') == -1) {
+		if (!permbean.hasPermission(UserPermission.MODIFY) && email.indexOf('@') == -1) {
 			message(context, ui, "userview.invalidEmail");
 			message(context, ui, "userview.invalidEmail");
 		}
 		}
 	}
 	}
@@ -53,6 +58,8 @@ public class UserValidator implements Serializable {
 	public void password(FacesContext context, UIComponent ui, Object object) {
 	public void password(FacesContext context, UIComponent ui, Object object) {
 		logger.info("Executing pwd, firstpwd {}", firstpwd);
 		logger.info("Executing pwd, firstpwd {}", firstpwd);
 
 
+		if (!permbean.hasPermission(UserPermission.MODIFY))
+		{
 			if (object == null) {
 			if (object == null) {
 				message(context, ui, "user.passwordlengthMessage");
 				message(context, ui, "user.passwordlengthMessage");
 				return;
 				return;
@@ -65,6 +72,7 @@ public class UserValidator implements Serializable {
 				logger.info("Setting firstpwd to {} as {}", firstpwd, object.getClass());
 				logger.info("Setting firstpwd to {} as {}", firstpwd, object.getClass());
 				return;
 				return;
 			}
 			}
+		}
 		logger.info("Checking length");
 		logger.info("Checking length");
 		if (!firstpwd.equals(object)) {
 		if (!firstpwd.equals(object)) {
 			message(context, ui, "userview.passwordsDontMatch");
 			message(context, ui, "userview.passwordsDontMatch");