From d130f470ff0d0d6c48ce1dd3afc4c47b16a9ad21 Mon Sep 17 00:00:00 2001
From: KiekerJan <kiekerjan@users.noreply.github.com>
Date: Wed, 20 Sep 2023 09:17:34 +0200
Subject: [PATCH] update carddav plugin to version 5.1.0

---
 setup/webmail.sh | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/setup/webmail.sh b/setup/webmail.sh
index 0be0e1f8..02199adc 100755
--- a/setup/webmail.sh
+++ b/setup/webmail.sh
@@ -40,8 +40,8 @@ VERSION=1.6.1
 HASH=0e1c771ab83ea03bde1fd0be6ab5d09e60b4f293
 PERSISTENT_LOGIN_VERSION=bde7b6840c7d91de627ea14e81cf4133cbb3c07a # version 5.2
 HTML5_NOTIFIER_VERSION=68d9ca194212e15b3c7225eb6085dbcf02fd13d7 # version 0.6.4+
-CARDDAV_VERSION=4.4.3
-CARDDAV_HASH=74f8ba7aee33e78beb9de07f7f44b81f6071b644
+CARDDAV_VERSION=5.1.0
+CARDDAV_HASH=9f977d319db13ea1b4ca6c9bb98aaef0feb9eebe
 
 UPDATE_KEY=$VERSION:$PERSISTENT_LOGIN_VERSION:$HTML5_NOTIFIER_VERSION:$CARDDAV_VERSION
 
@@ -155,16 +155,20 @@ cat > ${RCM_PLUGIN_DIR}/carddav/config.inc.php <<EOF;
 \$prefs['_GLOBAL']['hide_preferences'] = true;
 \$prefs['_GLOBAL']['suppress_version_warning'] = true;
 \$prefs['ownCloud'] = array(
-	 'name'         =>  'ownCloud',
-	 'username'     =>  '%u', // login username
-	 'password'     =>  '%p', // login password
-	 'url'          =>  'https://${PRIMARY_HOSTNAME}/cloud/remote.php/dav/addressbooks/users/%u/contacts/',
-	 'active'       =>  true,
-	 'readonly'     =>  false,
-	 'refresh_time' => '02:00:00',
-	 'fixed'        =>  array('username','password'),
-	 'preemptive_auth' => '1',
-	 'hide'        =>  false,
+	'name'         =>  'ownCloud',
+	'username'     =>  '%u', // login username
+	'password'     =>  '%p', // login password
+	'extra_addressbooks' =>  [
+		[
+			'url'          =>  'https://${PRIMARY_HOSTNAME}/cloud/remote.php/dav/addressbooks/users/%u/contacts/',
+			'active'       =>  true,
+			'readonly'     =>  false,
+			'refresh_time' => '02:00:00',
+			'fixed'        =>  array('username','password'),
+			'preemptive_auth' => '1',
+			'hide'        =>  false,
+		],
+	],
 );
 ?>
 EOF