Changeset 247 for trunk/lib/Validator.inc.php

Timestamp:

Apr 5, 2007 1:48:45 AM (17 years ago)

Author:

quinn

Message:

Converted all string functions to multi-byte (mb_*) functions

File:

• trunk/lib/Validator.inc.php (modified) (4 diffs)

trunk/lib/Validator.inc.php

@@ -134 +134 @@
     function stringLength($val, $min, $max)
     {
-        return strlen(trim((string)$val)) >= $min && strlen($val) <= $max;
+        return mb_strlen(trim((string)$val)) >= $min && mb_strlen($val) <= $max;
     }
 
@@ -180 +180 @@
         // The part after the @. 
         // If domain is an IP [XXX.XXX.XXX.XXX] strip off the brackets.
-        $domain = $e_parts[3]{0} == '[' ? substr($e_parts[3], 1, -1) : $e_parts[3];
+        $domain = $e_parts[3]{0} == '[' ? mb_substr($e_parts[3], 1, -1) : $e_parts[3];
 
         // Test length.
-        if (strlen($local) > 64 || strlen($domain) > 191) {
+        if (mb_strlen($local) > 64 || mb_strlen($domain) > 191) {
             return VALIDATE_EMAIL_LENGTH_FAIL;
         }
@@ -264 +264 @@
          $luhn_total = 0;
 
-         $num = strlen($cc_num);
+         $num = mb_strlen($cc_num);
          for ($i=0; $i<$num; $i++) {
              // Get each digit.
-             $digit = substr($cc_num, $i, 1);
+             $digit = mb_substr($cc_num, $i, 1);
 
              //  If it's an odd digit, double it.
@@ -275 +275 @@
 
              //  If the result is two digits, add them.
-             if (strlen($digit) == 2) {
-                 $digit = substr($digit, 0, 1) + substr($digit, 1, 1);
+             if (mb_strlen($digit) == 2) {
+                 $digit = mb_substr($digit, 0, 1) + mb_substr($digit, 1, 1);
              }