From 63d1116b5e1958e8f6a195ac9e40352fb52f277a Mon Sep 17 00:00:00 2001
From: Alexey Shpakovsky <alexey@shpakovsky.ru>
Date: Sat, 29 May 2021 00:12:13 +0200
Subject: [PATCH] use UID for nicks, also mark addressbook as writeable

---
 abook_class.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/abook_class.php b/abook_class.php
index 8ecfcd8..9d76bca 100755
--- a/abook_class.php
+++ b/abook_class.php
@@ -48,7 +48,7 @@ Config::init();
 class abook_carddav extends addressbook_backend {
     var $btype = 'local';
     var $bname = 'carddav';
-    var $writeable = false;
+    var $writeable = true;
       
     /* ========================== Private ======================= */
       
@@ -100,7 +100,7 @@ class abook_carddav extends addressbook_backend {
 	$this->syncmgr = new Sync();
 
 	// initial sync - we don't have a sync-token yet
-        $this->lastSyncToken = $this->syncmgr->synchronize($this->abook, $this->synchandler, ["FN", "N", "EMAIL", "ORG"], "");
+        $this->lastSyncToken = $this->syncmgr->synchronize($this->abook, $this->synchandler, ["FN", "N", "EMAIL", "ORG", "UID"], "");
 
       return true;
     }
@@ -163,19 +163,18 @@ class abook_carddav extends addressbook_backend {
         $ret = array();
 
 	// list all addresses having an email
-	$all=$this->abook->query(['EMAIL' => "//"],["FN", "N", "EMAIL", "ORG"]);
+	$all=$this->abook->query(['EMAIL' => "//"],["FN", "N", "EMAIL", "ORG", "UID"]);
 	/*
 	Returns an array of matched 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)
 	*/
-	$id=1;
 	foreach($all as $uri => $one) {
 		$vcard = $one['vcard'];
 		$names = $vcard->N->getParts();
 		// last,first,additional,prefix,suffix
 		array_push($ret,array(
-			      'nickname' => 'id'.$id++,
+			      'nickname' => (string)$vcard->UID,
                                   'name' => (string)$vcard->FN,
                              'firstname' => (string)$names[1],
                               'lastname' => (string)$names[0],