Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make contacts sorting unicode-safe and locale-dependent

Browse source
This commit is contained in:
Aleksander Machniak (Kolab Systems) 2011-07-28 12:39:05 +02:00
parent 941222debb
commit 75392cc492
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
View file

@ -281,7 +281,9 @@ class rcube_kolab_contacts extends rcube_addressbook
// sort data arrays according to desired list sorting // sort data arrays according to desired list sorting
if ($count = count($ids)) { if ($count = count($ids)) {
$aa = rcube_timer();
uasort($this->contacts, array($this, '_sort_contacts_comp')); uasort($this->contacts, array($this, '_sort_contacts_comp'));
rcube_print_time($aa);
// get sorted IDs // get sorted IDs
if ($count != count($this->contacts)) if ($count != count($this->contacts))
$ids = array_intersect(array_keys($this->contacts), $ids); $ids = array_intersect(array_keys($this->contacts), $ids);
@ -1000,7 +1002,14 @@ class rcube_kolab_contacts extends rcube_addressbook
} }
} }
return strcasecmp($a_name, $b_name); // return strcasecmp($a_name, $b_name);
// make sorting unicode-safe and locale-dependent
if ($a_name == $b_name)
return 0;
$arr = array($a_name, $b_name);
sort($arr, SORT_LOCALE_STRING);
return $a_name == $arr[0] ? -1 : 1;
} }
/** /**