@@ -60,9 +60,9 @@ |
||
| 60 | 60 | |
| 61 | 61 | public function propFind(PropFind $propFind, INode $node) { |
| 62 | 62 | /* Overload current-user-principal */ |
| 63 | - $propFind->handle('{DAV:}current-user-principal', function () { |
|
| 63 | + $propFind->handle('{DAV:}current-user-principal', function() { |
|
| 64 | 64 | if ($url = parent::getCurrentUserPrincipal()) { |
| 65 | - return new Principal(Principal::HREF, $url . '/'); |
|
| 65 | + return new Principal(Principal::HREF, $url.'/'); |
|
| 66 | 66 | } else { |
| 67 | 67 | return new Principal(Principal::UNAUTHENTICATED); |
| 68 | 68 | } |
@@ -38,7 +38,9 @@ |
||
| 38 | 38 | public function getCurrentUserPrincipals() { |
| 39 | 39 | $principalV2 = $this->getCurrentUserPrincipal(); |
| 40 | 40 | |
| 41 | - if (is_null($principalV2)) return []; |
|
| 41 | + if (is_null($principalV2)) { |
|
| 42 | + return []; |
|
| 43 | + } |
|
| 42 | 44 | |
| 43 | 45 | $principalV1 = $this->convertPrincipal($principalV2, false); |
| 44 | 46 | return array_merge( |
@@ -32,42 +32,42 @@ |
||
| 32 | 32 | |
| 33 | 33 | class LegacyDAVACL extends DavAclPlugin { |
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * @inheritdoc |
|
| 37 | - */ |
|
| 38 | - public function getCurrentUserPrincipals() { |
|
| 39 | - $principalV2 = $this->getCurrentUserPrincipal(); |
|
| 35 | + /** |
|
| 36 | + * @inheritdoc |
|
| 37 | + */ |
|
| 38 | + public function getCurrentUserPrincipals() { |
|
| 39 | + $principalV2 = $this->getCurrentUserPrincipal(); |
|
| 40 | 40 | |
| 41 | - if (is_null($principalV2)) return []; |
|
| 41 | + if (is_null($principalV2)) return []; |
|
| 42 | 42 | |
| 43 | - $principalV1 = $this->convertPrincipal($principalV2, false); |
|
| 44 | - return array_merge( |
|
| 45 | - [ |
|
| 46 | - $principalV2, |
|
| 47 | - $principalV1 |
|
| 48 | - ], |
|
| 49 | - $this->getPrincipalMembership($principalV1) |
|
| 50 | - ); |
|
| 51 | - } |
|
| 43 | + $principalV1 = $this->convertPrincipal($principalV2, false); |
|
| 44 | + return array_merge( |
|
| 45 | + [ |
|
| 46 | + $principalV2, |
|
| 47 | + $principalV1 |
|
| 48 | + ], |
|
| 49 | + $this->getPrincipalMembership($principalV1) |
|
| 50 | + ); |
|
| 51 | + } |
|
| 52 | 52 | |
| 53 | - private function convertPrincipal($principal, $toV2) { |
|
| 54 | - list(, $name) = \Sabre\Uri\split($principal); |
|
| 55 | - if ($toV2) { |
|
| 56 | - return "principals/users/$name"; |
|
| 57 | - } |
|
| 58 | - return "principals/$name"; |
|
| 59 | - } |
|
| 53 | + private function convertPrincipal($principal, $toV2) { |
|
| 54 | + list(, $name) = \Sabre\Uri\split($principal); |
|
| 55 | + if ($toV2) { |
|
| 56 | + return "principals/users/$name"; |
|
| 57 | + } |
|
| 58 | + return "principals/$name"; |
|
| 59 | + } |
|
| 60 | 60 | |
| 61 | - public function propFind(PropFind $propFind, INode $node) { |
|
| 62 | - /* Overload current-user-principal */ |
|
| 63 | - $propFind->handle('{DAV:}current-user-principal', function () { |
|
| 64 | - if ($url = parent::getCurrentUserPrincipal()) { |
|
| 65 | - return new Principal(Principal::HREF, $url . '/'); |
|
| 66 | - } else { |
|
| 67 | - return new Principal(Principal::UNAUTHENTICATED); |
|
| 68 | - } |
|
| 69 | - }); |
|
| 61 | + public function propFind(PropFind $propFind, INode $node) { |
|
| 62 | + /* Overload current-user-principal */ |
|
| 63 | + $propFind->handle('{DAV:}current-user-principal', function () { |
|
| 64 | + if ($url = parent::getCurrentUserPrincipal()) { |
|
| 65 | + return new Principal(Principal::HREF, $url . '/'); |
|
| 66 | + } else { |
|
| 67 | + return new Principal(Principal::UNAUTHENTICATED); |
|
| 68 | + } |
|
| 69 | + }); |
|
| 70 | 70 | |
| 71 | - return parent::propFind($propFind, $node); |
|
| 72 | - } |
|
| 71 | + return parent::propFind($propFind, $node); |
|
| 72 | + } |
|
| 73 | 73 | } |
@@ -70,7 +70,7 @@ |
||
| 70 | 70 | $dispatcher = $this->getContainer()->getServer()->getEventDispatcher(); |
| 71 | 71 | |
| 72 | 72 | // first time login event setup |
| 73 | - $dispatcher->addListener(IUser::class . '::firstLogin', function ($event) use ($hm) { |
|
| 73 | + $dispatcher->addListener(IUser::class.'::firstLogin', function($event) use ($hm) { |
|
| 74 | 74 | if ($event instanceof GenericEvent) { |
| 75 | 75 | $hm->firstLogin($event->getSubject()); |
| 76 | 76 | } |
@@ -40,156 +40,156 @@ |
||
| 40 | 40 | |
| 41 | 41 | class Application extends App { |
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * Application constructor. |
|
| 45 | - */ |
|
| 46 | - public function __construct() { |
|
| 47 | - parent::__construct('dav'); |
|
| 48 | - |
|
| 49 | - $container = $this->getContainer(); |
|
| 50 | - $server = $container->getServer(); |
|
| 51 | - |
|
| 52 | - $container->registerService(PhotoCache::class, function(SimpleContainer $s) use ($server) { |
|
| 53 | - return new PhotoCache( |
|
| 54 | - $server->getAppDataDir('dav-photocache') |
|
| 55 | - ); |
|
| 56 | - }); |
|
| 57 | - |
|
| 58 | - /* |
|
| 43 | + /** |
|
| 44 | + * Application constructor. |
|
| 45 | + */ |
|
| 46 | + public function __construct() { |
|
| 47 | + parent::__construct('dav'); |
|
| 48 | + |
|
| 49 | + $container = $this->getContainer(); |
|
| 50 | + $server = $container->getServer(); |
|
| 51 | + |
|
| 52 | + $container->registerService(PhotoCache::class, function(SimpleContainer $s) use ($server) { |
|
| 53 | + return new PhotoCache( |
|
| 54 | + $server->getAppDataDir('dav-photocache') |
|
| 55 | + ); |
|
| 56 | + }); |
|
| 57 | + |
|
| 58 | + /* |
|
| 59 | 59 | * Register capabilities |
| 60 | 60 | */ |
| 61 | - $container->registerCapability(Capabilities::class); |
|
| 62 | - } |
|
| 63 | - |
|
| 64 | - /** |
|
| 65 | - * @param IManager $contactsManager |
|
| 66 | - * @param string $userID |
|
| 67 | - */ |
|
| 68 | - public function setupContactsProvider(IManager $contactsManager, $userID) { |
|
| 69 | - /** @var ContactsManager $cm */ |
|
| 70 | - $cm = $this->getContainer()->query(ContactsManager::class); |
|
| 71 | - $urlGenerator = $this->getContainer()->getServer()->getURLGenerator(); |
|
| 72 | - $cm->setupContactsProvider($contactsManager, $userID, $urlGenerator); |
|
| 73 | - } |
|
| 74 | - |
|
| 75 | - public function registerHooks() { |
|
| 76 | - /** @var HookManager $hm */ |
|
| 77 | - $hm = $this->getContainer()->query(HookManager::class); |
|
| 78 | - $hm->setup(); |
|
| 79 | - |
|
| 80 | - $dispatcher = $this->getContainer()->getServer()->getEventDispatcher(); |
|
| 81 | - |
|
| 82 | - // first time login event setup |
|
| 83 | - $dispatcher->addListener(IUser::class . '::firstLogin', function ($event) use ($hm) { |
|
| 84 | - if ($event instanceof GenericEvent) { |
|
| 85 | - $hm->firstLogin($event->getSubject()); |
|
| 86 | - } |
|
| 87 | - }); |
|
| 88 | - |
|
| 89 | - // carddav/caldav sync event setup |
|
| 90 | - $listener = function($event) { |
|
| 91 | - if ($event instanceof GenericEvent) { |
|
| 92 | - /** @var BirthdayService $b */ |
|
| 93 | - $b = $this->getContainer()->query(BirthdayService::class); |
|
| 94 | - $b->onCardChanged( |
|
| 95 | - $event->getArgument('addressBookId'), |
|
| 96 | - $event->getArgument('cardUri'), |
|
| 97 | - $event->getArgument('cardData') |
|
| 98 | - ); |
|
| 99 | - } |
|
| 100 | - }; |
|
| 101 | - |
|
| 102 | - $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::createCard', $listener); |
|
| 103 | - $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $listener); |
|
| 104 | - $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', function($event) { |
|
| 105 | - if ($event instanceof GenericEvent) { |
|
| 106 | - /** @var BirthdayService $b */ |
|
| 107 | - $b = $this->getContainer()->query(BirthdayService::class); |
|
| 108 | - $b->onCardDeleted( |
|
| 109 | - $event->getArgument('addressBookId'), |
|
| 110 | - $event->getArgument('cardUri') |
|
| 111 | - ); |
|
| 112 | - } |
|
| 113 | - }); |
|
| 114 | - |
|
| 115 | - $clearPhotoCache = function($event) { |
|
| 116 | - if ($event instanceof GenericEvent) { |
|
| 117 | - /** @var PhotoCache $p */ |
|
| 118 | - $p = $this->getContainer()->query(PhotoCache::class); |
|
| 119 | - $p->delete( |
|
| 120 | - $event->getArgument('addressBookId'), |
|
| 121 | - $event->getArgument('cardUri') |
|
| 122 | - ); |
|
| 123 | - } |
|
| 124 | - }; |
|
| 125 | - $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $clearPhotoCache); |
|
| 126 | - $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', $clearPhotoCache); |
|
| 127 | - |
|
| 128 | - $dispatcher->addListener('OC\AccountManager::userUpdated', function(GenericEvent $event) { |
|
| 129 | - $user = $event->getSubject(); |
|
| 130 | - $syncService = $this->getContainer()->query(SyncService::class); |
|
| 131 | - $syncService->updateUser($user); |
|
| 132 | - }); |
|
| 133 | - |
|
| 134 | - $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendar', function(GenericEvent $event) { |
|
| 135 | - /** @var Backend $backend */ |
|
| 136 | - $backend = $this->getContainer()->query(Backend::class); |
|
| 137 | - $backend->onCalendarAdd( |
|
| 138 | - $event->getArgument('calendarData') |
|
| 139 | - ); |
|
| 140 | - }); |
|
| 141 | - $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendar', function(GenericEvent $event) { |
|
| 142 | - /** @var Backend $backend */ |
|
| 143 | - $backend = $this->getContainer()->query(Backend::class); |
|
| 144 | - $backend->onCalendarUpdate( |
|
| 145 | - $event->getArgument('calendarData'), |
|
| 146 | - $event->getArgument('shares'), |
|
| 147 | - $event->getArgument('propertyMutations') |
|
| 148 | - ); |
|
| 149 | - }); |
|
| 150 | - $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function(GenericEvent $event) { |
|
| 151 | - /** @var Backend $backend */ |
|
| 152 | - $backend = $this->getContainer()->query(Backend::class); |
|
| 153 | - $backend->onCalendarDelete( |
|
| 154 | - $event->getArgument('calendarData'), |
|
| 155 | - $event->getArgument('shares') |
|
| 156 | - ); |
|
| 157 | - }); |
|
| 158 | - $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateShares', function(GenericEvent $event) { |
|
| 159 | - /** @var Backend $backend */ |
|
| 160 | - $backend = $this->getContainer()->query(Backend::class); |
|
| 161 | - $backend->onCalendarUpdateShares( |
|
| 162 | - $event->getArgument('calendarData'), |
|
| 163 | - $event->getArgument('shares'), |
|
| 164 | - $event->getArgument('add'), |
|
| 165 | - $event->getArgument('remove') |
|
| 166 | - ); |
|
| 167 | - }); |
|
| 168 | - |
|
| 169 | - $listener = function(GenericEvent $event, $eventName) { |
|
| 170 | - /** @var Backend $backend */ |
|
| 171 | - $backend = $this->getContainer()->query(Backend::class); |
|
| 172 | - |
|
| 173 | - $subject = Event::SUBJECT_OBJECT_ADD; |
|
| 174 | - if ($eventName === '\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject') { |
|
| 175 | - $subject = Event::SUBJECT_OBJECT_UPDATE; |
|
| 176 | - } else if ($eventName === '\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject') { |
|
| 177 | - $subject = Event::SUBJECT_OBJECT_DELETE; |
|
| 178 | - } |
|
| 179 | - $backend->onTouchCalendarObject( |
|
| 180 | - $subject, |
|
| 181 | - $event->getArgument('calendarData'), |
|
| 182 | - $event->getArgument('shares'), |
|
| 183 | - $event->getArgument('objectData') |
|
| 184 | - ); |
|
| 185 | - }; |
|
| 186 | - $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject', $listener); |
|
| 187 | - $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject', $listener); |
|
| 188 | - $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject', $listener); |
|
| 189 | - } |
|
| 190 | - |
|
| 191 | - public function getSyncService() { |
|
| 192 | - return $this->getContainer()->query(SyncService::class); |
|
| 193 | - } |
|
| 61 | + $container->registerCapability(Capabilities::class); |
|
| 62 | + } |
|
| 63 | + |
|
| 64 | + /** |
|
| 65 | + * @param IManager $contactsManager |
|
| 66 | + * @param string $userID |
|
| 67 | + */ |
|
| 68 | + public function setupContactsProvider(IManager $contactsManager, $userID) { |
|
| 69 | + /** @var ContactsManager $cm */ |
|
| 70 | + $cm = $this->getContainer()->query(ContactsManager::class); |
|
| 71 | + $urlGenerator = $this->getContainer()->getServer()->getURLGenerator(); |
|
| 72 | + $cm->setupContactsProvider($contactsManager, $userID, $urlGenerator); |
|
| 73 | + } |
|
| 74 | + |
|
| 75 | + public function registerHooks() { |
|
| 76 | + /** @var HookManager $hm */ |
|
| 77 | + $hm = $this->getContainer()->query(HookManager::class); |
|
| 78 | + $hm->setup(); |
|
| 79 | + |
|
| 80 | + $dispatcher = $this->getContainer()->getServer()->getEventDispatcher(); |
|
| 81 | + |
|
| 82 | + // first time login event setup |
|
| 83 | + $dispatcher->addListener(IUser::class . '::firstLogin', function ($event) use ($hm) { |
|
| 84 | + if ($event instanceof GenericEvent) { |
|
| 85 | + $hm->firstLogin($event->getSubject()); |
|
| 86 | + } |
|
| 87 | + }); |
|
| 88 | + |
|
| 89 | + // carddav/caldav sync event setup |
|
| 90 | + $listener = function($event) { |
|
| 91 | + if ($event instanceof GenericEvent) { |
|
| 92 | + /** @var BirthdayService $b */ |
|
| 93 | + $b = $this->getContainer()->query(BirthdayService::class); |
|
| 94 | + $b->onCardChanged( |
|
| 95 | + $event->getArgument('addressBookId'), |
|
| 96 | + $event->getArgument('cardUri'), |
|
| 97 | + $event->getArgument('cardData') |
|
| 98 | + ); |
|
| 99 | + } |
|
| 100 | + }; |
|
| 101 | + |
|
| 102 | + $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::createCard', $listener); |
|
| 103 | + $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $listener); |
|
| 104 | + $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', function($event) { |
|
| 105 | + if ($event instanceof GenericEvent) { |
|
| 106 | + /** @var BirthdayService $b */ |
|
| 107 | + $b = $this->getContainer()->query(BirthdayService::class); |
|
| 108 | + $b->onCardDeleted( |
|
| 109 | + $event->getArgument('addressBookId'), |
|
| 110 | + $event->getArgument('cardUri') |
|
| 111 | + ); |
|
| 112 | + } |
|
| 113 | + }); |
|
| 114 | + |
|
| 115 | + $clearPhotoCache = function($event) { |
|
| 116 | + if ($event instanceof GenericEvent) { |
|
| 117 | + /** @var PhotoCache $p */ |
|
| 118 | + $p = $this->getContainer()->query(PhotoCache::class); |
|
| 119 | + $p->delete( |
|
| 120 | + $event->getArgument('addressBookId'), |
|
| 121 | + $event->getArgument('cardUri') |
|
| 122 | + ); |
|
| 123 | + } |
|
| 124 | + }; |
|
| 125 | + $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $clearPhotoCache); |
|
| 126 | + $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', $clearPhotoCache); |
|
| 127 | + |
|
| 128 | + $dispatcher->addListener('OC\AccountManager::userUpdated', function(GenericEvent $event) { |
|
| 129 | + $user = $event->getSubject(); |
|
| 130 | + $syncService = $this->getContainer()->query(SyncService::class); |
|
| 131 | + $syncService->updateUser($user); |
|
| 132 | + }); |
|
| 133 | + |
|
| 134 | + $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendar', function(GenericEvent $event) { |
|
| 135 | + /** @var Backend $backend */ |
|
| 136 | + $backend = $this->getContainer()->query(Backend::class); |
|
| 137 | + $backend->onCalendarAdd( |
|
| 138 | + $event->getArgument('calendarData') |
|
| 139 | + ); |
|
| 140 | + }); |
|
| 141 | + $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendar', function(GenericEvent $event) { |
|
| 142 | + /** @var Backend $backend */ |
|
| 143 | + $backend = $this->getContainer()->query(Backend::class); |
|
| 144 | + $backend->onCalendarUpdate( |
|
| 145 | + $event->getArgument('calendarData'), |
|
| 146 | + $event->getArgument('shares'), |
|
| 147 | + $event->getArgument('propertyMutations') |
|
| 148 | + ); |
|
| 149 | + }); |
|
| 150 | + $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function(GenericEvent $event) { |
|
| 151 | + /** @var Backend $backend */ |
|
| 152 | + $backend = $this->getContainer()->query(Backend::class); |
|
| 153 | + $backend->onCalendarDelete( |
|
| 154 | + $event->getArgument('calendarData'), |
|
| 155 | + $event->getArgument('shares') |
|
| 156 | + ); |
|
| 157 | + }); |
|
| 158 | + $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateShares', function(GenericEvent $event) { |
|
| 159 | + /** @var Backend $backend */ |
|
| 160 | + $backend = $this->getContainer()->query(Backend::class); |
|
| 161 | + $backend->onCalendarUpdateShares( |
|
| 162 | + $event->getArgument('calendarData'), |
|
| 163 | + $event->getArgument('shares'), |
|
| 164 | + $event->getArgument('add'), |
|
| 165 | + $event->getArgument('remove') |
|
| 166 | + ); |
|
| 167 | + }); |
|
| 168 | + |
|
| 169 | + $listener = function(GenericEvent $event, $eventName) { |
|
| 170 | + /** @var Backend $backend */ |
|
| 171 | + $backend = $this->getContainer()->query(Backend::class); |
|
| 172 | + |
|
| 173 | + $subject = Event::SUBJECT_OBJECT_ADD; |
|
| 174 | + if ($eventName === '\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject') { |
|
| 175 | + $subject = Event::SUBJECT_OBJECT_UPDATE; |
|
| 176 | + } else if ($eventName === '\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject') { |
|
| 177 | + $subject = Event::SUBJECT_OBJECT_DELETE; |
|
| 178 | + } |
|
| 179 | + $backend->onTouchCalendarObject( |
|
| 180 | + $subject, |
|
| 181 | + $event->getArgument('calendarData'), |
|
| 182 | + $event->getArgument('shares'), |
|
| 183 | + $event->getArgument('objectData') |
|
| 184 | + ); |
|
| 185 | + }; |
|
| 186 | + $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject', $listener); |
|
| 187 | + $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject', $listener); |
|
| 188 | + $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject', $listener); |
|
| 189 | + } |
|
| 190 | + |
|
| 191 | + public function getSyncService() { |
|
| 192 | + return $this->getContainer()->query(SyncService::class); |
|
| 193 | + } |
|
| 194 | 194 | |
| 195 | 195 | } |
@@ -28,35 +28,35 @@ |
||
| 28 | 28 | |
| 29 | 29 | class FixBirthdayCalendarComponent implements IRepairStep { |
| 30 | 30 | |
| 31 | - /** @var IDBConnection */ |
|
| 32 | - private $connection; |
|
| 33 | - |
|
| 34 | - /** |
|
| 35 | - * FixBirthdayCalendarComponent constructor. |
|
| 36 | - * |
|
| 37 | - * @param IDBConnection $connection |
|
| 38 | - */ |
|
| 39 | - public function __construct(IDBConnection $connection) { |
|
| 40 | - $this->connection = $connection; |
|
| 41 | - } |
|
| 42 | - |
|
| 43 | - /** |
|
| 44 | - * @inheritdoc |
|
| 45 | - */ |
|
| 46 | - public function getName() { |
|
| 47 | - return 'Fix component of birthday calendars'; |
|
| 48 | - } |
|
| 49 | - |
|
| 50 | - /** |
|
| 51 | - * @inheritdoc |
|
| 52 | - */ |
|
| 53 | - public function run(IOutput $output) { |
|
| 54 | - $query = $this->connection->getQueryBuilder(); |
|
| 55 | - $updated = $query->update('calendars') |
|
| 56 | - ->set('components', $query->createNamedParameter('VEVENT')) |
|
| 57 | - ->where($query->expr()->eq('uri', $query->createNamedParameter(BirthdayService::BIRTHDAY_CALENDAR_URI))) |
|
| 58 | - ->execute(); |
|
| 59 | - |
|
| 60 | - $output->info("$updated birthday calendars updated."); |
|
| 61 | - } |
|
| 31 | + /** @var IDBConnection */ |
|
| 32 | + private $connection; |
|
| 33 | + |
|
| 34 | + /** |
|
| 35 | + * FixBirthdayCalendarComponent constructor. |
|
| 36 | + * |
|
| 37 | + * @param IDBConnection $connection |
|
| 38 | + */ |
|
| 39 | + public function __construct(IDBConnection $connection) { |
|
| 40 | + $this->connection = $connection; |
|
| 41 | + } |
|
| 42 | + |
|
| 43 | + /** |
|
| 44 | + * @inheritdoc |
|
| 45 | + */ |
|
| 46 | + public function getName() { |
|
| 47 | + return 'Fix component of birthday calendars'; |
|
| 48 | + } |
|
| 49 | + |
|
| 50 | + /** |
|
| 51 | + * @inheritdoc |
|
| 52 | + */ |
|
| 53 | + public function run(IOutput $output) { |
|
| 54 | + $query = $this->connection->getQueryBuilder(); |
|
| 55 | + $updated = $query->update('calendars') |
|
| 56 | + ->set('components', $query->createNamedParameter('VEVENT')) |
|
| 57 | + ->where($query->expr()->eq('uri', $query->createNamedParameter(BirthdayService::BIRTHDAY_CALENDAR_URI))) |
|
| 58 | + ->execute(); |
|
| 59 | + |
|
| 60 | + $output->info("$updated birthday calendars updated."); |
|
| 61 | + } |
|
| 62 | 62 | } |
@@ -33,55 +33,55 @@ |
||
| 33 | 33 | |
| 34 | 34 | class SyncBirthdayCalendar extends Command { |
| 35 | 35 | |
| 36 | - /** @var BirthdayService */ |
|
| 37 | - private $birthdayService; |
|
| 36 | + /** @var BirthdayService */ |
|
| 37 | + private $birthdayService; |
|
| 38 | 38 | |
| 39 | - /** @var IUserManager */ |
|
| 40 | - private $userManager; |
|
| 39 | + /** @var IUserManager */ |
|
| 40 | + private $userManager; |
|
| 41 | 41 | |
| 42 | - /** |
|
| 43 | - * @param IUserManager $userManager |
|
| 44 | - * @param BirthdayService $birthdayService |
|
| 45 | - */ |
|
| 46 | - function __construct(IUserManager $userManager, BirthdayService $birthdayService) { |
|
| 47 | - parent::__construct(); |
|
| 48 | - $this->birthdayService = $birthdayService; |
|
| 49 | - $this->userManager = $userManager; |
|
| 50 | - } |
|
| 42 | + /** |
|
| 43 | + * @param IUserManager $userManager |
|
| 44 | + * @param BirthdayService $birthdayService |
|
| 45 | + */ |
|
| 46 | + function __construct(IUserManager $userManager, BirthdayService $birthdayService) { |
|
| 47 | + parent::__construct(); |
|
| 48 | + $this->birthdayService = $birthdayService; |
|
| 49 | + $this->userManager = $userManager; |
|
| 50 | + } |
|
| 51 | 51 | |
| 52 | - protected function configure() { |
|
| 53 | - $this |
|
| 54 | - ->setName('dav:sync-birthday-calendar') |
|
| 55 | - ->setDescription('Synchronizes the birthday calendar') |
|
| 56 | - ->addArgument('user', |
|
| 57 | - InputArgument::OPTIONAL, |
|
| 58 | - 'User for whom the birthday calendar will be synchronized'); |
|
| 59 | - } |
|
| 52 | + protected function configure() { |
|
| 53 | + $this |
|
| 54 | + ->setName('dav:sync-birthday-calendar') |
|
| 55 | + ->setDescription('Synchronizes the birthday calendar') |
|
| 56 | + ->addArgument('user', |
|
| 57 | + InputArgument::OPTIONAL, |
|
| 58 | + 'User for whom the birthday calendar will be synchronized'); |
|
| 59 | + } |
|
| 60 | 60 | |
| 61 | - /** |
|
| 62 | - * @param InputInterface $input |
|
| 63 | - * @param OutputInterface $output |
|
| 64 | - */ |
|
| 65 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
| 66 | - $user = $input->getArgument('user'); |
|
| 67 | - if (!is_null($user)) { |
|
| 68 | - if (!$this->userManager->userExists($user)) { |
|
| 69 | - throw new \InvalidArgumentException("User <$user> in unknown."); |
|
| 70 | - } |
|
| 71 | - $output->writeln("Start birthday calendar sync for $user"); |
|
| 72 | - $this->birthdayService->syncUser($user); |
|
| 73 | - return; |
|
| 74 | - } |
|
| 75 | - $output->writeln("Start birthday calendar sync for all users ..."); |
|
| 76 | - $p = new ProgressBar($output); |
|
| 77 | - $p->start(); |
|
| 78 | - $this->userManager->callForAllUsers(function($user) use ($p) { |
|
| 79 | - $p->advance(); |
|
| 80 | - /** @var IUser $user */ |
|
| 81 | - $this->birthdayService->syncUser($user->getUID()); |
|
| 82 | - }); |
|
| 61 | + /** |
|
| 62 | + * @param InputInterface $input |
|
| 63 | + * @param OutputInterface $output |
|
| 64 | + */ |
|
| 65 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
| 66 | + $user = $input->getArgument('user'); |
|
| 67 | + if (!is_null($user)) { |
|
| 68 | + if (!$this->userManager->userExists($user)) { |
|
| 69 | + throw new \InvalidArgumentException("User <$user> in unknown."); |
|
| 70 | + } |
|
| 71 | + $output->writeln("Start birthday calendar sync for $user"); |
|
| 72 | + $this->birthdayService->syncUser($user); |
|
| 73 | + return; |
|
| 74 | + } |
|
| 75 | + $output->writeln("Start birthday calendar sync for all users ..."); |
|
| 76 | + $p = new ProgressBar($output); |
|
| 77 | + $p->start(); |
|
| 78 | + $this->userManager->callForAllUsers(function($user) use ($p) { |
|
| 79 | + $p->advance(); |
|
| 80 | + /** @var IUser $user */ |
|
| 81 | + $this->birthdayService->syncUser($user->getUID()); |
|
| 82 | + }); |
|
| 83 | 83 | |
| 84 | - $p->finish(); |
|
| 85 | - $output->writeln(''); |
|
| 86 | - } |
|
| 84 | + $p->finish(); |
|
| 85 | + $output->writeln(''); |
|
| 86 | + } |
|
| 87 | 87 | } |
@@ -31,36 +31,36 @@ |
||
| 31 | 31 | |
| 32 | 32 | class SyncSystemAddressBook extends Command { |
| 33 | 33 | |
| 34 | - /** @var SyncService */ |
|
| 35 | - private $syncService; |
|
| 34 | + /** @var SyncService */ |
|
| 35 | + private $syncService; |
|
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * @param SyncService $syncService |
|
| 39 | - */ |
|
| 40 | - function __construct(SyncService $syncService) { |
|
| 41 | - parent::__construct(); |
|
| 42 | - $this->syncService = $syncService; |
|
| 43 | - } |
|
| 37 | + /** |
|
| 38 | + * @param SyncService $syncService |
|
| 39 | + */ |
|
| 40 | + function __construct(SyncService $syncService) { |
|
| 41 | + parent::__construct(); |
|
| 42 | + $this->syncService = $syncService; |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | - protected function configure() { |
|
| 46 | - $this |
|
| 47 | - ->setName('dav:sync-system-addressbook') |
|
| 48 | - ->setDescription('Synchronizes users to the system addressbook'); |
|
| 49 | - } |
|
| 45 | + protected function configure() { |
|
| 46 | + $this |
|
| 47 | + ->setName('dav:sync-system-addressbook') |
|
| 48 | + ->setDescription('Synchronizes users to the system addressbook'); |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | - /** |
|
| 52 | - * @param InputInterface $input |
|
| 53 | - * @param OutputInterface $output |
|
| 54 | - */ |
|
| 55 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
| 56 | - $output->writeln('Syncing users ...'); |
|
| 57 | - $progress = new ProgressBar($output); |
|
| 58 | - $progress->start(); |
|
| 59 | - $this->syncService->syncInstance(function() use ($progress) { |
|
| 60 | - $progress->advance(); |
|
| 61 | - }); |
|
| 51 | + /** |
|
| 52 | + * @param InputInterface $input |
|
| 53 | + * @param OutputInterface $output |
|
| 54 | + */ |
|
| 55 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
| 56 | + $output->writeln('Syncing users ...'); |
|
| 57 | + $progress = new ProgressBar($output); |
|
| 58 | + $progress->start(); |
|
| 59 | + $this->syncService->syncInstance(function() use ($progress) { |
|
| 60 | + $progress->advance(); |
|
| 61 | + }); |
|
| 62 | 62 | |
| 63 | - $progress->finish(); |
|
| 64 | - $output->writeln(''); |
|
| 65 | - } |
|
| 63 | + $progress->finish(); |
|
| 64 | + $output->writeln(''); |
|
| 65 | + } |
|
| 66 | 66 | } |
@@ -33,53 +33,53 @@ |
||
| 33 | 33 | |
| 34 | 34 | class CreateCalendar extends Command { |
| 35 | 35 | |
| 36 | - /** @var IUserManager */ |
|
| 37 | - protected $userManager; |
|
| 36 | + /** @var IUserManager */ |
|
| 37 | + protected $userManager; |
|
| 38 | 38 | |
| 39 | - /** @var IGroupManager $groupManager */ |
|
| 40 | - private $groupManager; |
|
| 39 | + /** @var IGroupManager $groupManager */ |
|
| 40 | + private $groupManager; |
|
| 41 | 41 | |
| 42 | - /** @var \OCP\IDBConnection */ |
|
| 43 | - protected $dbConnection; |
|
| 42 | + /** @var \OCP\IDBConnection */ |
|
| 43 | + protected $dbConnection; |
|
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * @param IUserManager $userManager |
|
| 47 | - * @param IGroupManager $groupManager |
|
| 48 | - * @param IDBConnection $dbConnection |
|
| 49 | - */ |
|
| 50 | - function __construct(IUserManager $userManager, IGroupManager $groupManager, IDBConnection $dbConnection) { |
|
| 51 | - parent::__construct(); |
|
| 52 | - $this->userManager = $userManager; |
|
| 53 | - $this->groupManager = $groupManager; |
|
| 54 | - $this->dbConnection = $dbConnection; |
|
| 55 | - } |
|
| 45 | + /** |
|
| 46 | + * @param IUserManager $userManager |
|
| 47 | + * @param IGroupManager $groupManager |
|
| 48 | + * @param IDBConnection $dbConnection |
|
| 49 | + */ |
|
| 50 | + function __construct(IUserManager $userManager, IGroupManager $groupManager, IDBConnection $dbConnection) { |
|
| 51 | + parent::__construct(); |
|
| 52 | + $this->userManager = $userManager; |
|
| 53 | + $this->groupManager = $groupManager; |
|
| 54 | + $this->dbConnection = $dbConnection; |
|
| 55 | + } |
|
| 56 | 56 | |
| 57 | - protected function configure() { |
|
| 58 | - $this |
|
| 59 | - ->setName('dav:create-calendar') |
|
| 60 | - ->setDescription('Create a dav calendar') |
|
| 61 | - ->addArgument('user', |
|
| 62 | - InputArgument::REQUIRED, |
|
| 63 | - 'User for whom the calendar will be created') |
|
| 64 | - ->addArgument('name', |
|
| 65 | - InputArgument::REQUIRED, |
|
| 66 | - 'Name of the calendar'); |
|
| 67 | - } |
|
| 57 | + protected function configure() { |
|
| 58 | + $this |
|
| 59 | + ->setName('dav:create-calendar') |
|
| 60 | + ->setDescription('Create a dav calendar') |
|
| 61 | + ->addArgument('user', |
|
| 62 | + InputArgument::REQUIRED, |
|
| 63 | + 'User for whom the calendar will be created') |
|
| 64 | + ->addArgument('name', |
|
| 65 | + InputArgument::REQUIRED, |
|
| 66 | + 'Name of the calendar'); |
|
| 67 | + } |
|
| 68 | 68 | |
| 69 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
| 70 | - $user = $input->getArgument('user'); |
|
| 71 | - if (!$this->userManager->userExists($user)) { |
|
| 72 | - throw new \InvalidArgumentException("User <$user> in unknown."); |
|
| 73 | - } |
|
| 74 | - $principalBackend = new Principal( |
|
| 75 | - $this->userManager, |
|
| 76 | - $this->groupManager |
|
| 77 | - ); |
|
| 78 | - $random = \OC::$server->getSecureRandom(); |
|
| 79 | - $dispatcher = \OC::$server->getEventDispatcher(); |
|
| 69 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
| 70 | + $user = $input->getArgument('user'); |
|
| 71 | + if (!$this->userManager->userExists($user)) { |
|
| 72 | + throw new \InvalidArgumentException("User <$user> in unknown."); |
|
| 73 | + } |
|
| 74 | + $principalBackend = new Principal( |
|
| 75 | + $this->userManager, |
|
| 76 | + $this->groupManager |
|
| 77 | + ); |
|
| 78 | + $random = \OC::$server->getSecureRandom(); |
|
| 79 | + $dispatcher = \OC::$server->getEventDispatcher(); |
|
| 80 | 80 | |
| 81 | - $name = $input->getArgument('name'); |
|
| 82 | - $caldav = new CalDavBackend($this->dbConnection, $principalBackend, $this->userManager, $random, $dispatcher); |
|
| 83 | - $caldav->createCalendar("principals/users/$user", $name, []); |
|
| 84 | - } |
|
| 81 | + $name = $input->getArgument('name'); |
|
| 82 | + $caldav = new CalDavBackend($this->dbConnection, $principalBackend, $this->userManager, $random, $dispatcher); |
|
| 83 | + $caldav->createCalendar("principals/users/$user", $name, []); |
|
| 84 | + } |
|
| 85 | 85 | } |
@@ -36,43 +36,43 @@ |
||
| 36 | 36 | |
| 37 | 37 | class CreateAddressBook extends Command { |
| 38 | 38 | |
| 39 | - /** @var IUserManager */ |
|
| 40 | - private $userManager; |
|
| 39 | + /** @var IUserManager */ |
|
| 40 | + private $userManager; |
|
| 41 | 41 | |
| 42 | - /** @var CardDavBackend */ |
|
| 43 | - private $cardDavBackend; |
|
| 42 | + /** @var CardDavBackend */ |
|
| 43 | + private $cardDavBackend; |
|
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * @param IUserManager $userManager |
|
| 47 | - * @param CardDavBackend $cardDavBackend |
|
| 48 | - */ |
|
| 49 | - function __construct(IUserManager $userManager, |
|
| 50 | - CardDavBackend $cardDavBackend |
|
| 51 | - ) { |
|
| 52 | - parent::__construct(); |
|
| 53 | - $this->userManager = $userManager; |
|
| 54 | - $this->cardDavBackend = $cardDavBackend; |
|
| 55 | - } |
|
| 45 | + /** |
|
| 46 | + * @param IUserManager $userManager |
|
| 47 | + * @param CardDavBackend $cardDavBackend |
|
| 48 | + */ |
|
| 49 | + function __construct(IUserManager $userManager, |
|
| 50 | + CardDavBackend $cardDavBackend |
|
| 51 | + ) { |
|
| 52 | + parent::__construct(); |
|
| 53 | + $this->userManager = $userManager; |
|
| 54 | + $this->cardDavBackend = $cardDavBackend; |
|
| 55 | + } |
|
| 56 | 56 | |
| 57 | - protected function configure() { |
|
| 58 | - $this |
|
| 59 | - ->setName('dav:create-addressbook') |
|
| 60 | - ->setDescription('Create a dav addressbook') |
|
| 61 | - ->addArgument('user', |
|
| 62 | - InputArgument::REQUIRED, |
|
| 63 | - 'User for whom the addressbook will be created') |
|
| 64 | - ->addArgument('name', |
|
| 65 | - InputArgument::REQUIRED, |
|
| 66 | - 'Name of the addressbook'); |
|
| 67 | - } |
|
| 57 | + protected function configure() { |
|
| 58 | + $this |
|
| 59 | + ->setName('dav:create-addressbook') |
|
| 60 | + ->setDescription('Create a dav addressbook') |
|
| 61 | + ->addArgument('user', |
|
| 62 | + InputArgument::REQUIRED, |
|
| 63 | + 'User for whom the addressbook will be created') |
|
| 64 | + ->addArgument('name', |
|
| 65 | + InputArgument::REQUIRED, |
|
| 66 | + 'Name of the addressbook'); |
|
| 67 | + } |
|
| 68 | 68 | |
| 69 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
| 70 | - $user = $input->getArgument('user'); |
|
| 71 | - if (!$this->userManager->userExists($user)) { |
|
| 72 | - throw new \InvalidArgumentException("User <$user> in unknown."); |
|
| 73 | - } |
|
| 69 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
| 70 | + $user = $input->getArgument('user'); |
|
| 71 | + if (!$this->userManager->userExists($user)) { |
|
| 72 | + throw new \InvalidArgumentException("User <$user> in unknown."); |
|
| 73 | + } |
|
| 74 | 74 | |
| 75 | - $name = $input->getArgument('name'); |
|
| 76 | - $this->cardDavBackend->createAddressBook("principals/users/$user", $name, []); |
|
| 77 | - } |
|
| 75 | + $name = $input->getArgument('name'); |
|
| 76 | + $this->cardDavBackend->createAddressBook("principals/users/$user", $name, []); |
|
| 77 | + } |
|
| 78 | 78 | } |
@@ -26,11 +26,11 @@ |
||
| 26 | 26 | |
| 27 | 27 | class Capabilities implements ICapability { |
| 28 | 28 | |
| 29 | - public function getCapabilities() { |
|
| 30 | - return [ |
|
| 31 | - 'dav' => [ |
|
| 32 | - 'chunking' => '1.0', |
|
| 33 | - ] |
|
| 34 | - ]; |
|
| 35 | - } |
|
| 29 | + public function getCapabilities() { |
|
| 30 | + return [ |
|
| 31 | + 'dav' => [ |
|
| 32 | + 'chunking' => '1.0', |
|
| 33 | + ] |
|
| 34 | + ]; |
|
| 35 | + } |
|
| 36 | 36 | } |
@@ -31,78 +31,78 @@ |
||
| 31 | 31 | use Sabre\DAV\ServerPlugin; |
| 32 | 32 | |
| 33 | 33 | class BrowserErrorPagePlugin extends ServerPlugin { |
| 34 | - /** @var Server */ |
|
| 35 | - private $server; |
|
| 34 | + /** @var Server */ |
|
| 35 | + private $server; |
|
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * This initializes the plugin. |
|
| 39 | - * |
|
| 40 | - * This function is called by Sabre\DAV\Server, after |
|
| 41 | - * addPlugin is called. |
|
| 42 | - * |
|
| 43 | - * This method should set up the required event subscriptions. |
|
| 44 | - * |
|
| 45 | - * @param Server $server |
|
| 46 | - * @return void |
|
| 47 | - */ |
|
| 48 | - function initialize(Server $server) { |
|
| 49 | - $this->server = $server; |
|
| 50 | - $server->on('exception', array($this, 'logException'), 1000); |
|
| 51 | - } |
|
| 37 | + /** |
|
| 38 | + * This initializes the plugin. |
|
| 39 | + * |
|
| 40 | + * This function is called by Sabre\DAV\Server, after |
|
| 41 | + * addPlugin is called. |
|
| 42 | + * |
|
| 43 | + * This method should set up the required event subscriptions. |
|
| 44 | + * |
|
| 45 | + * @param Server $server |
|
| 46 | + * @return void |
|
| 47 | + */ |
|
| 48 | + function initialize(Server $server) { |
|
| 49 | + $this->server = $server; |
|
| 50 | + $server->on('exception', array($this, 'logException'), 1000); |
|
| 51 | + } |
|
| 52 | 52 | |
| 53 | - /** |
|
| 54 | - * @param IRequest $request |
|
| 55 | - * @return bool |
|
| 56 | - */ |
|
| 57 | - public static function isBrowserRequest(IRequest $request) { |
|
| 58 | - if ($request->getMethod() !== 'GET') { |
|
| 59 | - return false; |
|
| 60 | - } |
|
| 61 | - return $request->isUserAgent([ |
|
| 62 | - Request::USER_AGENT_IE, |
|
| 63 | - Request::USER_AGENT_MS_EDGE, |
|
| 64 | - Request::USER_AGENT_CHROME, |
|
| 65 | - Request::USER_AGENT_FIREFOX, |
|
| 66 | - Request::USER_AGENT_SAFARI, |
|
| 67 | - ]); |
|
| 68 | - } |
|
| 53 | + /** |
|
| 54 | + * @param IRequest $request |
|
| 55 | + * @return bool |
|
| 56 | + */ |
|
| 57 | + public static function isBrowserRequest(IRequest $request) { |
|
| 58 | + if ($request->getMethod() !== 'GET') { |
|
| 59 | + return false; |
|
| 60 | + } |
|
| 61 | + return $request->isUserAgent([ |
|
| 62 | + Request::USER_AGENT_IE, |
|
| 63 | + Request::USER_AGENT_MS_EDGE, |
|
| 64 | + Request::USER_AGENT_CHROME, |
|
| 65 | + Request::USER_AGENT_FIREFOX, |
|
| 66 | + Request::USER_AGENT_SAFARI, |
|
| 67 | + ]); |
|
| 68 | + } |
|
| 69 | 69 | |
| 70 | - /** |
|
| 71 | - * @param \Exception $ex |
|
| 72 | - */ |
|
| 73 | - public function logException(\Exception $ex) { |
|
| 74 | - if ($ex instanceof Exception) { |
|
| 75 | - $httpCode = $ex->getHTTPCode(); |
|
| 76 | - $headers = $ex->getHTTPHeaders($this->server); |
|
| 77 | - } else { |
|
| 78 | - $httpCode = 500; |
|
| 79 | - $headers = []; |
|
| 80 | - } |
|
| 81 | - $this->server->httpResponse->addHeaders($headers); |
|
| 82 | - $this->server->httpResponse->setStatus($httpCode); |
|
| 83 | - $body = $this->generateBody(); |
|
| 84 | - $this->server->httpResponse->setBody($body); |
|
| 85 | - $this->sendResponse(); |
|
| 86 | - } |
|
| 70 | + /** |
|
| 71 | + * @param \Exception $ex |
|
| 72 | + */ |
|
| 73 | + public function logException(\Exception $ex) { |
|
| 74 | + if ($ex instanceof Exception) { |
|
| 75 | + $httpCode = $ex->getHTTPCode(); |
|
| 76 | + $headers = $ex->getHTTPHeaders($this->server); |
|
| 77 | + } else { |
|
| 78 | + $httpCode = 500; |
|
| 79 | + $headers = []; |
|
| 80 | + } |
|
| 81 | + $this->server->httpResponse->addHeaders($headers); |
|
| 82 | + $this->server->httpResponse->setStatus($httpCode); |
|
| 83 | + $body = $this->generateBody(); |
|
| 84 | + $this->server->httpResponse->setBody($body); |
|
| 85 | + $this->sendResponse(); |
|
| 86 | + } |
|
| 87 | 87 | |
| 88 | - /** |
|
| 89 | - * @codeCoverageIgnore |
|
| 90 | - * @return bool|string |
|
| 91 | - */ |
|
| 92 | - public function generateBody() { |
|
| 93 | - $request = \OC::$server->getRequest(); |
|
| 94 | - $content = new OC_Template('dav', 'exception', 'guest'); |
|
| 95 | - $content->assign('title', $this->server->httpResponse->getStatusText()); |
|
| 96 | - $content->assign('remoteAddr', $request->getRemoteAddress()); |
|
| 97 | - $content->assign('requestID', $request->getId()); |
|
| 98 | - return $content->fetchPage(); |
|
| 99 | - } |
|
| 88 | + /** |
|
| 89 | + * @codeCoverageIgnore |
|
| 90 | + * @return bool|string |
|
| 91 | + */ |
|
| 92 | + public function generateBody() { |
|
| 93 | + $request = \OC::$server->getRequest(); |
|
| 94 | + $content = new OC_Template('dav', 'exception', 'guest'); |
|
| 95 | + $content->assign('title', $this->server->httpResponse->getStatusText()); |
|
| 96 | + $content->assign('remoteAddr', $request->getRemoteAddress()); |
|
| 97 | + $content->assign('requestID', $request->getId()); |
|
| 98 | + return $content->fetchPage(); |
|
| 99 | + } |
|
| 100 | 100 | |
| 101 | - /** |
|
| 102 | - * @codeCoverageIgnore |
|
| 103 | - */ |
|
| 104 | - public function sendResponse() { |
|
| 105 | - $this->server->sapi->sendResponse($this->server->httpResponse); |
|
| 106 | - exit(); |
|
| 107 | - } |
|
| 101 | + /** |
|
| 102 | + * @codeCoverageIgnore |
|
| 103 | + */ |
|
| 104 | + public function sendResponse() { |
|
| 105 | + $this->server->sapi->sendResponse($this->server->httpResponse); |
|
| 106 | + exit(); |
|
| 107 | + } |
|
| 108 | 108 | } |