Changeset 247 for trunk/lib/Auth_SQL.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/Auth_SQL.inc.php (modified) (3 diffs)

trunk/lib/Auth_SQL.inc.php

@@ -621 +621 @@
 
         if ($this->getParam('blocking')) {
-            if (strlen($db->escapeString($reason)) > 255) {
+            if (mb_strlen($db->escapeString($reason)) > 255) {
                 // blocked_reason field is varchar(255).
                 $app->logMsg(sprintf('Blocked reason provided is greater than 255 characters: %s', $reason), LOG_WARNING, __FILE__, __LINE__);
@@ -726 +726 @@
         }
         $str = '';
-        for ($i=0; $i<strlen($pattern); $i++) {
-            $x = substr('bcdfghjklmnprstvwxzBCDFGHJKLMNPRSTVWXZaeiouyAEIOUY0123456789', (mt_rand() % 60), 1);
-            $c = substr('bcdfghjklmnprstvwxz', (mt_rand() % 19), 1);
-            $C = substr('bcdfghjklmnprstvwxzBCDFGHJKLMNPRSTVWXZ', (mt_rand() % 38), 1);
-            $v = substr('aeiouy', (mt_rand() % 6), 1);
-            $V = substr('aeiouyAEIOUY', (mt_rand() % 12), 1);
-            $d = substr('0123456789', (mt_rand() % 10), 1);
+        for ($i=0; $i<mb_strlen($pattern); $i++) {
+            $x = mb_substr('bcdfghjklmnprstvwxzBCDFGHJKLMNPRSTVWXZaeiouyAEIOUY0123456789', (mt_rand() % 60), 1);
+            $c = mb_substr('bcdfghjklmnprstvwxz', (mt_rand() % 19), 1);
+            $C = mb_substr('bcdfghjklmnprstvwxzBCDFGHJKLMNPRSTVWXZ', (mt_rand() % 38), 1);
+            $v = mb_substr('aeiouy', (mt_rand() % 6), 1);
+            $V = mb_substr('aeiouyAEIOUY', (mt_rand() % 12), 1);
+            $d = mb_substr('0123456789', (mt_rand() % 10), 1);
             $str .= $$pattern{$i};
         }
@@ -756 +756 @@
         case AUTH_ENCRYPT_CRYPT :
             // If comparing plaintext password with a hash, provide first two chars of the hash as the salt.
-            return isset($salt) ? crypt($password, substr($salt, 0, 2)) : crypt($password);
+            return isset($salt) ? crypt($password, mb_substr($salt, 0, 2)) : crypt($password);
             break;