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

Revert "use UID for nicks, also mark addressbook as writeable"

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

9
abook_class.php
View file

@ -48,7 +48,7 @@ Config::init();
class abook_carddav extends addressbook_backend { class abook_carddav extends addressbook_backend {
var $btype = 'local'; var $btype = 'local';
var $bname = 'carddav'; var $bname = 'carddav';
var $writeable = true; var $writeable = false;
/* ========================== Private ======================= */ /* ========================== Private ======================= */
@ -100,7 +100,7 @@ class abook_carddav extends addressbook_backend {
$this->syncmgr = new Sync(); $this->syncmgr = new Sync();
// initial sync - we don't have a sync-token yet // initial sync - we don't have a sync-token yet
$this->lastSyncToken = $this->syncmgr->synchronize($this->abook, $this->synchandler, ["FN", "N", "EMAIL", "ORG", "UID"], ""); $this->lastSyncToken = $this->syncmgr->synchronize($this->abook, $this->synchandler, ["FN", "N", "EMAIL", "ORG"], "");
return true; return true;
} }
@ -163,18 +163,19 @@ class abook_carddav extends addressbook_backend {
$ret = array(); $ret = array();
// list all addresses having an email // list all addresses having an email
$all=$this->abook->query(['EMAIL' => "//"],["FN", "N", "EMAIL", "ORG", "UID"]); $all=$this->abook->query(['EMAIL' => "//"],["FN", "N", "EMAIL", "ORG"]);
/* /*
Returns an array of matched VCards: Returns an array of matched VCards:
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' => (string)$vcard->UID, 'nickname' => 'id'.$id++,
'name' => (string)$vcard->FN, 'name' => (string)$vcard->FN,
'firstname' => (string)$names[1], 'firstname' => (string)$names[1],
'lastname' => (string)$names[0], 'lastname' => (string)$names[0],