[interchange-cvs] interchange - racke modified 3 files

[interchange-cvs at icdevgroup.org]

User:      racke
Date:      2005-10-13 20:15:05 GMT
Modified:  .        MANIFEST
Modified:  lib/Vend Order.pm
Added:     code/OrderCheck email_only.oc
Log:
split out email_only order check

Revision  Changes    Path
2.177     +1 -0      interchange/MANIFEST


rev 2.177, prev_rev 2.176
Index: MANIFEST
===================================================================
RCS file: /var/cvs/interchange/MANIFEST,v
retrieving revision 2.176
retrieving revision 2.177
diff -u -r2.176 -r2.177
--- MANIFEST	12 Oct 2005 14:14:28 -0000	2.176
+++ MANIFEST	13 Oct 2005 20:15:04 -0000	2.177
@@ -83,6 +83,7 @@
 code/Filter/yesno.filter
 code/Filter/zerofix.filter
 code/JavaScriptCheck/required.jsc
+code/OrderCheck/email_only.oc
 code/OrderCheck/relative_filename.oc
 code/SystemTag/accessories.coretag
 code/SystemTag/accounting.coretag



2.76      +2 -14     interchange/lib/Vend/Order.pm


rev 2.76, prev_rev 2.75
Index: Order.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Order.pm,v
retrieving revision 2.75
retrieving revision 2.76
diff -u -r2.75 -r2.76
--- Order.pm	26 Sep 2005 19:25:02 -0000	2.75
+++ Order.pm	13 Oct 2005 20:15:05 -0000	2.76
@@ -1,6 +1,6 @@
 # Vend::Order - Interchange order routing routines
 #
-# $Id: Order.pm,v 2.75 2005/09/26 19:25:02 jon Exp $
+# $Id: Order.pm,v 2.76 2005/10/13 20:15:05 racke Exp $
 #
 # Copyright (C) 2002-2003 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -29,7 +29,7 @@
 package Vend::Order;
 require Exporter;
 
-$VERSION = substr(q$Revision: 2.75 $, 10);
+$VERSION = substr(q$Revision: 2.76 $, 10);
 
 @ISA = qw(Exporter);
 
@@ -1472,18 +1472,6 @@
 sub _email {
 	my($ref, $var, $val) = @_;
 	if($val and $val =~ /[\040-\176]+\@[-A-Za-z0-9.]+\.[A-Za-z]+/) {
-		return (1, $var, '');
-	}
-	else {
-		return (undef, $var,
-			errmsg( "'%s' not an email address", $val )
-		);
-	}
-}
-
-sub _email_only {
-	my($ref, $var, $val) = @_;
-	if($val and $val =~ /^[\040-\176]+\@[-A-Za-z0-9.]+\.[A-Za-z]+$/) {
 		return (1, $var, '');
 	}
 	else {



1.1                  interchange/code/OrderCheck/email_only.oc


rev 1.1, prev_rev 1.0
Index: email_only.oc
===================================================================
# Copyright 2005 Interchange Development Group (http://www.icdevgroup.org/)
# Licensed under the GNU GPL v2. See file LICENSE for details.
# $Id: email_only.oc,v 1.1 2005/10/13 20:15:05 racke Exp $

CodeDef email_only OrderCheck 1
CodeDef email_only Routine <<EOR
sub {
	my($ref, $var, $val) = @_;
	if($val and $val =~ /^[\040-\176]+\@[-A-Za-z0-9.]+\.[A-Za-z]+$/) {
		return (1, $var, '');
	}
	else {
		return (undef, $var,
			errmsg( "'%s' not an email address", $val )
		);
	}
}
EOR