summaryrefslogtreecommitdiff
path: root/public_html
diff options
context:
space:
mode:
Diffstat (limited to 'public_html')
-rw-r--r--public_html/.htaccess4
-rw-r--r--public_html/index.php4
2 files changed, 6 insertions, 2 deletions
diff --git a/public_html/.htaccess b/public_html/.htaccess
index f2eca1a..c63d795 100644
--- a/public_html/.htaccess
+++ b/public_html/.htaccess
@@ -1,5 +1,9 @@
RewriteEngine On
+RewriteBase /
+RewriteRule ^\.well-known/caldav / [R,L]
+RewriteRule ^\.well-known/carddav / [R,L]
+
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule (.*) index.php [qsappend,last]
diff --git a/public_html/index.php b/public_html/index.php
index 1049f99..25c53bb 100644
--- a/public_html/index.php
+++ b/public_html/index.php
@@ -84,7 +84,7 @@ if ($debug = $rcube->config->get('kolab_dav_debug')) {
// Make sure this setting is turned on and reflects the root url of the *DAV server.
-$base_uri = slashify(substr(dirname($_SERVER['SCRIPT_FILENAME']), strlen($_SERVER['DOCUMENT_ROOT'])));
+$base_uri = $rcube->config->get('base_uri', slashify(substr(dirname($_SERVER['SCRIPT_FILENAME']), strlen($_SERVER['DOCUMENT_ROOT']))));
// create the various backend instances
@@ -111,7 +111,7 @@ $server->setBaseUri($base_uri);
// register some plugins
$server->addPlugin(new \Sabre\DAV\Auth\Plugin($auth_backend, 'KolabDAV'));
-//$server->addPlugin(new \Sabre\DAVACL\Plugin()); // we'll add that later
+$server->addPlugin(new \Sabre\DAVACL\Plugin()); // we'll add that later
$server->addPlugin(new \Kolab\CalDAV\Plugin());
//$server->addPlugin(new \Sabre\CardDAV\Plugin());
$server->addPlugin(new \Sabre\DAV\Browser\Plugin());