summaryrefslogtreecommitdiff
path: root/public_html
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2013-03-14 16:48:10 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2013-03-14 16:48:10 (GMT)
commit5515a4b398f4ccc2b6f32d810d4fb7eed47c3efa (patch)
tree48700a1f304ebe736d70d5a8889d619f4204579a /public_html
parent5ec426a349db1bf8720228b4df4d08388a59b8ab (diff)
downloadiRony-5515a4b398f4ccc2b6f32d810d4fb7eed47c3efa.tar.gz
- Use UIDs from IMAP annoations for collection IDs
- Implement CardDAV/AddressBook classes for proper ACL/sharing support - Enable Free-Busy queries to CalDAV
Diffstat (limited to 'public_html')
-rw-r--r--public_html/.htaccess2
-rw-r--r--public_html/index.php6
2 files changed, 4 insertions, 4 deletions
diff --git a/public_html/.htaccess b/public_html/.htaccess
index c63d795..de79a2c 100644
--- a/public_html/.htaccess
+++ b/public_html/.htaccess
@@ -1,6 +1,6 @@
RewriteEngine On
-RewriteBase /
+#RewriteBase /
RewriteRule ^\.well-known/caldav / [R,L]
RewriteRule ^\.well-known/carddav / [R,L]
diff --git a/public_html/index.php b/public_html/index.php
index 6d4464c..fa59084 100644
--- a/public_html/index.php
+++ b/public_html/index.php
@@ -105,7 +105,7 @@ $nodes = array(
// /calendars
new \Kolab\CalDAV\CalendarRootNode($principal_backend, $caldav_backend),
// /addressbook
- new \Sabre\CardDAV\AddressBookRoot($principal_backend, $carddav_backend),
+ new \Kolab\CardDAV\AddressBookRoot($principal_backend, $carddav_backend),
);
// the object tree needs in turn to be passed to the server class
@@ -114,9 +114,9 @@ $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());
$server->addPlugin(new \Kolab\CalDAV\Plugin());
-$server->addPlugin(new \Sabre\CardDAV\Plugin());
+$server->addPlugin(new \Kolab\CardDAV\Plugin());
$server->addPlugin(new \Sabre\DAV\Browser\Plugin());
// finally, process the request