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

[interchange-cvs at icdevgroup.org]

User:      pajamian
Date:      2006-08-24 12:26:03 GMT
Modified:  lib/Vend Tag: STABLE_5_4-branch 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
No                   revision



No                   revision



2.83.2.2  +6 -4      interchange/lib/Vend/Order.pm


rev 2.83.2.2, prev_rev 2.83.2.1
Index: Order.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Order.pm,v
retrieving revision 2.83.2.1
retrieving revision 2.83.2.2
diff -u -r2.83.2.1 -r2.83.2.2
--- Order.pm	7 Dec 2005 17:15:49 -0000	2.83.2.1
+++ Order.pm	24 Aug 2006 12:26:03 -0000	2.83.2.2
@@ -1,6 +1,6 @@
 # Vend::Order - Interchange order routing routines
 #
-# $Id: Order.pm,v 2.83.2.1 2005/12/07 17:15:49 kwalsh Exp $
+# $Id: Order.pm,v 2.83.2.2 2006/08/24 12:26:03 pajamian 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.83.2.1 $, 10);
+$VERSION = substr(q$Revision: 2.83.2.2 $, 10);
 
 @ISA = qw(Exporter);
 
@@ -1755,8 +1755,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;