diff --git a/_data/serverState.ts b/_data/serverState.ts index 4155b430f..e5959f80a 100644 --- a/_data/serverState.ts +++ b/_data/serverState.ts @@ -29,7 +29,7 @@ const blacklistedGuid = '154B-00EE-0700-9B50CF819816'; // EBLACKLISTED1 // EBLACKLISTED2 // ENOCONN -const state: string = 'BASIC'; +const state: string = 'EGUID'; const uptime = Date.now() - 60 * 60 * 1000; // 1 hour ago let expireTime = 0; @@ -55,7 +55,7 @@ const serverState = { "license": "", "locale": "en_US", "name": "fuji", - "pluginInstalled": "dynamix.unraid.net.staging.plg", + "connectPluginInstalled": "dynamix.unraid.net.staging.plg", "registered": false, "regGen": 0, // "regGuid": "0781-5583-8355-81071A2B0211", diff --git a/_webGui/testWebComponents.page b/_webGui/testWebComponents.page index 4d955f5a3..33af24446 100644 --- a/_webGui/testWebComponents.page +++ b/_webGui/testWebComponents.page @@ -54,21 +54,21 @@ $flashbackup_status = (file_exists($flashbackup_ini)) ? @parse_ini_file($flashba $nginx = parse_ini_file('/var/local/emhttp/nginx.ini'); -$pluginInstalled = ''; +$connectPluginInstalled = ''; if (!file_exists('/var/lib/pkgtools/packages/dynamix.unraid.net') && !file_exists('/var/lib/pkgtools/packages/dynamix.unraid.net.staging')) { - $pluginInstalled = ''; // base OS only, plugin not installed • show ad for plugin + $connectPluginInstalled = ''; // base OS only, plugin not installed • show ad for plugin } else { // plugin is installed but if the unraid-api file doesn't fully install it's a failed install - if (file_exists('/var/lib/pkgtools/packages/dynamix.unraid.net')) $pluginInstalled = 'dynamix.unraid.net.plg'; - if (file_exists('/var/lib/pkgtools/packages/dynamix.unraid.net.staging')) $pluginInstalled = 'dynamix.unraid.net.staging.plg'; + if (file_exists('/var/lib/pkgtools/packages/dynamix.unraid.net')) $connectPluginInstalled = 'dynamix.unraid.net.plg'; + if (file_exists('/var/lib/pkgtools/packages/dynamix.unraid.net.staging')) $connectPluginInstalled = 'dynamix.unraid.net.staging.plg'; // plugin install failed • append failure detected so we can show warning about failed install via UPC - if (!file_exists('/usr/local/sbin/unraid-api')) $pluginInstalled = $pluginInstalled . '_installFailed'; + if (!file_exists('/usr/local/sbin/unraid-api')) $connectPluginInstalled = $connectPluginInstalled . '_installFailed'; } $serverData = [ "apiKey" => $myservers['upc']['apikey'] ?? '', "apiVersion" => $myservers['api']['version'] ?? '', - "avatar" => (!empty($myservers['remote']['avatar']) && $pluginInstalled) ? $myservers['remote']['avatar'] : '', + "avatar" => (!empty($myservers['remote']['avatar']) && $connectPluginInstalled) ? $myservers['remote']['avatar'] : '', "banner" => $display['banner'] ?? '', "bannerGradient" => $display['showBannerGradient'] ?? 'yes', "bgColor" => ($backgnd) ? '#'.$backgnd : '', @@ -103,11 +103,11 @@ $serverData = [ : ( file_exists('/var/log/plugins/dynamix.unraid.net.staging.plg') ? trim(@exec('/usr/local/sbin/plugin version /var/log/plugins/dynamix.unraid.net.staging.plg 2>/dev/null')) : 'base-'.$var['version'] ), - "pluginInstalled" => $pluginInstalled, + "connectPluginInstalled" => $connectPluginInstalled, "protocol" => $_SERVER['REQUEST_SCHEME'], "regGen" => (int)$var['regGen'], "regGuid" => $var['regGUID'], - "registered" => (!empty($myservers['remote']['username']) && $pluginInstalled), + "registered" => (!empty($myservers['remote']['username']) && $connectPluginInstalled), "registeredTime" => $myservers['remote']['regWizTime'] ?? '', "site" => $_SERVER['REQUEST_SCHEME']."://".$_SERVER['HTTP_HOST'], "state" => strtoupper(empty($var['regCheck']) ? $var['regTy'] : $var['regCheck']), @@ -115,7 +115,7 @@ $serverData = [ "theme" => $display['theme'], "ts" => time(), "uptime" => 1000*(time() - round(strtok(exec("cat /proc/uptime"),' '))), - "username" => (!empty($myservers['remote']['username']) && $pluginInstalled) ? $myservers['remote']['username'] : '', + "username" => (!empty($myservers['remote']['username']) && $connectPluginInstalled) ? $myservers['remote']['username'] : '', "wanFQDN" => $nginx['NGINX_WANFQDN'] ?? '', ]; diff --git a/components/Brand/Avatar.vue b/components/Brand/Avatar.vue index 8e71d4732..e373d11f9 100644 --- a/components/Brand/Avatar.vue +++ b/components/Brand/Avatar.vue @@ -13,13 +13,13 @@ withDefaults(defineProps(), { }); const serverStore = useServerStore(); -const { avatar, pluginInstalled, registered, username } = storeToRefs(serverStore); +const { avatar, connectPluginInstalled, registered, username } = storeToRefs(serverStore);