[locationinfo] Fix type errors, missing argument

2 files changed, 3 insertions, 3 deletions

diff --git a/modules-available/locationinfo/inc/coursebackend.inc.php b/modules-available/locationinfo/inc/coursebackend.inc.php
index fe805b9c..ec48db96 100644
--- a/modules-available/locationinfo/inc/coursebackend.inc.php
+++ b/modules-available/locationinfo/inc/coursebackend.inc.php
@@ -193,7 +193,7 @@ abstract class CourseBackend
 		$requestedLocationIds = array_values($requestedLocationIds);
 		$NOW = time();
 		$locationData = Database::queryAll("SELECT locationid, calendar, serverlocationid, lastcalendarupdate
-				FROM locationinfo_locationconfig WHERE locationid IN (:locations)",
+				FROM locationinfo_locationconfig WHERE locationid IN (:locations) AND serverlocationid IS NOT NULL",
 				array('locations' => $requestedLocationIds));
 		$returnValue = [];
 		$remoteIds = [];
diff --git a/modules-available/locationinfo/inc/coursebackend/coursebackend_davinci.inc.php b/modules-available/locationinfo/inc/coursebackend/coursebackend_davinci.inc.php
index 1d42f0bc..abef9009 100644
--- a/modules-available/locationinfo/inc/coursebackend/coursebackend_davinci.inc.php
+++ b/modules-available/locationinfo/inc/coursebackend/coursebackend_davinci.inc.php
@@ -32,7 +32,7 @@ class CourseBackend_Davinci extends CourseBackend
 		}
 		$startDate = new DateTime('today 0:00');
 		$endDate = new DateTime('+7 days 0:00');
-		$data = $this->fetchRoomRaw('someroomid123', $startDate, $endDate);
+		$data = $this->fetchRoomRaw('someroomid123', $startDate, $endDate, 30);
 		if ($data !== false && strpos($data, 'DAVINCI SERVER') === false) {
 			$this->addError("Unknown reply; this doesn't seem to be a DAVINCI server.", true);
 			return false;
@@ -108,7 +108,7 @@ class CourseBackend_Davinci extends CourseBackend
 			$timeout = ($deadline ?? PHP_INT_MAX) - time();
 			if ($timeout <= 1)
 				break;
-			$return = $this->fetchRoomRaw($roomId, $startDate, $endDate, $deadline);
+			$return = $this->fetchRoomRaw($roomId, $startDate, $endDate, $timeout);
 			if ($return === false) {
 				continue;
 			}