From 4e39862628cf5b59f5c8d91f11070edd90b4a818 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 1 Dec 2017 18:58:16 +0100
Subject: Fix several PHP notices about undefined indexes, variables,
 not-arrays

---
 modules-available/roomplanner/baseconfig/getconfig.inc.php | 3 +++
 modules-available/roomplanner/inc/pvsgenerator.inc.php     | 3 +--
 modules-available/roomplanner/page.inc.php                 | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 modules-available/roomplanner/baseconfig/getconfig.inc.php

(limited to 'modules-available/roomplanner')

diff --git a/modules-available/roomplanner/baseconfig/getconfig.inc.php b/modules-available/roomplanner/baseconfig/getconfig.inc.php
new file mode 100644
index 00000000..f4708547
--- /dev/null
+++ b/modules-available/roomplanner/baseconfig/getconfig.inc.php
@@ -0,0 +1,3 @@
+<?php
+
+ConfigHolder::add("SLX_PVS_CONFIG_URL", 'http://' . $_SERVER['SERVER_ADDR'] . $_SERVER['SCRIPT_NAME'] . '?do=roomplanner');
diff --git a/modules-available/roomplanner/inc/pvsgenerator.inc.php b/modules-available/roomplanner/inc/pvsgenerator.inc.php
index 6df7c10e..292441d4 100644
--- a/modules-available/roomplanner/inc/pvsgenerator.inc.php
+++ b/modules-available/roomplanner/inc/pvsgenerator.inc.php
@@ -59,7 +59,7 @@ class PvsGenerator
 			if (is_null($room['notnull']) || isset($room['skip'])) // Not leaf
 				continue;
 			if (Module::isAvailable('runmode')) {
-				$pc = RunMode::getForMode('roomplanner', $room['locationid']);
+				$pc = RunMode::getForMode('roomplanner', $room['locationid'], true);
 				if (!empty($pc)) {
 					$pc = array_pop($pc);
 					$room['managerip'] = $pc['clientip'];
@@ -219,7 +219,6 @@ class PvsGenerator
 		if (!is_array($data)) {
 			$data = array();
 		}
-		ConfigHolder::add("SLX_PVS_CONFIG_URL", 'http://' . $_SERVER['SERVER_ADDR'] . $_SERVER['SCRIPT_NAME'] . '?do=roomplanner');
 
 		if (isset($data['dedicatedmgr']) && $data['dedicatedmgr']) {
 			ConfigHolder::add("SLX_ADDONS", false, 100000);
diff --git a/modules-available/roomplanner/page.inc.php b/modules-available/roomplanner/page.inc.php
index bae9db7b..764d5cdb 100644
--- a/modules-available/roomplanner/page.inc.php
+++ b/modules-available/roomplanner/page.inc.php
@@ -248,10 +248,11 @@ class Page_Roomplanner extends Page
 
 	protected function getFurniture($config)
 	{
-		if ($config === false) {
+		if ($config === false)
 			return array();
-		}
 		$config = json_decode($config['roomplan'], true);
+		if (!is_array($config))
+			return array();
 		return $config;
 	}
 
-- 
cgit v1.2.3-55-g7522