From 1c6f666bbfc46b9092312c81f82a5e0cbe59fc18 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Fri, 24 Aug 2018 15:21:04 +0200 Subject: adjust Calendar resource / room interfaces to use class implementation Signed-off-by: Georg Ehrke --- .../UpdateCalendarResourcesRoomsBackgroundJob.php | 32 ++++++++++++++++------ 1 file changed, 24 insertions(+), 8 deletions(-) (limited to 'apps') diff --git a/apps/dav/lib/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJob.php b/apps/dav/lib/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJob.php index c5f8f6586e9..3a9e3def05d 100644 --- a/apps/dav/lib/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJob.php +++ b/apps/dav/lib/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJob.php @@ -113,8 +113,12 @@ class UpdateCalendarResourcesRoomsBackgroundJob extends TimedJob { foreach($sortedResources['new'] as $backendId => $newResources) { foreach ($newResources as $newResource) { - $resource = $this->resourceManager->getBackend($backendId) - ->getResource($newResource); + $backend = $this->resourceManager->getBackend($backendId); + if ($backend === null) { + continue; + } + + $resource = $backend->getResource($newResource); $this->addToCache($this->resourceDbTable, $resource); } } @@ -126,8 +130,12 @@ class UpdateCalendarResourcesRoomsBackgroundJob extends TimedJob { } foreach($sortedResources['edited'] as $backendId => $editedResources) { foreach ($editedResources as $editedResource) { - $resource = $this->resourceManager->getBackend($backendId) - ->getResource($editedResource); + $backend = $this->resourceManager->getBackend($backendId); + if ($backend === null) { + continue; + } + + $resource = $backend->getResource($editedResource); $this->updateCache($this->resourceDbTable, $resource); } } @@ -157,8 +165,12 @@ class UpdateCalendarResourcesRoomsBackgroundJob extends TimedJob { foreach($sortedRooms['new'] as $backendId => $newRooms) { foreach ($newRooms as $newRoom) { - $resource = $this->roomManager->getBackend($backendId) - ->getRoom($newRoom); + $backend = $this->roomManager->getBackend($backendId); + if ($backend === null) { + continue; + } + + $resource = $backend->getRoom($newRoom); $this->addToCache($this->roomDbTable, $resource); } } @@ -170,8 +182,12 @@ class UpdateCalendarResourcesRoomsBackgroundJob extends TimedJob { } foreach($sortedRooms['edited'] as $backendId => $editedRooms) { foreach ($editedRooms as $editedRoom) { - $resource = $this->roomManager->getBackend($backendId) - ->getRoom($editedRoom); + $backend = $this->roomManager->getBackend($backendId); + if ($backend === null) { + continue; + } + + $resource = $backend->getRoom($editedRoom); $this->updateCache($this->roomDbTable, $resource); } } -- cgit v1.2.3