Changeset 1670

Timestamp:

01/04/2008 01:07:23 PM (12 months ago)

Author:

Shadowhand

Message:

Updated valid::creditcard:

• Renamed valid::creditcard to valid::credit_card, as per naming convetions
  
• Moved card definitions to config/credit_cards.php, to allow user extensions
  
• Remove non-digit characters, rather than expecting all digits
  

Location:

trunk/system

Files:

• config/credit_cards.php (added)
• helpers/valid.php (modified) (2 diffs)
• libraries/Calendar.php (modified) (1 diff)

trunk/system/helpers/valid.php

@@ -123 +123 @@
 
         /**
-         * Validates a credit card number using the Luhn (mod10) formula. Make sure
-         * to remove all non-digit characters from the number before using validating
-         * the card number or it will fail.
+         * Validates a credit card number using the Luhn (mod10) formula.
          * @see http://en.wikipedia.org/wiki/Luhn_algorithm
          *
-         * @param   integer  credit card number (13-16 digits)
+         * @param   integer  credit card number
          * @param   string   card type
          * @return  boolean
          */
-        public static function creditcard($number, $type = 'default')
-        {
-                // Make sure the number and expiration are not empty and consist of only numbers
-                if (empty($number) OR ! ctype_digit((string) $number))
-                        return FALSE;
-
-                // Card types based on http://en.wikipedia.org/wiki/Credit_card_number
-                $cards = array
-                (
-                        'default' => array
-                        (
-                                'length' => '13,14,15,16,17,18,19',
-                                'prefix' => '',
-                                'luhn'   => TRUE
-                        ),
-                        'american express' => array
-                        (
-                                'length' => '15',
-                                'prefix' => '3[47]',
-                                'luhn'   => TRUE
-                        ),
-                        'maestro' => array
-                        (
-                                'length' => '16,18',
-                                'prefix' => '50(?:20|38)|6(?:304|759)',
-                                'luhn'   => TRUE
-                        ),
-                        'mastercard' => array
-                        (
-                                'length' => '16',
-                                'prefix' => '5[1-5]',
-                                'luhn'   => TRUE
-                        ),
-                        'visa' => array
-                        (
-                                'length' => '13,16',
-                                'prefix' => '4',
-                                'luhn'   => TRUE
-                        ),
-                        'visa electron' => array
-                        (
-                                'length' => '16',
-                                'prefix' => '4(?:17500|91[37]|508|844)',
-                                'luhn'   => TRUE
-                        ),
-                );
+        public static function credit_card($number, $type = 'default')
+        {
+                // Remove all non-digit characters from the number
+                if (($number = preg_replace('/[^0-9]/', '', $number)) === '')
+                        return FALSE;
+
+                $cards = Config::item('credit_cards');
 
                 // Check card type
@@ -188 +147 @@
                 $length = strlen($number);
 
+                // Validate the card length by the card type
                 if ( ! preg_match('/\b'.$length.'\b/', $cards[$type]['length']))
                         return FALSE;

trunk/system/libraries/Calendar.php

@@ -17 +17 @@
 
         // Start the calendar on Sunday by default
-        public $week_start = 3;
+        public $week_start = 0;
 
         // Event data