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

trunk/lib/ImageThumb.inc.php

@@ -248 +248 @@
         while ($dir_handle && ($file = readdir($dir_handle)) !== false) {
             // If the file name does not start with a dot (. or .. or .htaccess).
-            if (!preg_match('/^\./', $file) && in_array(strtolower(substr($file, strrpos($file, '.') + 1)), $this->getParam('valid_file_extensions'))) {
+            if (!preg_match('/^\./', $file) && in_array(mb_strtolower(mb_substr($file, mb_strrpos($file, '.') + 1)), $this->getParam('valid_file_extensions'))) {
                 $files[] = $file;
             }
@@ -349 +349 @@
             if ('/' == $spec['dest_dir']{0}) {
                 // Absolute path.
-                $dest_file = sprintf('%s/%s.%s', $spec['dest_dir'], substr($file_name, 0, strrpos($file_name, '.')), $spec['dest_file_extension']);
+                $dest_file = sprintf('%s/%s.%s', $spec['dest_dir'], mb_substr($file_name, 0, mb_strrpos($file_name, '.')), $spec['dest_file_extension']);
             } else {
                 // Relative path.
-                $dest_file = sprintf('%s/%s/%s.%s', $this->getParam('source_dir'), $spec['dest_dir'], substr($file_name, 0, strrpos($file_name, '.')), $spec['dest_file_extension']);
+                $dest_file = sprintf('%s/%s/%s.%s', $this->getParam('source_dir'), $spec['dest_dir'], mb_substr($file_name, 0, mb_strrpos($file_name, '.')), $spec['dest_file_extension']);
             }
                  
@@ -639 +639 @@
             if ('/' == $spec['dest_dir']{0}) {
                 // Absolute path.
-                $dest_file = realpath(sprintf('%s/%s.%s', $spec['dest_dir'], substr($file_name, 0, strrpos($file_name, '.')), $spec['dest_file_extension']));                
+                $dest_file = realpath(sprintf('%s/%s.%s', $spec['dest_dir'], mb_substr($file_name, 0, mb_strrpos($file_name, '.')), $spec['dest_file_extension']));                
             } else {
                 // Relative path.
-                $dest_file = realpath(sprintf('%s/%s/%s.%s', $this->getParam('source_dir'), $spec['dest_dir'], substr($file_name, 0, strrpos($file_name, '.')), $spec['dest_file_extension']));
+                $dest_file = realpath(sprintf('%s/%s/%s.%s', $this->getParam('source_dir'), $spec['dest_dir'], mb_substr($file_name, 0, mb_strrpos($file_name, '.')), $spec['dest_file_extension']));
             }
             if (file_exists($dest_file)) {
@@ -719 +719 @@
     {
         preg_match('/.*?\.(\w+)$/i', $file_name, $ext);
-        return !empty($ext) && in_array(strtolower($ext[1]), $this->getParam('valid_file_extensions'));        
+        return !empty($ext) && in_array(mb_strtolower($ext[1]), $this->getParam('valid_file_extensions'));        
     }