X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=CreditCard.pm;h=d0c5ff8591adabd943460f699c0b7b72dfbc0a0b;hb=201e25111885d55371eac2a096016551b1d474fe;hp=b083411c8f56fcb0f53856f1b51bf6266fc175b4;hpb=752f80ce2c000b800544cc22c955d6b3d1e3fd91;p=Business-CreditCard.git

diff --git a/CreditCard.pm b/CreditCard.pm
index b083411..d0c5ff8 100644
--- a/CreditCard.pm
+++ b/CreditCard.pm
@@ -10,12 +10,13 @@ package Business::CreditCard;
 # 1 Feb 2001 - 0.22 released, new maintainer, MakeMaker installation
 # 3 May 2001 - 0.23 released, silly bug in test.pl
 # 11 Jun 2001 - 0.24.  added enRoute, JCB, BankCard, rewrote with regexes
+# 10 Jul 2001 - 0.25, 0.26 *sigh*
 #
 # Copyright 1995,1996,1997 Jon Orwant.  All rights reserved.
 # This program is free software; you can redistribute it and/or
 # modify it under the same terms as Perl itself.
 # 
-# Version 0.24.  Module list status is "Rdpf."
+# Version 0.26.  Module list status is "Rdpf."
 
 require 5;
 
@@ -24,7 +25,7 @@ use vars qw( @ISA $VERSION );
 
 @ISA = qw( Exporter );
 
-$VERSION = "0.23";
+$VERSION = "0.26";
 
 =head1 NAME
 
@@ -81,6 +82,10 @@ orwant@tpj.com
 Current maintainer is Ivan Kohler <ivan-business-creditcard@420.am>.
 Please don't bother Jon with emails about this module.
 
+Lee Lawrence <LeeL@aspin.co.uk> and Neale Banks <neale@lowendale.com.au>
+contributed support for additional card types.  Lee also contributed a working
+test.pl.
+
 =cut
 
 @EXPORT = qw(cardtype validate generate_last_digit);
@@ -94,20 +99,20 @@ sub cardtype {
 
     return "Not a credit card" unless length($number) >= 13 && 0+$number;
 
-    return "VISA card" if $number =~ /^4\d{12}\d{3}?$/;
-    return "MasterCard" if $number =~ /^5[1-5]\d{14}$/;
-    return "Discover card" if $number =~ /^6011\d{12}$/;
-    return "American Express card" if $number =~ /^3[47]\d{13}/;
+    return "VISA card" if $number =~ /^4\d{12}(\d{3})?$/o;
+    return "MasterCard" if $number =~ /^5[1-5]\d{14}$/o;
+    return "Discover card" if $number =~ /^6011\d{12}$/o;
+    return "American Express card" if $number =~ /^3[47]\d{13}/o;
     return "Diner's Club/Carte Blanche"
-      if $number =~ /^3(0[0-5]|[68]\d)\d{11}$/;
-    return "enRoute" if $number =~ /^2(014|149)\d{11}$/;
-    return "JCB" if $number =~ /^3\d{15}$/
-                 || $number =~ /^(2131|1800)\d{11}$/;
-    return "BankCard" if $number =~ /^56(10\d\d|022[1-5])\d{10}$/;
+      if $number =~ /^3(0[0-5]|[68]\d)\d{11}$/o;
+    return "enRoute" if $number =~ /^2(014|149)\d{11}$/o;
+    return "JCB" if $number =~ /^(3\d{4}|2131|1800)\d{11}$/o;
+    return "BankCard" if $number =~ /^56(10\d\d|022[1-5])\d{10}$/o;
     return "Unknown";
 }
 
 # from http://perl.about.com/compute/perl/library/nosearch/P073000.htm
+# verified by http://www.beachnet.com/~hstiles/cardtype.html
 # Card Type                         Prefix                           Length
 # MasterCard                        51-55                            16
 # VISA                              4                                13, 16