Convert normalized latin-1 string back to utf8

release-0.6
thomascube 14 years ago
parent 3d8b54edf7
commit e5e1eb0195

@ -405,10 +405,10 @@ abstract class rcube_addressbook
foreach ($arr as $i => $part) { foreach ($arr as $i => $part) {
if (utf8_encode(utf8_decode($part)) == $part) { // is latin-1 ? if (utf8_encode(utf8_decode($part)) == $part) { // is latin-1 ?
$arr[$i] = strtr(strtolower(strtr(utf8_decode($part), $arr[$i] = utf8_encode(strtr(strtolower(strtr(utf8_decode($part),
'ÇçäâàåéêëèïîìÅÉöôòüûùÿøØáíóúñÑÁÂÀãÃÊËÈÍÎÏÓÔõÕÚÛÙýÝ', 'ÇçäâàåéêëèïîìÅÉöôòüûùÿøØáíóúñÑÁÂÀãÃÊËÈÍÎÏÓÔõÕÚÛÙýÝ',
'ccaaaaeeeeiiiaeooouuuyooaiounnaaaaaeeeiiioooouuuyy')), 'ccaaaaeeeeiiiaeooouuuyooaiounnaaaaaeeeiiioooouuuyy')),
array('ß' => 'ss', 'ae' => 'a', 'oe' => 'o', 'ue' => 'u')); array('ß' => 'ss', 'ae' => 'a', 'oe' => 'o', 'ue' => 'u')));
} }
else else
$arr[$i] = strtolower($part); $arr[$i] = strtolower($part);

Loading…
Cancel
Save