diff options
| author | Jannik Schönartz | 2017-03-01 15:39:01 +0100 |
|---|---|---|
| committer | Jannik Schönartz | 2017-03-01 15:39:01 +0100 |
| commit | 6e2f73259c80a31325cd9ce5e22ba990daa2b9bb (patch) | |
| tree | 524fa447f584b399015136a6d481f859744c8a4e /modules-available/locationinfo/api.inc.php | |
| parent | Bugfixes (diff) | |
| download | slx-admin-6e2f73259c80a31325cd9ce5e22ba990daa2b9bb.tar.gz slx-admin-6e2f73259c80a31325cd9ce5e22ba990daa2b9bb.tar.xz slx-admin-6e2f73259c80a31325cd9ce5e22ba990daa2b9bb.zip | |
API: Fixed Calendar function.
Diffstat (limited to 'modules-available/locationinfo/api.inc.php')
| -rw-r--r-- | modules-available/locationinfo/api.inc.php | 12 |
1 files changed, 10 insertions, 2 deletions
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); |