fix for 13 digit visa cards, /o regex optimisation & fixed JCB regex

[Business-CreditCard.git] / CreditCard.pm

diff --git a/CreditCard.pm b/CreditCard.pm
index b083411..1fe1108 100644 (file)
--- a/CreditCard.pm
+++ b/CreditCard.pm
@@ -81,6 +81,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,16 +98,15 @@ 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";
 }