[interchange-cvs] interchange - pajamian modified lib/Vend/Order.pm

[interchange-cvs at icdevgroup.org]

User:      pajamian
Date:      2006-08-24 12:15:36 GMT
Modified:  lib/Vend Order.pm
Log:
Fix masking of unencrypted credit card numbers to work with a custom
MV_CREDIT_CARD_INFO_TEMPLATE that does not match the regexp.

Fix the above mentioned regexp so it removes the CVV2 value from the
unencrypted data as well.

Revision  Changes    Path
2.87      +6 -4      interchange/lib/Vend/Order.pm


rev 2.87, prev_rev 2.86
Index: Order.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Order.pm,v
retrieving revision 2.86
retrieving revision 2.87
diff -u -r2.86 -r2.87
--- Order.pm	31 Jul 2006 12:40:49 -0000	2.86
+++ Order.pm	24 Aug 2006 12:15:28 -0000	2.87
@@ -1,6 +1,6 @@
 # Vend::Order - Interchange order routing routines
 #
-# $Id: Order.pm,v 2.86 2006/07/31 12:40:49 racke Exp $
+# $Id: Order.pm,v 2.87 2006/08/24 12:15:28 pajamian 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.86 $, 10);
+$VERSION = substr(q$Revision: 2.87 $, 10);
 
 @ISA = qw(Exporter);
 
@@ -1750,8 +1750,10 @@
 		my $use_mime;
 		undef $::Instance->{MIME};
 		if(not ($route->{credit_card} || $route->{encrypt}) ) {
-			$::Values->{mv_credit_card_info}
-				=~ s/^(\s*\w+\s+)(\d\d)[\d ]+(\d\d\d\d)/$1$2 NEED ENCRYPTION $3/;
+		    unless ($::Values->{mv_credit_card_info}
+			    =~ s/^(\s*\w+\s+)(\d\d)[\d ]+(\d\d\d\d.*?)(?:\s+\d{3,4})?$/$1$2 NEED ENCRYPTION $3/) {
+			$::Values->{mv_credit_card_info} = 'NEED ENCRYPTION';
+		    }
 		}
 		eval {
 			$page = interpolate_html($page) if $page;