From 6e2f73259c80a31325cd9ce5e22ba990daa2b9bb Mon Sep 17 00:00:00 2001
From: Jannik Schönartz
Date: Wed, 1 Mar 2017 15:39:01 +0100
Subject: API: Fixed Calendar function.

---
 modules-available/locationinfo/api.inc.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'modules-available/locationinfo/api.inc.php')

diff --git a/modules-available/locationinfo/api.inc.php b/modules-available/locationinfo/api.inc.php
index e04e7e65..1b4f9d59 100644
--- a/modules-available/locationinfo/api.inc.php
+++ b/modules-available/locationinfo/api.inc.php
@@ -90,8 +90,16 @@ function getCalendar($idList) {
 	foreach ($serverList as $server) {
 		$serverInstance = CourseBackend::getInstance($server['type']);
 		$serverInstance->setCredentials(json_encode($server['credentials']), $server['serverurl'], $server['serverid']);
-		$calendarFromBackend = json_decode($serverInstance->fetchSchedule($server['idList']), true);
-		$resultarray = array_merge($resultarray, $calendarFromBackend);
+		$calendarFromBackend = $serverInstance->fetchSchedule($server['idList']);
+
+		$formattedArray = array();
+		foreach ($calendarFromBackend as $key => $value) {
+			$y['id'] = $key;
+			$y['calendar'] = $value;
+			$formattedArray[] = $y;
+		}
+
+		$resultarray = array_merge($resultarray, $formattedArray);
 	}
 
 	echo json_encode($resultarray, true);
-- 
cgit v1.2.3-55-g7522