Skip to content

Commit

Permalink
Merge pull request #5024 from dilyanpalauzov/delete_http_carddav_js
Browse files Browse the repository at this point in the history 
Caldav/Carddav admin html page: enable editing DAV:displayname
  • Loading branch information
@ksmurchison
ksmurchison committed Sep 19, 2024
2 parents 25234a9 + 348a8fb commit c1a4661
Show file tree
Hide file tree
Showing 6 changed files with 178 additions and 140 deletions.
14 changes: 5 additions & 9 deletions Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,7 @@ DISTCLEANFILES = \
MAINTAINERCLEANFILES = \
doc/legacy/murder.png \
doc/legacy/netnews.png \
imap/http_caldav_js.h \
imap/http_carddav_js.h \
imap/http_cal_abook_admin_js.h \
man/imapd.conf.5 \
man/sieveshell.1 \
sieve/addr.h \
Expand Down Expand Up @@ -248,8 +247,7 @@ AM_CPPFLAGS += $(HTTP_CPPFLAGS)
AM_LDFLAGS += $(HTTP_LIBS)

BUILT_SOURCES += \
imap/http_caldav_js.h \
imap/http_carddav_js.h \
imap/http_cal_abook_admin_js.h \
imap/tz_err.c \
imap/tz_err.h

Expand Down Expand Up @@ -342,8 +340,7 @@ EXTRA_DIST = \
doc/legacy/netnews.png \
doc \
docsrc \
imap/http_caldav.js \
imap/http_carddav.js \
imap/http_cal_abook_admin.js \
imap/http_err.et \
imap/imap_err.et \
imap/jmap_err.et \
Expand Down Expand Up @@ -1242,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 \
Expand Down Expand Up @@ -1279,7 +1275,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 \
Expand Down
12 changes: 12 additions & 0 deletions changes/next/htmladminpage
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Description:

The CalDAV and CardDAV HTML administration pages allow editing
the DAV:displayname property.

Config changes:

None

Upgrade instructions:

None
155 changes: 78 additions & 77 deletions imap/http_caldav.js → imap/http_cal_abook_admin.js
View file
Original file line number Diff line number Diff line change
@@ -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.
*
Expand Down Expand Up @@ -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
Expand All @@ -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);

Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -156,51 +178,46 @@ 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);
}

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(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++) {
Expand All @@ -209,51 +226,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);
}
}

Expand Down
Loading

0 comments on commit c1a4661

Please sign in to comment.