You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ja...@apache.org on 2007/07/13 15:50:08 UTC

svn commit: r555999 - in /lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases: AddUser.java UserProfile.java

Author: jann
Date: Fri Jul 13 06:50:07 2007
New Revision: 555999

URL: http://svn.apache.org/viewvc?view=rev&rev=555999
Log:
Checking for correct email

Modified:
    lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AddUser.java
    lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/UserProfile.java

Modified: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AddUser.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AddUser.java?view=diff&rev=555999&r1=555998&r2=555999
==============================================================================
--- lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AddUser.java (original)
+++ lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AddUser.java Fri Jul 13 06:50:07 2007
@@ -58,7 +58,7 @@
             addErrorMessage("This is not a valid user ID.");
         }
 
-        if (!email.matches("(\\w+\\.)*(\\w+)@(\\w+\\.)(\\w+)(\\.\\w+)*")) {
+        if (!ItemUtil.isValidEmail(email)) {
             addErrorMessage("Please enter a valid e-mail address.");
         }
 

Modified: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/UserProfile.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/UserProfile.java?view=diff&rev=555999&r1=555998&r2=555999
==============================================================================
--- lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/UserProfile.java (original)
+++ lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/UserProfile.java Fri Jul 13 06:50:07 2007
@@ -18,6 +18,7 @@
 package org.apache.lenya.cms.ac.usecases;
 
 import org.apache.lenya.ac.User;
+import org.apache.lenya.ac.ItemUtil;
 
 /**
  * Usecase to edit a user's profile.
@@ -44,7 +45,7 @@
     protected void doCheckExecutionConditions() throws Exception {
         
         String email = getParameterAsString(UserProfile.EMAIL);
-        if (!email.matches("(\\w+\\.)*(\\w+)@(\\w+\\.)(\\w+)(\\.\\w+)*")) {
+        if (!ItemUtil.isValidEmail(email)) {
             addErrorMessage("Please enter a valid e-mail address.");
         }
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org