[inc/User] Fix access to Page if class is not loaded

3 files changed, 32 insertions, 20 deletions

diff --git a/modules-available/locationinfo/inc/coursebackend/coursebackend_hisinone.inc.php b/modules-available/locationinfo/inc/coursebackend/coursebackend_hisinone.inc.php
index 558f5cd0..3b26e625 100644
--- a/modules-available/locationinfo/inc/coursebackend/coursebackend_hisinone.inc.php
+++ b/modules-available/locationinfo/inc/coursebackend/coursebackend_hisinone.inc.php
@@ -274,8 +274,7 @@ class CourseBackend_HisInOne extends CourseBackend
 		foreach ($eventDetails as $event) {
 			foreach (array('/hisdefaulttext',
 							'/hisshorttext',
-							'/hisshortcomment',
-							'/hisplanelements/hisplanelement/hisdefaulttext') as $path) {
+							'/hisshortcomment') as $path) {
 				$name = $this->getArrayPath($event, $path);
 				if (!empty($name) && !empty($name[0]))
 					break;
@@ -284,25 +283,38 @@ class CourseBackend_HisInOne extends CourseBackend
 			if ($name === false) {
 				$name = ['???'];
 			}
-			$unitPlannedDates = $this->getArrayPath($event,
-				'/hisplanelements/hisplanelement/hisplannedDates/hisplannedDate/hisindividualDates/hisindividualDate');
-			if ($unitPlannedDates === false) {
-				$this->error = 'Cannot find ./hisplanelements/hisplanelement/hisplannedDates/hisplannedDate/hisindividualDates/hisindividualDate';
-				error_log('Cannot find ./hisplanelements/hisplanelement/hisplannedDates/hisplannedDate/hisindividualDates/hisindividualDate');
+			$planElements = $this->getArrayPath($event, '/hisplanelements/hisplanelement');
+			if ($planElements === false) {
+				$this->error = 'Cannot find ./hisplanelements/hisplanelement';
+				error_log('Cannot find ./hisplanelements/hisplanelement');
 				error_log(print_r($event, true));
 				continue;
 			}
-			foreach ($unitPlannedDates as $plannedDate) {
-				$eventRoomId = $this->getArrayPath($plannedDate, '/hisroomId')[0];
-				$eventDate = $this->getArrayPath($plannedDate, '/hisexecutiondate')[0];
-				if (in_array($eventRoomId, $requestedRoomIds) && in_array($eventDate, $currentWeek)) {
-					$startTime = $this->getArrayPath($plannedDate, '/hisstarttime')[0];
-					$endTime = $this->getArrayPath($plannedDate, '/hisendtime')[0];
-					$tTables[$eventRoomId][] = array(
-						'title' => $name[0],
-						'start' => $eventDate . "T" . $startTime,
-						'end' => $eventDate . "T" . $endTime
-					);
+			foreach ($planElements as $planElement) {
+				$unitPlannedDates = $this->getArrayPath($planElement,
+					'/hisplannedDates/hisplannedDate/hisindividualDates/hisindividualDate');
+				if ($unitPlannedDates === false) {
+					$this->error = 'Cannot find ./hisplannedDates/hisplannedDate/hisindividualDates/hisindividualDate';
+					error_log('Cannot find ./hisplannedDates/hisplannedDate/hisindividualDates/hisindividualDate');
+					error_log(print_r($planElement, true));
+					continue;
+				}
+				$localName = $this->getArrayPath($planElement, '/hisdefaulttext');
+				if ($localName === false || empty($localName[0])) {
+					$localName = $name;
+				}
+				foreach ($unitPlannedDates as $plannedDate) {
+					$eventRoomId = $this->getArrayPath($plannedDate, '/hisroomId')[0];
+					$eventDate = $this->getArrayPath($plannedDate, '/hisexecutiondate')[0];
+					if (in_array($eventRoomId, $requestedRoomIds) && in_array($eventDate, $currentWeek)) {
+						$startTime = $this->getArrayPath($plannedDate, '/hisstarttime')[0];
+						$endTime = $this->getArrayPath($plannedDate, '/hisendtime')[0];
+						$tTables[$eventRoomId][] = array(
+							'title' => $localName[0],
+							'start' => $eventDate . "T" . $startTime,
+							'end' => $eventDate . "T" . $endTime
+						);
+					}
 				}
 			}
 		}
diff --git a/modules-available/locationinfo/lang/de/template-tags.json b/modules-available/locationinfo/lang/de/template-tags.json
index bcdf7148..b51c420b 100644
--- a/modules-available/locationinfo/lang/de/template-tags.json
+++ b/modules-available/locationinfo/lang/de/template-tags.json
@@ -76,7 +76,7 @@
     "lang_remoteSchedule": "Abruf Belegungsplan",
     "lang_room": "Raum",
     "lang_roomId": "Raum ID",
-    "lang_roomIdTooltip": "Die Raum ID, die der Server ben\u00f6tigt, um Kalenderdaten abzurufen",
+    "lang_roomIdTooltip": "Die Raum ID, die der Server ben\u00f6tigt, um Kalenderdaten abzurufen (bei Exchange die Postfachadresse)",
     "lang_roomupdateTooltip": "Zeit nach der die PCs aktualisiert werden (in Sekunden)",
     "lang_rotation": "Rotation",
     "lang_rotation0": "0\u00b0",
diff --git a/modules-available/locationinfo/lang/en/template-tags.json b/modules-available/locationinfo/lang/en/template-tags.json
index 558ddff0..f041dc0a 100644
--- a/modules-available/locationinfo/lang/en/template-tags.json
+++ b/modules-available/locationinfo/lang/en/template-tags.json
@@ -76,7 +76,7 @@
     "lang_remoteSchedule": "Time table retrieval",
     "lang_room": "Room",
     "lang_roomId": "Room ID",
-    "lang_roomIdTooltip": "The ID of the room the server needs, for querying the calendar data",
+    "lang_roomIdTooltip": "The ID of the room the server needs, for querying the calendar data (when using exchange the room mailbox)",
     "lang_roomupdateTooltip": "Time the PCs in the room gets updated (in seconds)",
     "lang_rotation": "Rotation",
     "lang_rotation0": "0\u00b0",