[interchange-cvs] interchange - racke modified 2 files
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Mon Jul 31 08:40:50 EDT 2006
User: racke
Date: 2006-07-31 12:40:49 GMT
Modified: code/OrderCheck email_only.oc
Modified: lib/Vend Order.pm
Log:
email addresses with more than one at sign are certainly invalid
Revision Changes Path
1.3 +3 -3 interchange/code/OrderCheck/email_only.oc
rev 1.3, prev_rev 1.2
Index: email_only.oc
===================================================================
RCS file: /var/cvs/interchange/code/OrderCheck/email_only.oc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- email_only.oc 29 Nov 2005 20:30:13 -0000 1.2
+++ email_only.oc 31 Jul 2006 12:40:49 -0000 1.3
@@ -1,13 +1,13 @@
-# Copyright 2005 Interchange Development Group (http://www.icdevgroup.org/)
+# Copyright 2005-2006 Interchange Development Group (http://www.icdevgroup.org/)
# Licensed under the GNU GPL v2. See file LICENSE for details.
-# $Id: email_only.oc,v 1.2 2005/11/29 20:30:13 racke Exp $
+# $Id: email_only.oc,v 1.3 2006/07/31 12:40:49 racke Exp $
CodeDef email_only OrderCheck 1
CodeDef email_only Description Email address
CodeDef email_only Routine <<EOR
sub {
my($ref, $var, $val) = @_;
- if($val and $val =~ /^[\040-\176]+\@[-A-Za-z0-9.]+\.[A-Za-z]+$/) {
+ if($val and $val =~ /^[\040-\077\101-\176]+\@[-A-Za-z0-9.]+\.[A-Za-z]+$/) {
return (1, $var, '');
}
else {
2.86 +3 -3 interchange/lib/Vend/Order.pm
rev 2.86, prev_rev 2.85
Index: Order.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Order.pm,v
retrieving revision 2.85
retrieving revision 2.86
diff -u -r2.85 -r2.86
--- Order.pm 3 Apr 2006 21:23:40 -0000 2.85
+++ Order.pm 31 Jul 2006 12:40:49 -0000 2.86
@@ -1,6 +1,6 @@
# Vend::Order - Interchange order routing routines
#
-# $Id: Order.pm,v 2.85 2006/04/03 21:23:40 racke Exp $
+# $Id: Order.pm,v 2.86 2006/07/31 12:40:49 racke Exp $
#
# Copyright (C) 2002-2006 Interchange Development Group
# Copyright (C) 1996-2002 Red Hat, Inc.
@@ -29,7 +29,7 @@
package Vend::Order;
require Exporter;
-$VERSION = substr(q$Revision: 2.85 $, 10);
+$VERSION = substr(q$Revision: 2.86 $, 10);
@ISA = qw(Exporter);
@@ -1282,7 +1282,7 @@
sub _email {
my($ref, $var, $val) = @_;
- if($val and $val =~ /[\040-\176]+\@[-A-Za-z0-9.]+\.[A-Za-z]+/) {
+ if($val and $val =~ /[\040-\077\101-\176]+\@[-A-Za-z0-9.]+\.[A-Za-z]+/) {
return (1, $var, '');
}
else {
More information about the interchange-cvs
mailing list