From 4bed14f0932eef96f3b9625b6ff3f52e75dff001 Mon Sep 17 00:00:00 2001 From: mkuba50 Date: Mon, 2 Oct 2017 17:30:10 +0200 Subject: [PATCH] Split update info parsing to 2 functions --- shared/main.php | 2 +- updateinfo.php | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/shared/main.php b/shared/main.php index 96eed80..fd69283 100644 --- a/shared/main.php +++ b/shared/main.php @@ -16,7 +16,7 @@ limitations under the License. */ function uupApiVersion() { - return '0.6.1-beta'; + return '0.7.0-beta'; } function uupApiPrintBrand() { diff --git a/updateinfo.php b/updateinfo.php index d0495c6..95171c3 100644 --- a/updateinfo.php +++ b/updateinfo.php @@ -26,6 +26,22 @@ function uupUpdateInfo($updateId, $onlyInfo = 0) { $info = json_decode($info, true); + $parsedInfo = uupParseUpdateInfo($info, $onlyInfo); + if(isset($parsedInfo['error'])) { + return $parsedInfo['error']; + } + + return array( + 'apiVersion' => uupApiVersion(), + 'info' => $parsedInfo['info'], + ); +} + +function uupParseUpdateInfo($info, $onlyInfo = 0) { + if(empty($info)) { + return array('error' => 'UPDATE_INFORMATION_NOT_EXISTS'); + } + if($onlyInfo) { if(isset($info[$onlyInfo])) { $returnInfo = $info[$onlyInfo];