diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-04-08 15:19:38 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-04-08 15:19:38 +0200 |
| commit | 6f3eeeeb36d86b352d396f730fbc6a8d1e8ca160 (patch) | |
| tree | 62f29d34ebbd891a56ffc9c0a64eba3d5f36394b /apps/dav/appinfo | |
| parent | 88a366b3143b70953224f96c500cf725270065b4 (diff) | |
| parent | c8d6a9594ab7c0525cc9485b394547ae960d8f34 (diff) | |
| download | nextcloud-server-6f3eeeeb36d86b352d396f730fbc6a8d1e8ca160.tar.gz nextcloud-server-6f3eeeeb36d86b352d396f730fbc6a8d1e8ca160.zip | |
Merge pull request #23510 from owncloud/birthdays-on-shared-addressbooks
Propagate birthdays of shared addressbooks to the sharee's birthday c…
Diffstat (limited to 'apps/dav/appinfo')
| -rw-r--r-- | apps/dav/appinfo/application.php | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/apps/dav/appinfo/application.php b/apps/dav/appinfo/application.php index d06daf97f54..593cd770be5 100644 --- a/apps/dav/appinfo/application.php +++ b/apps/dav/appinfo/application.php @@ -27,6 +27,8 @@ use OCA\DAV\CardDAV\CardDavBackend; use OCA\DAV\CardDAV\ContactsManager; use OCA\DAV\CardDAV\SyncJob; use OCA\DAV\CardDAV\SyncService; +use OCA\DAV\Connector\Sabre\Principal; +use OCA\DAV\DAV\GroupPrincipalBackend; use OCA\DAV\HookManager; use OCA\Dav\Migration\AddressBookAdapter; use OCA\Dav\Migration\CalendarAdapter; @@ -79,7 +81,7 @@ class Application extends App { /** @var IAppContainer $c */ $db = $c->getServer()->getDatabaseConnection(); $dispatcher = $c->getServer()->getEventDispatcher(); - $principal = new \OCA\DAV\Connector\Sabre\Principal( + $principal = new Principal( $c->getServer()->getUserManager(), $c->getServer()->getGroupManager() ); @@ -89,7 +91,7 @@ class Application extends App { $container->registerService('CalDavBackend', function($c) { /** @var IAppContainer $c */ $db = $c->getServer()->getDatabaseConnection(); - $principal = new \OCA\DAV\Connector\Sabre\Principal( + $principal = new Principal( $c->getServer()->getUserManager(), $c->getServer()->getGroupManager() ); @@ -122,11 +124,14 @@ class Application extends App { $container->registerService('BirthdayService', function($c) { /** @var IAppContainer $c */ + $g = new GroupPrincipalBackend( + $c->getServer()->getGroupManager() + ); return new BirthdayService( $c->query('CalDavBackend'), - $c->query('CardDavBackend') + $c->query('CardDavBackend'), + $g ); - }); } @@ -147,6 +152,7 @@ class Application extends App { $listener = function($event) { if ($event instanceof GenericEvent) { + /** @var BirthdayService $b */ $b = $this->getContainer()->query('BirthdayService'); $b->onCardChanged( $event->getArgument('addressBookId'), @@ -161,6 +167,7 @@ class Application extends App { $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $listener); $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', function($event) { if ($event instanceof GenericEvent) { + /** @var BirthdayService $b */ $b = $this->getContainer()->query('BirthdayService'); $b->onCardDeleted( $event->getArgument('addressBookId'), |