diff options
| author | Michael Scherle | 2017-03-07 00:49:29 +0100 |
|---|---|---|
| committer | Michael Scherle | 2017-03-07 00:49:29 +0100 |
| commit | d8740a439050aa63723c1c2d0a7466f20dafc3c0 (patch) | |
| tree | 6512998129ae83d7fb4cb633a7b34b7cdc724b4b /modules-available/locationinfo/api.inc.php | |
| parent | frontend: fixed scaling issue when there was only one pc (diff) | |
| parent | API: Moved all echo command in the Handle Parameters function. (diff) | |
| download | slx-admin-d8740a439050aa63723c1c2d0a7466f20dafc3c0.tar.gz slx-admin-d8740a439050aa63723c1c2d0a7466f20dafc3c0.tar.xz slx-admin-d8740a439050aa63723c1c2d0a7466f20dafc3c0.zip | |
Merge branch 'location-info-panel' of git.openslx.org:openslx-ng/slx-admin into location-info-panel
Diffstat (limited to 'modules-available/locationinfo/api.inc.php')
| -rw-r--r-- | modules-available/locationinfo/api.inc.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules-available/locationinfo/api.inc.php b/modules-available/locationinfo/api.inc.php index ff3c7269..45e48064 100644 --- a/modules-available/locationinfo/api.inc.php +++ b/modules-available/locationinfo/api.inc.php @@ -26,11 +26,11 @@ function HandleParameters() { echo getPcStates($array); } elseif ($getAction == "roomtree") { $roomIDS = Request::get('id', 0, 'string'); - getRoomTree($roomIDS); + echo getRoomTree($roomIDS); } elseif ($getAction == "calendar") { $roomIDs = Request::get('id', 0, 'string'); $array = getMultipleInformations($roomIDs); - getCalendar($array); + echo getCalendar($array); } } @@ -100,7 +100,7 @@ function getCalendar($idList) { $resultarray = array_merge($resultarray, $formattedArray); } - echo json_encode($resultarray, true); + return json_encode($resultarray, true); } // ########## </Calendar> ########## @@ -239,7 +239,7 @@ function getRoomTree($ids) { } } - echo json_encode($roomTree); + return json_encode($roomTree); } function getChildsRecursive($id, &$filteredIdList) { |