From 270943e388c1ce5d8a04c3f2e87743ded29a4726 Mon Sep 17 00:00:00 2001
From: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
Date: Wed, 23 Sep 2015 16:54:39 +0200
Subject: [PATCH] Added JSON Response handling to PHP software

Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
---
 webfrontend/index.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/webfrontend/index.php b/webfrontend/index.php
index 60e9ba1..4aa85e7 100644
--- a/webfrontend/index.php
+++ b/webfrontend/index.php
@@ -1,5 +1,5 @@
 <?php
-	function tellLock( $pCommand, $pUser, $pPass, $pToken, $pIp ){
+	function tellLock($pCommand, $pUser, $pPass, $pToken, $pIp){
 
 		$json = '{
 			"user":' . json_encode( $pUser ) . ',
@@ -98,13 +98,15 @@
 				$isApi = true;
 			}
 	
-			$lSuccess = tellLock($pCommand, $pUser, $pPass, $pToken, $pIp);
-	
-			if ($lSuccess == 0) {
-				$showSuccess = true;
-			} else {
-				$failureMsg = err2str($lSuccess);
+			$jsonResponse = json_decode(tellLock($pCommand, $pUser, $pPass, $pToken, $pIp), true);
+			if ($jsonResponse == null || !isset($jsonResponse['message']) || !isset($jsonResponse['code'])) {
 				$showFailure = true;
+				$failureMsg = 'Error parsing JSON response';
+			} else {
+				$failureMsg = $jsonResponse['message'];
+				$code = $jsonResponse['code'];
+				$showSuccess = ($code == 0);
+				$showFailure = !$showSuccess;
 			}
 		} else {
 			$failureMsg = 'Invalid Request';
@@ -198,6 +200,6 @@ if ($isApi == false) {
 </html>
 <?php
 } else {
-	echo $lSuccess;
+	echo $code;
 }
 ?>