[jan] Fix autoloading using certain locales like Turkish (Bug #13855).

horde · Apr 16, 2015 · 57e80a9 · 57e80a9
1 parent d2b86be
commit 57e80a9
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 5 deletions.
diff --git a/framework/Autoloader/lib/Horde/Autoloader.php b/framework/Autoloader/lib/Horde/Autoloader.php
@@ -63,7 +63,7 @@ public function loadClass($className)
     {
         if (($path = $this->mapToPath($className)) &&
             $this->_include($path)) {
-            $className = strtolower($className);
+            $className = $this->_lower($className);
             if (isset($this->_callbacks[$className])) {
                 call_user_func($this->_callbacks[$className]);
             }
@@ -94,7 +94,7 @@ public function addClassPathMapper(Horde_Autoloader_ClassPathMapper $mapper)
      */
     public function addCallback($class, $callback)
     {
-        $this->_callbacks[strtolower($class)] = $callback;
+        $this->_callbacks[$this->_lower($class)] = $callback;
     }
 
     /**
@@ -140,4 +140,20 @@ protected function _fileExists($path)
         return file_exists($path);
     }
 
+    /**
+     * Locale independant strtolower() implementation.
+     *
+     * @param string $string The string to convert to lowercase.
+     *
+     * @return string  The lowercased string, based on ASCII encoding.
+     */
+    protected function _lower($string)
+    {
+        $language = setlocale(LC_CTYPE, 0);
+        setlocale(LC_CTYPE, 'C');
+        $string = strtolower($string);
+        setlocale(LC_CTYPE, $language);
+        return $string;
+    }
+
 }
diff --git a/framework/Autoloader/lib/Horde/Autoloader/ClassPathMapper/PrefixString.php b/framework/Autoloader/lib/Horde/Autoloader/ClassPathMapper/PrefixString.php
@@ -54,7 +54,7 @@ public function __construct($prefix, $includePath)
      */
     public function mapToPath($className)
     {
-        if (stripos($className, $this->_prefix) === 0) {
+        if ($this->_ipos($className, $this->_prefix) === 0) {
             $len = strlen($this->_prefix);
             if ($len === strlen($className)) {
                 return $this->_includePath . '/' . $className . '.php';
@@ -68,4 +68,21 @@ public function mapToPath($className)
         return false;
     }
 
+    /**
+     * Locale independant stripos() implementation.
+     *
+     * @param string $haystack  The string to search through.
+     * @param string $needle    The string to search for.
+     *
+     * @return integer  The position of first case-insensitive occurrence.
+     */
+    protected function _ipos($haystack, $needle)
+    {
+        $language = setlocale(LC_CTYPE, 0);
+        setlocale(LC_CTYPE, 'C');
+        $pos = stripos($haystack, $needle);
+        setlocale(LC_CTYPE, $language);
+        return $pos;
+    }
+
 }
diff --git a/framework/Autoloader/package.xml b/framework/Autoloader/package.xml
@@ -28,7 +28,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* 
+* [jan] Fix autoloading using certain locales like Turkish (Bug #13855).
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -285,7 +285,7 @@
    <date>2014-03-03</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* 
+* [jan] Fix autoloading using certain locales like Turkish (Bug #13855).
    </notes>
   </release>
  </changelog>