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/12 16:50:00 UTC

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

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.");
         }
     }
     



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


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

Posted by Jörn Nettingsmeier <ne...@apache.org>.
Andreas Hartmann wrote:
> Hi Jann, all,
> 
> maybe we can consolidate the e-mail validation to a single place
> to avoid code duplication?
> 
> -- Andreas

+1


-- 
Jörn Nettingsmeier

Kurt is up in heaven now.


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


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

Posted by Jann Forrer <ja...@id.uzh.ch>.
> Hi Jann, all,
> 
> maybe we can consolidate the e-mail validation to a single place
> to avoid code duplication?
> 

Should we use org.apache.lenya.ac.ItemUtil for that? There is already a
method isValidId(userId). I could add a method isValidEmail(email).

BTW does it make sense to centralize validation of (usecase) input
parameters at a central location having a method called validate where
we could define e.g. a regex for each input field?

Jann

> -- Andreas
> 
> jann@apache.org 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.");
>>          }
>>      }
> 
> 




-- 
Jann Forrer
Informatikdienste
Universität Zürich
Winterthurerstr. 190
CH-8057 Zürich

oooO   mail:  jann.forrer@id.uzh.ch
(  )   phone: +41 44 63 56772
 \ (   fax:   +41 44 63 54505
  \_)  http://www.id.unizh.ch


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


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

Posted by Andreas Hartmann <an...@apache.org>.
Hi Jann, all,

maybe we can consolidate the e-mail validation to a single place
to avoid code duplication?

-- Andreas

jann@apache.org 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: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org