@@ -30,33 +30,33 @@ |
||
| 30 | 30 | $app->registerHooks(); |
| 31 | 31 | |
| 32 | 32 | \OC::$server->registerService('CardDAVSyncService', function() use ($app) { |
| 33 | - return $app->getSyncService(); |
|
| 33 | + return $app->getSyncService(); |
|
| 34 | 34 | }); |
| 35 | 35 | |
| 36 | 36 | $eventDispatcher = \OC::$server->getEventDispatcher(); |
| 37 | 37 | |
| 38 | 38 | $eventDispatcher->addListener('OCP\Federation\TrustedServerEvent::remove', |
| 39 | - function(GenericEvent $event) use ($app) { |
|
| 40 | - /** @var CardDavBackend $cardDavBackend */ |
|
| 41 | - $cardDavBackend = $app->getContainer()->query(CardDavBackend::class); |
|
| 42 | - $addressBookUri = $event->getSubject(); |
|
| 43 | - $addressBook = $cardDavBackend->getAddressBooksByUri('principals/system/system', $addressBookUri); |
|
| 44 | - if (!is_null($addressBook)) { |
|
| 45 | - $cardDavBackend->deleteAddressBook($addressBook['id']); |
|
| 46 | - } |
|
| 47 | - } |
|
| 39 | + function(GenericEvent $event) use ($app) { |
|
| 40 | + /** @var CardDavBackend $cardDavBackend */ |
|
| 41 | + $cardDavBackend = $app->getContainer()->query(CardDavBackend::class); |
|
| 42 | + $addressBookUri = $event->getSubject(); |
|
| 43 | + $addressBook = $cardDavBackend->getAddressBooksByUri('principals/system/system', $addressBookUri); |
|
| 44 | + if (!is_null($addressBook)) { |
|
| 45 | + $cardDavBackend->deleteAddressBook($addressBook['id']); |
|
| 46 | + } |
|
| 47 | + } |
|
| 48 | 48 | ); |
| 49 | 49 | |
| 50 | 50 | $cm = \OC::$server->getContactsManager(); |
| 51 | 51 | $cm->register(function() use ($cm, $app) { |
| 52 | - $user = \OC::$server->getUserSession()->getUser(); |
|
| 53 | - if (is_null($user)) { |
|
| 54 | - return; |
|
| 55 | - } |
|
| 56 | - if (\OC::$server->getConfig()->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') !== 'yes') { |
|
| 57 | - // Don't include system users |
|
| 58 | - // This prevents user enumeration in the contacts menu and the mail app |
|
| 59 | - return; |
|
| 60 | - } |
|
| 61 | - $app->setupContactsProvider($cm, $user->getUID()); |
|
| 52 | + $user = \OC::$server->getUserSession()->getUser(); |
|
| 53 | + if (is_null($user)) { |
|
| 54 | + return; |
|
| 55 | + } |
|
| 56 | + if (\OC::$server->getConfig()->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') !== 'yes') { |
|
| 57 | + // Don't include system users |
|
| 58 | + // This prevents user enumeration in the contacts menu and the mail app |
|
| 59 | + return; |
|
| 60 | + } |
|
| 61 | + $app->setupContactsProvider($cm, $user->getUID()); |
|
| 62 | 62 | }); |