[FormMagick-devel] CVS: formmagick/lib/CGI/FormMagick/Validator Network.pm,1.9,1.10

[Mark K. <seg...@us...>]

Update of /cvsroot/formmagick/formmagick/lib/CGI/FormMagick/Validator
In directory sc8-pr-cvs1:/tmp/cvs-serv20830/lib/CGI/FormMagick/Validator

Modified Files:
	Network.pm 
Log Message:
Merged changes from branch MITEL-0_87. This includes a small patch to trim blank space from XML lexicon entries and parsing of email addresses per RFC822.

Index: Network.pm
===================================================================
RCS file: /cvsroot/formmagick/formmagick/lib/CGI/FormMagick/Validator/Network.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Network.pm	24 Jun 2002 17:55:14 -0000	1.9
--- Network.pm	18 Dec 2002 20:44:55 -0000	1.10
***************
*** 11,14 ****
--- 11,15 ----
  package    CGI::FormMagick::Validator;
  use strict;
+ use Mail::RFC822::Address;
  
  =pod
***************
*** 87,94 ****
      if (not defined $data ) {
          return "You must enter an email address.";
!     } elsif ($data =~ /.+\@.+\..+/) {
          return "OK";
      } else {
!         return "This field doesn't look like an email address - it should contain an at-sign (\@)";
      }
  }
--- 88,95 ----
      if (not defined $data ) {
          return "You must enter an email address.";
! 	} elsif (Mail::RFC822::Address::valid($data)) {
          return "OK";
      } else {
!         return "This field doesn't look like an RFC822-compliant email address";
      }
  }