From 4d31261bade95e74cf7a0edd88658fa7d915f46b Mon Sep 17 00:00:00 2001
From: Jannik Schönartz
Date: Tue, 7 Mar 2017 00:41:32 +0100
Subject: API: Moved all echo command in the Handle Parameters function.

---
 modules-available/locationinfo/api.inc.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 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) {
-- 
cgit v1.2.3-55-g7522