diff options
author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-15 22:26:55 +0200 |
---|---|---|
committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-15 22:26:55 +0200 |
commit | dc18e65b4675d1d458a42ef8e6125bf6680ba157 (patch) | |
tree | 30072917dd3290cd65a8cfac764feb26e56594c1 /apps/contacts/lib/hooks.php | |
parent | 8ddea7e95cc19e7880f2334e2c8d43b8c4e02ee0 (diff) | |
parent | 12818093007d5bdce5519b5015e2a0748c98e24d (diff) | |
download | nextcloud-server-dc18e65b4675d1d458a42ef8e6125bf6680ba157.tar.gz nextcloud-server-dc18e65b4675d1d458a42ef8e6125bf6680ba157.zip |
fix merge conflicts
Diffstat (limited to 'apps/contacts/lib/hooks.php')
-rw-r--r-- | apps/contacts/lib/hooks.php | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/apps/contacts/lib/hooks.php b/apps/contacts/lib/hooks.php index e09da20be86..b858c4a5a48 100644 --- a/apps/contacts/lib/hooks.php +++ b/apps/contacts/lib/hooks.php @@ -39,19 +39,6 @@ class OC_Contacts_Hooks{ return true; } - /** - * @brief Adds the CardDAV resource to the DAV server - * @param paramters parameters from initialize-Hook - * @return array - */ - static public function initializeCardDAV($parameters){ - // We need a backend, the root node and the carddav plugin - $parameters['backends']['carddav'] = new OC_Connector_Sabre_CardDAV(); - $parameters['nodes'][] = new Sabre_CardDAV_AddressBookRoot($parameters['backends']['principal'], $parameters['backends']['carddav']); - $parameters['plugins'][] = new Sabre_CardDAV_Plugin(); - return true; - } - static public function getCalenderSources($parameters) { $base_url = OC_Helper::linkTo('calendar', 'ajax/events.php').'?calendar_id='; foreach(OC_Contacts_Addressbook::all(OC_User::getUser()) as $addressbook) { |