aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMax Kostikov <max@kostikov.co>2019-09-03 14:33:37 +0200
committerMax Kostikov <max@kostikov.co>2019-09-03 14:33:37 +0200
commitdcfe10b69118eab9795d234b68c6a310da97d383 (patch)
tree67bcbe1b8ed606b35b3762d67d323f803f1e197a /Zotlabs
parent914a096b42b741251a3132b74adf13e15c02cda3 (diff)
parentd267dd251579c28346882a3c69c5749fa4b6962d (diff)
downloadvolse-hubzilla-dcfe10b69118eab9795d234b68c6a310da97d383.tar.gz
volse-hubzilla-dcfe10b69118eab9795d234b68c6a310da97d383.tar.bz2
volse-hubzilla-dcfe10b69118eab9795d234b68c6a310da97d383.zip
Merge branch 'dev' into 'dev'
Add CalDAV / CardDAV autodiscovery See merge request hubzilla/core!1719
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Well_known.php12
1 files changed, 12 insertions, 0 deletions
diff --git a/Zotlabs/Module/Well_known.php b/Zotlabs/Module/Well_known.php
index 09e743788..140ab260d 100644
--- a/Zotlabs/Module/Well_known.php
+++ b/Zotlabs/Module/Well_known.php
@@ -63,6 +63,18 @@ class Well_known extends \Zotlabs\Web\Controller {
case 'dnt-policy.txt':
echo file_get_contents('doc/dnt-policy.txt');
killme();
+
+ case 'caldav':
+ if ($_SERVER['REQUEST_METHOD'] == 'PROPFIND') {
+ http_status('301', 'moved permanently');
+ goaway(z_root() . '/cdav');
+ };
+
+ case 'carddav':
+ if ($_SERVER['REQUEST_METHOD'] == 'PROPFIND') {
+ http_status('301', 'moved permanently');
+ goaway(z_root() . '/cdav');
+ };
default:
if(file_exists(\App::$cmd)) {