From 219b45bbde5ef281f12216f88006f8db7c8f238f Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 4 Dec 2023 16:24:21 +0100 Subject: [roomplanner] Fix invalid array key access --- modules-available/roomplanner/page.inc.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules-available/roomplanner/page.inc.php b/modules-available/roomplanner/page.inc.php index 6708cd8a..902df139 100644 --- a/modules-available/roomplanner/page.inc.php +++ b/modules-available/roomplanner/page.inc.php @@ -83,10 +83,12 @@ class Page_Roomplanner extends Page FROM location_roomplan WHERE locationid = :locationid', ['locationid' => $this->locationid]); if ($config === false) { - $config = ['dedicatedmgr' => false, 'managerip' => '']; + $config = ['managerip' => '', 'tutoruuid' => '']; } $runmode = RunMode::getForMode(Page::getModule(), $this->locationid, true); - if (!empty($runmode)) { + if (empty($runmode)) { + $config['dedicatedmgr'] = false; + } else { $runmode = array_pop($runmode); $config['managerip'] = $runmode['clientip']; $config['manageruuid'] = $runmode['machineuuid']; @@ -95,7 +97,7 @@ class Page_Roomplanner extends Page } $furniture = $this->getFurniture($config); $subnetMachines = $this->getPotentialMachines(); - $machinesOnPlan = $this->getMachinesOnPlan($config['tutoruuid'] ?? ''); + $machinesOnPlan = $this->getMachinesOnPlan($config['tutoruuid']); $roomConfig = array_merge($furniture, $machinesOnPlan); $canEdit = User::hasPermission('edit', $this->locationid); $params = [ -- cgit v1.2.3-55-g7522