From 69bb1bb4e9694a62198fd8f0c84abda5c916258f Mon Sep 17 00:00:00 2001
From: Zack Spear <hi@zackspear.com>
Date: Fri, 4 Dec 2020 11:42:51 -0800
Subject: [PATCH] improve: state.php ensure UPC in consistent state

---
 dynamix.unraid.net.plg | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/dynamix.unraid.net.plg b/dynamix.unraid.net.plg
index c66924609..4bddbae2a 100644
--- a/dynamix.unraid.net.plg
+++ b/dynamix.unraid.net.plg
@@ -77,23 +77,19 @@ $key_contents = str_replace(['+','/','='], ['-','_',''], trim(base64_encode(@fil
 if (file_exists('/boot/config/plugins/dynamix/dynamix.cfg')) {
   extract(parse_ini_file('/boot/config/plugins/dynamix/dynamix.cfg',true));
 }
-if (empty($remote)) {
-  $remote = [
-    "apikey" => "",
-    "username" => "",
-    "avatar" => "",
-    "wanaccess" => "no",
-    "wanport" => "443"
-  ];
-}
-if (empty($remote['username'])) {
-  $remote['username'] = '';
-}
-if (empty($remote['avatar'])) {
-  $remote['avatar'] = '';
-}
 
 $arr = [];
+if (empty($remote['apikey']) || empty($var['regFILE']) || empty($remote['username']) || empty($remote['avatar'])) {
+  $arr['registered'] = 0;
+  $arr['username'] = '';
+  $arr['avatar'] = '';
+  $arr['apikey'] = '';
+} else {
+  $arr['registered'] = 1;
+  $arr['username'] = $remote['username'];
+  $arr['avatar'] = $remote['avatar'];
+  $arr['apikey'] = $remote['apikey'];
+}
 $arr['event'] = 'STATE';
 $arr['ts'] = time();
 $arr['deviceCount'] = $var['deviceCount'];
@@ -108,11 +104,7 @@ $arr['serverip'] = $_SERVER['SERVER_ADDR'];
 $arr['internalip'] = $_SERVER['SERVER_ADDR'];
 $arr['internalport'] = $_SERVER['SERVER_PORT'];
 $arr['protocol'] = $_SERVER['REQUEST_SCHEME'];
-$arr['registered'] = empty($remote['apikey']) || empty($var['regFILE']) ? 0 : 1;
-$arr['username'] = $remote['username'];
-$arr['avatar'] = $remote['avatar'];
 $arr['locale'] = $_SESSION['locale'] ? $_SESSION['locale'] : 'en_US';
-$arr['apikey'] = $remote['apikey'];
 
 echo json_encode($arr);
 ?>