From 7ad35134c001397f34986b62706797195efa393e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=B8=D0=BB=D1=8F=D0=BD=20=D0=9F=D0=B0=D0=BB=D0=B0?=
 =?UTF-8?q?=D1=83=D0=B7=D0=BE=D0=B2?= <git-dpa@aegee.org>
Date: Sun, 21 Mar 2021 18:59:40 +0200
Subject: [PATCH 1/3] Reorganize list_calendars() and list_addressbooks()

to enable editing the properties over AJAX.

- merge imap/http_carddav.js into imap/http_caldav.js and make the latter
  more generic, in order to serve both CalDAV and CardDAV administration.
- all calendars are numbered in the generated HTML, starting from zero and
  each JavaScript function receives as parameter the calendar/addressbook
  number, on which to enact an action.
---
 Makefile.am          |   5 +-
 imap/http_caldav.c   |  46 +++++++-------
 imap/http_caldav.js  | 142 ++++++++++++++++++++-----------------------
 imap/http_carddav.c  |  37 +++++------
 imap/http_carddav.js | Bin 5740 -> 0 bytes
 5 files changed, 108 insertions(+), 122 deletions(-)
 delete mode 100644 imap/http_carddav.js

diff --git a/Makefile.am b/Makefile.am
index 1a5e29e1db..9068481b3d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -118,7 +118,6 @@ MAINTAINERCLEANFILES = \
     doc/legacy/murder.png \
     doc/legacy/netnews.png \
     imap/http_caldav_js.h \
-    imap/http_carddav_js.h \
     man/imapd.conf.5 \
     man/sieveshell.1 \
     sieve/addr.h \
@@ -249,7 +248,6 @@ AM_LDFLAGS += $(HTTP_LIBS)
 
 BUILT_SOURCES += \
     imap/http_caldav_js.h \
-    imap/http_carddav_js.h \
     imap/tz_err.c \
     imap/tz_err.h
 
@@ -343,7 +341,6 @@ EXTRA_DIST = \
     doc \
     docsrc \
     imap/http_caldav.js \
-    imap/http_carddav.js \
     imap/http_err.et \
     imap/imap_err.et \
     imap/jmap_err.et \
@@ -1279,7 +1276,7 @@ imap_httpd_SOURCES = \
     imap/smtpclient.c \
     imap/spool.c \
     imap/sync_support.c \
-        imap/sync_support.h \
+    imap/sync_support.h \
     imap/xcal.c \
     imap/xcal.h \
     imap/xml_support.c \
diff --git a/imap/http_caldav.c b/imap/http_caldav.c
index 5e2c04df41..d523b8af06 100644
--- a/imap/http_caldav.c
+++ b/imap/http_caldav.c
@@ -2247,9 +2247,8 @@ static int list_calendars(struct transaction_t *txn)
         buf_printf_markup(body, level, "<td></td>");
         buf_printf_markup(body, level,
                           "<td><br><input type=button value='Create'"
-                          " onclick=\"createCalendar('%s')\">"
-                          " <input type=reset></td>",
-                          base_path);
+                          " onclick='createCollection()'>"
+                          " <input type=reset></td>");
         buf_printf_markup(body, --level, "</tr>");
 
         buf_printf_markup(body, --level, "</table>");
@@ -2293,8 +2292,8 @@ static int list_calendars(struct transaction_t *txn)
         }
 
         /* Calendar name */
-        buf_printf_markup(body, level++, "<tr>");
-        buf_printf_markup(body, level, "<td id='%i'>%s%s%s", i,
+        buf_printf_markup(body, level++, "<tr id='%i' data-url='%s'>", i, cal->shortname);
+        buf_printf_markup(body, level, "<td>%s%s%s",
                           (cal->flags & CAL_IS_DEFAULT) ? "<b>" : "",
                           displayname,
                           (cal->flags & CAL_IS_DEFAULT) ? "</b>" : "");
@@ -2303,9 +2302,8 @@ static int list_calendars(struct transaction_t *txn)
         /* Supported components list */
         buf_printf_markup(body, level++, "<td>");
         buf_printf_markup(body, level++,
-                          "<select multiple name=comp size=3"
-                          " onChange=\"compsetCalendar('%s%s', '%i', this.options)\">",
-                          base_path, cal->shortname, i);
+                          "<select multiple size=3"
+                          " onChange='compsetCalendar(%i, this.options)'>", i);
         for (comp = cal_comps; comp->name; comp++) {
             buf_printf_markup(body, level, "<option%s>%s</option>",
                               (cal->types & comp->type) ? " selected" : "",
@@ -2324,29 +2322,31 @@ static int list_calendars(struct transaction_t *txn)
                           base_path, cal->shortname);
 
         /* Delete button */
-        buf_printf_markup(body, level,
-                          "<td><input type=button%s value='Delete'"
-                          " onclick=\"deleteCalendar('%s%s', '%i')\"></td>",
-                          !(cal->flags & CAL_CAN_DELETE) ? " disabled" : "",
-                          base_path, cal->shortname, i);
+        if (cal->flags & CAL_IS_DEFAULT)
+            buf_printf_markup(body, level,
+                              "<td>Default Calendar</td>");
+        else if (cal->flags & CAL_CAN_DELETE)
+            buf_printf_markup(body, level,
+                              "<td><input type=button value='Delete'"
+                              " onclick='deleteCollection(%i)'></td>", i);
+        else
+            buf_printf_markup(body, level, "<td></td>");
 
         /* Public (shared) checkbox */
         buf_printf_markup(body, level,
-                          "<td><input type=checkbox%s%s name=share"
-                          " onclick=\"shareCalendar('%s%s', this.checked)\">"
+                          "<td><input type=checkbox%s%s"
+                          " onclick='share(%i, this.checked)'>"
                           "Public</td>",
-                          !(cal->flags & CAL_CAN_ADMIN) ? " disabled" : "",
-                          (cal->flags & CAL_IS_PUBLIC) ? " checked" : "",
-                          base_path, cal->shortname);
+                          (cal->flags & CAL_CAN_ADMIN) ? "" : " disabled",
+                          (cal->flags & CAL_IS_PUBLIC) ? " checked" : "", i);
 
         /* Transparent checkbox */
         buf_printf_markup(body, level,
-                          "<td><input type=checkbox%s%s name=transp"
-                          " onclick=\"transpCalendar('%s%s', this.checked)\">"
+                          "<td><input type=checkbox%s%s"
+                          " onclick='transpCalendar(%i, this.checked)'>"
                           "Transparent</td>",
-                          !(cal->flags & CAL_CAN_ADMIN) ? " disabled" : "",
-                          (cal->flags & CAL_IS_TRANSP) ? " checked" : "",
-                          base_path, cal->shortname);
+                          (cal->flags & CAL_CAN_ADMIN) ? "" : " disabled",
+                          (cal->flags & CAL_IS_TRANSP) ? " checked" : "", i);
 
         buf_printf_markup(body, --level, "</tr>");
     }
diff --git a/imap/http_caldav.js b/imap/http_caldav.js
index 6ed2a74a2d..f58c6154d8 100644
--- a/imap/http_caldav.js
+++ b/imap/http_caldav.js
@@ -1,4 +1,4 @@
-/* http_caldav.js -- Admin functions for calendar list
+/* http_caldav.js -- Admin functions for addressbook and calendar list
  *
  * Copyright (c) 1994-2014 Carnegie Mellon University.  All rights reserved.
  *
@@ -44,8 +44,33 @@
 
 // XML constants for requests
 var XML_DAV_NS = 'DAV:';
+const calendar = new URL(window.location.href).pathname[5] == 'c';
 var XML_CALDAV_NS = 'urn:ietf:params:xml:ns:caldav';
-var X_CLIENT = 'Cyrus/%s';  // Version filled in by printf() in http_caldav.c
+const X_CLIENT = 'Cyrus/%s';  // Version filled in by printf() in http_caldav.c/http_carddav.c
+const XML_CALCARD_NS = 'urn:ietf:params:xml:ns:ca' + (calendar ? 'ldav' : 'rddav');
+const DESCRIPTION = (calendar ? 'calendar' : 'addressbook') + '-description';
+
+function n(i) {
+    const h = window.location.href;
+    return (h[h.length - 1] == '/' ? h : h + '/') + (i !== undefined ? document.getElementById(i).dataset.url : '');
+}
+
+function propupdate(set, i) {
+    const doc = document.implementation.createDocument(XML_DAV_NS, "propertyupdate", null);
+    const props = doc.createElementNS(XML_DAV_NS, "prop");
+    const op = doc.createElementNS(XML_DAV_NS, set ? "set" : "remove");
+    doc.documentElement.appendChild(op);
+    op.appendChild(props);
+
+    // Send PROPPATCH request (minimal response)
+    const req = new XMLHttpRequest();
+    req.open('PROPPATCH', n(i));
+    req.setRequestHeader('X-Client', X_CLIENT);
+    req.setRequestHeader('Prefer', 'return=minimal');
+    req.submit = () => req.send(doc);
+
+    return [doc, props, req];
+}
 
 
 // Calculate hash of a string
@@ -61,18 +86,17 @@ function strHash(str) {
 }
 
 
-// Create a new calendar collection using data from 'create' form
-function createCalendar(baseurl) {
+// Create a new collection using data from 'create' form
+function createCollection() {
     var create = document.forms.create.elements;
 
-    if (create.name.value.length === 0) {
-        window.alert('New calendar MUST have a name');
-    }
+    if (!create.name.value)
+        return window.alert('New ' + (calendar ? 'calendar' : 'addressbook') + ' MUST have a name');
 
     // Generate calendar collection name
     var now = new Date();
     var rand = Math.random() * 1000000;
-    var url = baseurl + strHash(baseurl).toString(16) +
+    const url = n() + strHash(n()).toString(16) +
         '-' + strHash(create.name.value).toString(16) +
         '-' + now.getTime() + '-' + rand.toFixed(0);
 
@@ -88,27 +112,27 @@ function createCalendar(baseurl) {
 
     var prop = doc.createElementNS(XML_DAV_NS, "D:resourcetype");
     prop.appendChild(doc.createElementNS(XML_DAV_NS, "D:collection"));
-    prop.appendChild(doc.createElementNS(XML_CALDAV_NS, "C:calendar"));
+    prop.appendChild(doc.createElementNS(XML_CALCARD_NS, calendar ? "C:calendar" : "C:addressbook"));
     props.appendChild(prop);
 
     prop = doc.createElementNS(XML_DAV_NS, "D:displayname");
     prop.appendChild(doc.createTextNode(create.name.value));
     props.appendChild(prop);
 
-    if (create.desc.value.length !== 0) {
-        prop = doc.createElementNS(XML_CALDAV_NS, "C:calendar-description");
+    if (create.desc.value) {
+        prop = doc.createElementNS(XML_CALCARD_NS, DESCRIPTION);
         prop.appendChild(doc.createTextNode(create.desc.value));
         props.appendChild(prop);
     }
 
-    if (create.tzid && create.tzid.value.length !== 0) {
+    if (create.tzid?.value) {
         prop = doc.createElementNS(XML_CALDAV_NS, "C:calendar-timezone-id");
         prop.appendChild(doc.createTextNode(create.tzid.value));
         props.appendChild(prop);
     }
 
     var compset = null;
-    for (var i = 0; i < create.comp.length; i++) {
+    for (let i = 0; calendar && i < create.comp.length; i++) {
         if (create.comp[i].checked) {
             var comp = doc.createElementNS(XML_CALDAV_NS, "C:comp");
             comp.setAttribute("name", create.comp[i].value);
@@ -125,18 +149,16 @@ function createCalendar(baseurl) {
 
     // Send MKCOL request (minimal response)
     var req = new XMLHttpRequest();
-    req.open('MKCOL', url, false);
+    req.open('MKCOL', url);
     req.setRequestHeader('X-Client', X_CLIENT);
     req.setRequestHeader('Prefer', 'return=minimal');
+    req.addEventListener('load', () => document.location.reload());
     req.send(doc);
-
-    // Refresh calendar list
-    document.location.replace(baseurl);
 }
 
 
-// [Un]share a calendar collection ([un]readable by 'anyone')
-function shareCalendar(url, share) {
+// [Un]share a calendar/addressbook collection ([un]readable by 'anyone')
+function share(i, share) {
     // Build DAV sharing document
     var doc = document.implementation.createDocument(XML_DAV_NS,
                                                      "D:share-resource", null);
@@ -156,7 +178,7 @@ function shareCalendar(url, share) {
 
     // Send POST request
     var req = new XMLHttpRequest();
-    req.open('POST', url);
+    req.open('POST', n(i));
     req.setRequestHeader('X-Client', X_CLIENT);
     req.setRequestHeader('Content-Type', 'application/davsharing+xml');
     req.send(doc);
@@ -164,43 +186,25 @@ function shareCalendar(url, share) {
 
 
 // Make a calendar collection transparent/opaque
-function transpCalendar(url, transp) {
-    // Build PROPPATCH document
-    var doc = document.implementation.createDocument(XML_DAV_NS,
-                                                     "D:propertyupdate", null);
-    var propupdate = doc.documentElement;
-    var props = doc.createElementNS(XML_DAV_NS, "D:prop");
-    var caltransp = doc.createElementNS(XML_CALDAV_NS,
-                                        "C:schedule-calendar-transp");
-    props.appendChild(caltransp);
-
-    var op;
-    if (transp) {
-        op = doc.createElementNS(XML_DAV_NS, "D:set");
-        caltransp.appendChild(doc.createElementNS(XML_CALDAV_NS,
-                                                  "C:transparent"));
-    }
-    else {
-        op = doc.createElementNS(XML_DAV_NS, "D:remove");
-    }
+function transpCalendar(i, transp) {
+    const pu = propupdate(transp, i);
+    const caltransp = pu[0].createElementNS(XML_CALDAV_NS,
+                                            "C:schedule-calendar-transp");
+    pu[1].appendChild(caltransp);
 
-    op.appendChild(props);
-    propupdate.appendChild(op);
+    if (transp)
+        caltransp.appendChild(pu[0].createElementNS(XML_CALDAV_NS,
+                                                    "C:transparent"));
 
-    // Send PROPPATCH request (minimal response)
-    var req = new XMLHttpRequest();
-    req.open('PROPPATCH', url);
-    req.setRequestHeader('X-Client', X_CLIENT);
-    req.setRequestHeader('Prefer', 'return=minimal');
-    req.send(doc);
+    pu[2].submit();
 }
 
 
 // Adjust supported components on a calendar collection
-function compsetCalendar(url, id, comps) {
+function compsetCalendar(id, comps) {
     if (!window.confirm('Are you sure you want to change' +
                         ' component types on calendar \"' +
-                        document.getElementById(id).innerText + '\"?')) {
+                        document.getElementById(id).children[0].innerText + '\"?')) {
 
         // Reset selected options
         for (var i = 0; i < comps.length; i++) {
@@ -209,51 +213,35 @@ function compsetCalendar(url, id, comps) {
         return;
     }
 
-    // Build PROPPATCH document
-    var doc = document.implementation.createDocument(XML_DAV_NS,
-                                                     "D:propertyupdate", null);
-    var propupdate = doc.documentElement;
-    var props = doc.createElementNS(XML_DAV_NS, "D:prop");
-    var compset = doc.createElementNS(XML_CALDAV_NS,
-                                      "C:supported-calendar-component-set");
+    const pu = propupdate(true, id);
+    const compset = pu[0].createElementNS(XML_CALDAV_NS,
+                                          "C:supported-calendar-component-set");
     compset.setAttribute("force", "yes");
-    props.appendChild(compset);
+    pu[1].appendChild(compset);
 
-    var op = doc.createElementNS(XML_DAV_NS, "D:set");
+    const op = pu[0].createElementNS(XML_DAV_NS, "D:set");
     for (var i = 0; i < comps.length; i++) {
         if (comps[i].selected) {
-            var comp = doc.createElementNS(XML_CALDAV_NS, "C:comp");
+            const comp = pu[0].createElementNS(XML_CALDAV_NS, "C:comp");
             comp.setAttribute("name", comps[i].value);
             compset.appendChild(comp);
         }
         comps[i].defaultSelected = comps[i].selected;
     }
 
-    op.appendChild(props);
-    propupdate.appendChild(op);
-
-    // Send PROPPATCH request (minimal response)
-    var req = new XMLHttpRequest();
-    req.open('PROPPATCH', url);
-    req.setRequestHeader('X-Client', X_CLIENT);
-    req.setRequestHeader('Prefer', 'return=minimal');
-    req.send(doc);
+    pu[2].submit();
 }
 
 
-// Delete a calendar collection
-function deleteCalendar(url, id) {
-    if (window.confirm('Are you sure you want to delete calendar \"' +
-                       document.getElementById(id).innerText + '\"?')) {
+function deleteCollection(i) {
+    if (window.confirm('Are you sure you want to delete ' + (calendar ? 'calendar \"' : 'addressbook \"') +
+                       document.getElementById(i).children[0].innerText + '\"?')) {
         // Send DELETE request
         var req = new XMLHttpRequest();
-        req.open('DELETE', url, false);
+        req.open('DELETE', n(i));
         req.setRequestHeader('X-Client', X_CLIENT);
+        req.addEventListener('load', () => document.location.reload());
         req.send(null);
-
-        // Refresh calendar list
-        var baseurl = url.substring(0, url.lastIndexOf("/") + 1);
-        document.location.replace(baseurl);
     }
 }
 
diff --git a/imap/http_carddav.c b/imap/http_carddav.c
index e33783dd2a..a1583b427f 100644
--- a/imap/http_carddav.c
+++ b/imap/http_carddav.c
@@ -1146,7 +1146,7 @@ static int list_addressbooks(struct transaction_t *txn)
     struct list_addr_rock lrock;
     const char *proto = NULL;
     const char *host = NULL;
-#include "imap/http_carddav_js.h"
+#include "imap/http_caldav_js.h"
 
     /* stat() mailboxes.db for Last-Modified and ETag */
     snprintf(mboxlist, MAX_MAILBOX_PATH, "%s%s", config_dir, FNAME_MBOXLIST);
@@ -1201,8 +1201,8 @@ static int list_addressbooks(struct transaction_t *txn)
     buf_printf_markup(body, level, "<title>%s</title>", "Available Addressbooks");
     buf_printf_markup(body, level++, "<script type=\"text/javascript\">");
     buf_appendcstr(body, "//<![CDATA[\n");
-    buf_printf(body, (const char *) http_carddav_js,
-               CYRUS_VERSION, http_carddav_js_len);
+    buf_printf(body, (const char *) http_caldav_js,
+               CYRUS_VERSION, http_caldav_js_len);
     buf_appendcstr(body, "//]]>\n");
     buf_printf_markup(body, --level, "</script>");
     buf_printf_markup(body, level++, "<noscript>");
@@ -1239,9 +1239,8 @@ static int list_addressbooks(struct transaction_t *txn)
         buf_printf_markup(body, level, "<td></td>");
         buf_printf_markup(body, level,
                           "<td><br><input type=button value='Create'"
-                          " onclick=\"createAddressbook('%s')\">"
-                          " <input type=reset></td>",
-                          base_path);
+                          " onclick='createCollection()'>"
+                          " <input type=reset></td>");
         buf_printf_markup(body, --level, "</tr>");
 
         buf_printf_markup(body, --level, "</table>");
@@ -1281,8 +1280,8 @@ static int list_addressbooks(struct transaction_t *txn)
         }
 
         /* Addressbook name */
-        buf_printf_markup(body, level++, "<tr>");
-        buf_printf_markup(body, level, "<td id='%i'>%s%s%s", i,
+        buf_printf_markup(body, level++, "<tr id='%i' data-url='%s'>", i, addr->shortname);
+        buf_printf_markup(body, level, "<td>%s%s%s",
                           (addr->flags & ADDR_IS_DEFAULT) ? "<b>" : "",
                           displayname,
                           (addr->flags & ADDR_IS_DEFAULT) ? "</b>" : "");
@@ -1293,20 +1292,22 @@ static int list_addressbooks(struct transaction_t *txn)
                           base_path, addr->shortname);
 
         /* Delete button */
-        buf_printf_markup(body, level,
-                          "<td><input type=button%s value='Delete'"
-                          " onclick=\"deleteAddressbook('%s%s', '%i')\"></td>",
-                          !(addr->flags & ADDR_CAN_DELETE) ? " disabled" : "",
-                          base_path, addr->shortname, i);
+        if (addr->flags & ADDR_IS_DEFAULT)
+            buf_printf_markup(body, level, "<td>Default Addressbook</td>");
+        else if (addr->flags & ADDR_CAN_DELETE)
+            buf_printf_markup(body, level,
+                              "<td><input type=button value='Delete'"
+                              " onclick='deleteCollection(%i)'></td>", i);
+        else
+            buf_printf_markup(body, level, "<td></td>");
 
         /* Public (shared) checkbox */
         buf_printf_markup(body, level,
-                          "<td><input type=checkbox%s%s name=share"
-                          " onclick=\"shareAddressbook('%s%s', this.checked)\">"
+                          "<td><input type=checkbox%s%s"
+                          " onclick='share(%i, this.checked)'>"
                           "Public</td>",
-                          !(addr->flags & ADDR_CAN_ADMIN) ? " disabled" : "",
-                          (addr->flags & ADDR_IS_PUBLIC) ? " checked" : "",
-                          base_path, addr->shortname);
+                          (addr->flags & ADDR_CAN_ADMIN) ? "" : " disabled",
+                          (addr->flags & ADDR_IS_PUBLIC) ? " checked" : "", i);
 
         buf_printf_markup(body, --level, "</tr>");
     }
diff --git a/imap/http_carddav.js b/imap/http_carddav.js
deleted file mode 100644
index 0f8cd3354c7cb970d2ffbc482a2e6686dbd12264..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5740
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
NXat#5?Z#gk{{wZl=pFz7


From 20f50cb4f838455702410d849c23b676702125b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=B8=D0=BB=D1=8F=D0=BD=20=D0=9F=D0=B0=D0=BB=D0=B0?=
 =?UTF-8?q?=D1=83=D0=B7=D0=BE=D0=B2?= <git-dpa@aegee.org>
Date: Fri, 6 Sep 2024 18:28:46 +0300
Subject: [PATCH 2/3] Caldav/Carddav admin html page: enable editing
 DAV:displayname

---
 changes/next/htmladminpage | 12 ++++++++++++
 imap/http_caldav.c         | 26 ++++++++++++++++++++------
 imap/http_caldav.js        | 13 +++++++++++++
 imap/http_carddav.c        | 26 ++++++++++++++++++++------
 4 files changed, 65 insertions(+), 12 deletions(-)
 create mode 100644 changes/next/htmladminpage

diff --git a/changes/next/htmladminpage b/changes/next/htmladminpage
new file mode 100644
index 0000000000..df7b7dfb5a
--- /dev/null
+++ b/changes/next/htmladminpage
@@ -0,0 +1,12 @@
+Description:
+
+The CalDAV and CardDAV HTML administration pages allow editing
+the DAV:displayname property.
+
+Config changes:
+
+None
+
+Upgrade instructions:
+
+None
\ No newline at end of file
diff --git a/imap/http_caldav.c b/imap/http_caldav.c
index d523b8af06..dd2a3e8b1c 100644
--- a/imap/http_caldav.c
+++ b/imap/http_caldav.c
@@ -1962,7 +1962,8 @@ enum {
     CAL_CAN_DELETE =    (1<<1),
     CAL_CAN_ADMIN =     (1<<2),
     CAL_IS_PUBLIC =     (1<<3),
-    CAL_IS_TRANSP =     (1<<4)
+    CAL_IS_TRANSP =     (1<<4),
+    CAL_CAN_PROPCOL =   (1<<5)
 };
 
 struct list_cal_rock {
@@ -2028,6 +2029,10 @@ static int list_cal_cb(const mbentry_t *mbentry, void *rock)
     strlcpy(cal->displayname, buf_cstring(&displayname), MAX_MAILBOX_NAME);
     cal->flags = 0;
 
+    if (rights & DACL_PROPCOL) {
+        cal->flags |= CAL_CAN_PROPCOL;
+    }
+
     /* Is this the default calendar? */
     if (len == lrock->defaultlen &&
             !strncmpsafe(shortname, lrock->scheddefault, lrock->defaultlen)) {
@@ -2279,6 +2284,9 @@ static int list_calendars(struct transaction_t *txn)
     /* Sort calendars by displayname */
     qsort(lrock.cal, lrock.len, sizeof(struct cal_info), &cal_compare);
     charset_t utf8 = charset_lookupname("utf-8");
+    buf_printf_markup(body, level, "<thead>");
+    buf_printf_markup(body, level, "<tr><th colspan='2'>Name</th><th>Components</th><th>WebCAL link</th><th>HTTPS link</th><th>Actions</th><th>Public</th><th>Transparent</th></tr>");
+    buf_printf_markup(body, level, "</thead><tbody>");
 
     /* Add available calendars with action items */
     for (i = 0; i < lrock.len; i++) {
@@ -2293,10 +2301,16 @@ static int list_calendars(struct transaction_t *txn)
 
         /* Calendar name */
         buf_printf_markup(body, level++, "<tr id='%i' data-url='%s'>", i, cal->shortname);
-        buf_printf_markup(body, level, "<td>%s%s%s",
-                          (cal->flags & CAL_IS_DEFAULT) ? "<b>" : "",
-                          displayname,
-                          (cal->flags & CAL_IS_DEFAULT) ? "</b>" : "");
+        if (cal->flags & CAL_CAN_PROPCOL)
+            buf_printf_markup(body, level, "<td>%s%s%s</td><td><button onclick='changeDisplayname(%i)'>✎</button></td>",
+                              (cal->flags & CAL_IS_DEFAULT) ? "<b>" : "",
+                              displayname,
+                              (cal->flags & CAL_IS_DEFAULT) ? "</b>" : "", i);
+        else
+            buf_printf_markup(body, level, "<td colspan='2'>%s%s%s</td>",
+                              (cal->flags & CAL_IS_DEFAULT) ? "<b>" : "",
+                              displayname,
+                              (cal->flags & CAL_IS_DEFAULT) ? "</b>" : "");
         free(displayname);
 
         /* Supported components list */
@@ -2355,7 +2369,7 @@ static int list_calendars(struct transaction_t *txn)
     free(lrock.cal);
 
     /* Finish list */
-    buf_printf_markup(body, --level, "</table>");
+    buf_printf_markup(body, --level, "</tbody></table>");
 
     /* Finish HTML */
     buf_printf_markup(body, --level, "</body>");
diff --git a/imap/http_caldav.js b/imap/http_caldav.js
index f58c6154d8..05a0343403 100644
--- a/imap/http_caldav.js
+++ b/imap/http_caldav.js
@@ -184,6 +184,19 @@ function share(i, share) {
     req.send(doc);
 }
 
+function changeDisplayname(i) {
+    const oldName = document.getElementById(i).children[0].innerText;
+    const newValue = window.prompt('Provide new name for ' + (calendar ? 'calendar': 'addressbook') + ' ' + oldName, oldName);
+    if (newValue == null || newValue == oldName) return;
+
+    const pu = propupdate(newValue != '', i);
+    const displayname = pu[0].createElementNS(XML_DAV_NS, "displayname");
+    pu[1].appendChild(displayname);
+    if (newValue != '')
+        displayname.appendChild(pu[0].createTextNode(newValue));
+    pu[2].addEventListener('load', () => document.location.reload());
+    pu[2].submit();
+}
 
 // Make a calendar collection transparent/opaque
 function transpCalendar(i, transp) {
diff --git a/imap/http_carddav.c b/imap/http_carddav.c
index a1583b427f..9aba9fa849 100644
--- a/imap/http_carddav.c
+++ b/imap/http_carddav.c
@@ -1038,7 +1038,8 @@ enum {
     ADDR_IS_DEFAULT =    (1<<0),
     ADDR_CAN_DELETE =    (1<<1),
     ADDR_CAN_ADMIN =     (1<<2),
-    ADDR_IS_PUBLIC =     (1<<3)
+    ADDR_IS_PUBLIC =     (1<<3),
+    ADDR_CAN_PROPCOL =   (1<<4)
 };
 
 struct list_addr_rock {
@@ -1104,6 +1105,9 @@ static int list_addr_cb(const mbentry_t *mbentry, void *rock)
     if (rights & DACL_ADMIN) {
         addr->flags |= ADDR_CAN_ADMIN;
     }
+    if (rights & DACL_PROPCOL) {
+        addr->flags |= ADDR_CAN_PROPCOL;
+    }
 
     /* Is this addressbook public? */
     if (mbentry->acl) {
@@ -1266,6 +1270,10 @@ static int list_addressbooks(struct transaction_t *txn)
 
     /* Sort addressbooks by displayname */
     qsort(lrock.addr, lrock.len, sizeof(struct addr_info), &addr_compare);
+    buf_printf_markup(body, level, "<thead>");
+    buf_printf_markup(body, level, "<tr><th colspan='2'>Name</th><th colspan='2'></th><th>Public</th></tr>"
+);
+    buf_printf_markup(body, level, "</thead><tbody>");
     charset_t utf8 = charset_lookupname("utf-8");
 
     /* Add available addressbooks with action items */
@@ -1281,10 +1289,16 @@ static int list_addressbooks(struct transaction_t *txn)
 
         /* Addressbook name */
         buf_printf_markup(body, level++, "<tr id='%i' data-url='%s'>", i, addr->shortname);
-        buf_printf_markup(body, level, "<td>%s%s%s",
-                          (addr->flags & ADDR_IS_DEFAULT) ? "<b>" : "",
-                          displayname,
-                          (addr->flags & ADDR_IS_DEFAULT) ? "</b>" : "");
+        if (addr->flags & ADDR_CAN_PROPCOL)
+            buf_printf_markup(body, level, "<td>%s%s%s</td><td><button onclick='changeDisplayname(%i)'>✎</button></td>",
+                              (addr->flags & ADDR_IS_DEFAULT) ? "<b>" : "",
+                              displayname,
+                              (addr->flags & ADDR_IS_DEFAULT) ? "</b>" : "", i);
+        else
+            buf_printf_markup(body, level, "<td colspan='2'>%s%s%s</td>",
+                              (addr->flags & ADDR_IS_DEFAULT) ? "<b>" : "",
+                              displayname,
+                              (addr->flags & ADDR_IS_DEFAULT) ? "</b>" : "");
         free(displayname);
 
         /* Download link */
@@ -1316,7 +1330,7 @@ static int list_addressbooks(struct transaction_t *txn)
     free(lrock.addr);
 
     /* Finish list */
-    buf_printf_markup(body, --level, "</table>");
+    buf_printf_markup(body, --level, "</tbody></table>");
 
     /* Finish HTML */
     buf_printf_markup(body, --level, "</body>");

From 348a8fb27b36c48180d2993806f745b46dc77085 Mon Sep 17 00:00:00 2001
From: Ken Murchison <murch@fastmail.com>
Date: Thu, 19 Sep 2024 08:23:07 -0400
Subject: [PATCH 3/3] Rename consolidated http_caldav.js to
 http_cal_abook_admin.js

---
 Makefile.am                                      | 9 ++++-----
 imap/{http_caldav.js => http_cal_abook_admin.js} | 0
 imap/http_caldav.c                               | 6 +++---
 imap/http_carddav.c                              | 8 ++++----
 4 files changed, 11 insertions(+), 12 deletions(-)
 rename imap/{http_caldav.js => http_cal_abook_admin.js} (100%)

diff --git a/Makefile.am b/Makefile.am
index 9068481b3d..05e8fb4ace 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -117,7 +117,7 @@ DISTCLEANFILES = \
 MAINTAINERCLEANFILES = \
     doc/legacy/murder.png \
     doc/legacy/netnews.png \
-    imap/http_caldav_js.h \
+    imap/http_cal_abook_admin_js.h \
     man/imapd.conf.5 \
     man/sieveshell.1 \
     sieve/addr.h \
@@ -247,7 +247,7 @@ AM_CPPFLAGS += $(HTTP_CPPFLAGS)
 AM_LDFLAGS += $(HTTP_LIBS)
 
 BUILT_SOURCES += \
-    imap/http_caldav_js.h \
+    imap/http_cal_abook_admin_js.h \
     imap/tz_err.c \
     imap/tz_err.h
 
@@ -340,7 +340,7 @@ EXTRA_DIST = \
     doc/legacy/netnews.png \
     doc \
     docsrc \
-    imap/http_caldav.js \
+    imap/http_cal_abook_admin.js \
     imap/http_err.et \
     imap/imap_err.et \
     imap/jmap_err.et \
@@ -1239,13 +1239,12 @@ imap_httpd_SOURCES = \
     imap/caldav_util.h \
     imap/http_admin.c \
     imap/http_applepush.c \
+    imap/http_cal_abook_admin_js.h \
     imap/http_caldav.c \
-    imap/http_caldav_js.h \
     imap/http_caldav_sched.c \
     imap/http_caldav_sched.h \
     imap/http_carddav.c \
     imap/http_carddav.h \
-    imap/http_carddav_js.h \
     imap/http_cgi.c \
     imap/http_dav.c \
     imap/http_dav.h \
diff --git a/imap/http_caldav.js b/imap/http_cal_abook_admin.js
similarity index 100%
rename from imap/http_caldav.js
rename to imap/http_cal_abook_admin.js
diff --git a/imap/http_caldav.c b/imap/http_caldav.c
index dd2a3e8b1c..13dab3c16d 100644
--- a/imap/http_caldav.c
+++ b/imap/http_caldav.c
@@ -2133,7 +2133,7 @@ static int list_calendars(struct transaction_t *txn)
     const char *proto = NULL;
     const char *host = NULL;
     const struct cal_comp_t *comp;
-#include "imap/http_caldav_js.h"
+#include "imap/http_cal_abook_admin_js.h"
 
     /* stat() mailboxes.db for Last-Modified and ETag */
     snprintf(mboxlist, MAX_MAILBOX_PATH, "%s%s", config_dir, FNAME_MBOXLIST);
@@ -2188,8 +2188,8 @@ static int list_calendars(struct transaction_t *txn)
     buf_printf_markup(body, level, "<title>%s</title>", "Available Calendars");
     buf_printf_markup(body, level++, "<script type=\"text/javascript\">");
     buf_appendcstr(body, "//<![CDATA[\n");
-    buf_printf(body, (const char *) http_caldav_js,
-               CYRUS_VERSION, http_caldav_js_len);
+    buf_printf(body, (const char *) http_cal_abook_admin_js,
+               CYRUS_VERSION, http_cal_abook_admin_js_len);
     buf_appendcstr(body, "//]]>\n");
     buf_printf_markup(body, --level, "</script>");
     buf_printf_markup(body, level++, "<noscript>");
diff --git a/imap/http_carddav.c b/imap/http_carddav.c
index 9aba9fa849..f246bf06cd 100644
--- a/imap/http_carddav.c
+++ b/imap/http_carddav.c
@@ -1150,7 +1150,7 @@ static int list_addressbooks(struct transaction_t *txn)
     struct list_addr_rock lrock;
     const char *proto = NULL;
     const char *host = NULL;
-#include "imap/http_caldav_js.h"
+#include "imap/http_cal_abook_admin_js.h"
 
     /* stat() mailboxes.db for Last-Modified and ETag */
     snprintf(mboxlist, MAX_MAILBOX_PATH, "%s%s", config_dir, FNAME_MBOXLIST);
@@ -1205,8 +1205,8 @@ static int list_addressbooks(struct transaction_t *txn)
     buf_printf_markup(body, level, "<title>%s</title>", "Available Addressbooks");
     buf_printf_markup(body, level++, "<script type=\"text/javascript\">");
     buf_appendcstr(body, "//<![CDATA[\n");
-    buf_printf(body, (const char *) http_caldav_js,
-               CYRUS_VERSION, http_caldav_js_len);
+    buf_printf(body, (const char *) http_cal_abook_admin_js,
+               CYRUS_VERSION, http_cal_abook_admin_js_len);
     buf_appendcstr(body, "//]]>\n");
     buf_printf_markup(body, --level, "</script>");
     buf_printf_markup(body, level++, "<noscript>");
@@ -1271,7 +1271,7 @@ static int list_addressbooks(struct transaction_t *txn)
     /* Sort addressbooks by displayname */
     qsort(lrock.addr, lrock.len, sizeof(struct addr_info), &addr_compare);
     buf_printf_markup(body, level, "<thead>");
-    buf_printf_markup(body, level, "<tr><th colspan='2'>Name</th><th colspan='2'></th><th>Public</th></tr>"
+    buf_printf_markup(body, level, "<tr><th colspan='2'>Name</th><th>HTTPS link</th><th>Actions</th><th>Public</th></tr>"
 );
     buf_printf_markup(body, level, "</thead><tbody>");
     charset_t utf8 = charset_lookupname("utf-8");