From f679c616e8764b45179e268b06f4f95430014287 Mon Sep 17 00:00:00 2001
From: n-peugnet <n.peugnet@free.fr>
Date: Mon, 2 May 2022 21:33:56 +0200
Subject: [PATCH] add caldav to preinstalled_sources key & example config

---
 config.inc.php.dist              | 14 ++++++++++++++
 drivers/caldav/caldav_driver.php |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/config.inc.php.dist b/config.inc.php.dist
index 592ca5a..08d9611 100644
--- a/config.inc.php.dist
+++ b/config.inc.php.dist
@@ -143,6 +143,20 @@ $config['kolab_invitation_calendars'] = false;
 // %i - Calendar UUID
 // $config['calendar_caldav_url'] = 'http://%h/iRony/calendars/%u/%i';
 
+// List of CalDAV sources that should be allready installed.
+// They will be added when the calendar section is accessed for the first time by a user.
+// For 'caldav_user' and 'caldav_url' the following replacement variables are supported:
+// %u - Current webmail user name
+// For 'caldav_pass' %p is replaced by the current user's password.
+// $config['calendar_caldav_preinstalled_sources'] = array(
+//     'name' => array(
+//         'caldav_user' => '%u',
+//         'caldav_pass' => '%p',
+//         'caldav_url'  => 'https://example.net/dav',
+//         'showAlarms'  => 1
+//     )
+// );
+
 // Driver to provide a resource directory ('ldap' is the only implementation yet).
 // Leave empty or commented to disable resources support.
 // $config['calendar_resources_driver'] = 'ldap';
diff --git a/drivers/caldav/caldav_driver.php b/drivers/caldav/caldav_driver.php
index 4dc5a2e..8f56a8c 100644
--- a/drivers/caldav/caldav_driver.php
+++ b/drivers/caldav/caldav_driver.php
@@ -110,7 +110,7 @@ class caldav_driver extends calendar_driver
      */
     protected function _setup_preinstalled_sources()
     {
-        $preinstalled_sources = $this->rc->config->get('calendar_preinstalled_sources', FALSE);
+        $preinstalled_sources = $this->rc->config->get('calendar_caldav_preinstalled_sources', FALSE);
         if ($preinstalled_sources && is_array($preinstalled_sources)) {
             $username = $this->rc->get_user_name();
             $password = $this->rc->get_user_password();