beenull/abook_carddav_squirrelmail
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "use incremental numbers for nicks"

Browse source 
This reverts commit 5874e561d1.
This commit is contained in:
Alexey Shpakovsky 2021-05-29 00:35:08 +02:00
parent 12b495e341
commit 9462175b03
No known key found for this signature in database
GPG key ID: 5797A726A2A4230A
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
abook_class.php
View file

@ -169,13 +169,12 @@ class abook_carddav extends addressbook_backend {
The keys of the array are the URIs of the vcards The keys of the array are the URIs of the vcards
The values are associative arrays with keys etag (type: string) and vcard (type: VCard) The values are associative arrays with keys etag (type: string) and vcard (type: VCard)
*/ */
$id=1;
foreach($all as $uri => $one) { foreach($all as $uri => $one) {
$vcard = $one['vcard']; $vcard = $one['vcard'];
$names = $vcard->N->getParts(); $names = $vcard->N->getParts();
// last,first,additional,prefix,suffix // last,first,additional,prefix,suffix
array_push($ret,array( array_push($ret,array(
'nickname' => 'id'.$id++, 'nickname' => $uri,
'name' => (string)$vcard->FN, 'name' => (string)$vcard->FN,
'firstname' => (string)$names[1], 'firstname' => (string)$names[1],
'lastname' => (string)$names[0], 'lastname' => (string)$names[0],