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

trunk/lib/Utilities.inc.php

@@ -50 +50 @@
     if (is_array($var)) {
         foreach ($var as $k=>$v) {
-            $k = ucfirst(strtolower(str_replace(array('_', '  '), ' ', $k)));
+            $k = ucfirst(mb_strtolower(str_replace(array('_', '  '), ' ', $k)));
             if (is_array($v)) {
                 $output .= sprintf("\n%s%s: %s\n", $indent, $k, fancyDump($v, $indent . $indent));
@@ -152 +152 @@
     $hash = md5($text);
     $rgb = array(
-        substr($hash, 0, 1),
-        substr($hash, 1, 1),
-        substr($hash, 2, 1),
-        substr($hash, 3, 1),
-        substr($hash, 4, 1),
-        substr($hash, 5, 1),
+        mb_substr($hash, 0, 1),
+        mb_substr($hash, 1, 1),
+        mb_substr($hash, 2, 1),
+        mb_substr($hash, 3, 1),
+        mb_substr($hash, 4, 1),
+        mb_substr($hash, 5, 1),
     );
 
@@ -189 +189 @@
 {
     $ouput = '';
-    $num = strlen($text);
+    $num = mb_strlen($text);
     for ($i=0; $i<$num; $i++) {
         $output .= sprintf('&#%03s', ord($text{$i}));
@@ -225 +225 @@
 function truncate($str, $len, $where='middle')
 {
-    if ($len <= 3 || strlen($str) <= 3) {
+    if ($len <= 3 || mb_strlen($str) <= 3) {
         return '';
     }
@@ -458 +458 @@
 {
     do {
-        if (!ereg($pattern, $string, $temp)) {
+        if (!mb_ereg($pattern, $string, $temp)) {
              continue;
         }
         $string = str_replace($temp[0], '', $string);
         $results[] = $temp;
-    } while (ereg($pattern, $string, $temp));
+    } while (mb_ereg($pattern, $string, $temp));
     return $results;
 }
@@ -554 +554 @@
 {
     // Translate the human string date into SQL-safe date format.
-    if (empty($date) || strpos($date, '0000-00-00') !== false || strtotime($date) === -1 || strtotime($date) === false) {
+    if (empty($date) || mb_strpos($date, '0000-00-00') !== false || strtotime($date) === -1 || strtotime($date) === false) {
         // Return a string of zero time, formatted the same as $format.
         return strtr($format, array(
@@ -673 +673 @@
     }
 
-    return $val . '-' . substr(md5($salt . md5($val . $salt)), 0, 18);
+    return $val . '-' . mb_substr(md5($salt . md5($val . $salt)), 0, 18);
 }
 
@@ -685 +685 @@
 function removeSignature($signed_val)
 {
-    return substr($signed_val, 0, strrpos($signed_val, '-'));
+    return mb_substr($signed_val, 0, mb_strrpos($signed_val, '-'));
 }
 
@@ -822 +822 @@
         if (preg_match('![\d\.]{7,15}/\d{1,2}!', $network)) {
             // IP is in CIDR notation.
-            list($cidr_ip, $cidr_bitmask) = split('/', $network);
+            list($cidr_ip, $cidr_bitmask) = explode('/', $network);
             $cidr_ip_binary = sprintf('%032b', ip2long($cidr_ip));
-            if (substr($ip_binary, 0, $cidr_bitmask) === substr($cidr_ip_binary, 0, $cidr_bitmask)) {
+            if (mb_substr($ip_binary, 0, $cidr_bitmask) === mb_substr($cidr_ip_binary, 0, $cidr_bitmask)) {
                // IP address is within the specified IP range.
                return $network;