Hi Jann, all, maybe we can consolidate the e-mail validation to a single place to avoid code duplication?
-- Andreas [EMAIL PROTECTED] schrieb: > Author: jann > Date: Thu Jul 12 07:49:59 2007 > New Revision: 555650 > > URL: http://svn.apache.org/viewvc?view=rev&rev=555650 > Log: > fixes http://issues.apache.org/bugzilla/show_bug.cgi?id=42863 > > 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=555650&r1=555649&r2=555650 > ============================================================================== > --- > 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 > Thu Jul 12 07:49:59 2007 > @@ -58,8 +58,8 @@ > addErrorMessage("This is not a valid user ID."); > } > > - if (email.length() == 0) { > - addErrorMessage("Please enter an e-mail address."); > + if (!email.matches("(\\w+\\.)*(\\w+)@(\\w+\\.)(\\w+)(\\.\\w+)*")) { > + addErrorMessage("Please enter a valid e-mail address."); > } > > if (className.equals(LDAPUser.class.getName())) { > > 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=555650&r1=555649&r2=555650 > ============================================================================== > --- > 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 > Thu Jul 12 07:49:59 2007 > @@ -44,8 +44,8 @@ > protected void doCheckExecutionConditions() throws Exception { > > String email = getParameterAsString(UserProfile.EMAIL); > - if (email.length() == 0) { > - addErrorMessage("Please enter an e-mail address."); > + if (!email.matches("(\\w+\\.)*(\\w+)@(\\w+\\.)(\\w+)(\\.\\w+)*")) { > + addErrorMessage("Please enter a valid e-mail address."); > } > } -- Andreas Hartmann, CTO BeCompany GmbH http://www.becompany.ch --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
