Merge pull request #1079 from zackspear/master

fix(upc): sign in removal testing feedback
This commit is contained in:
tom mortensen
2022-04-22 08:54:11 -07:00
committed by GitHub
2 changed files with 11 additions and 6 deletions
@@ -542,11 +542,16 @@
"internalport" => $_SERVER['SERVER_PORT'],
"keyfile" => str_replace(['+','/','='], ['-','_',''], trim(base64_encode(@file_get_contents($var['regFILE'])))),
"osVersion" => $var['version'],
"plgVersion" => $plgversion = file_exists("/var/log/plugins/dynamix.unraid.net.plg")
"plgVersion" => $plgversion = file_exists('/var/log/plugins/dynamix.unraid.net.plg')
? trim(@exec('/usr/local/sbin/plugin version /var/log/plugins/dynamix.unraid.net.plg 2>/dev/null'))
: ( file_exists("/var/log/plugins/dynamix.unraid.net.staging.plg")
: ( 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'] ),
"plgInstalled" => (file_exists('/var/log/plugins/dynamix.unraid.net.plg')
? 'dynamix.unraid.net.plg'
: (file_exists('/var/log/plugins/dynamix.unraid.net.staging.plg')
? 'dynamix.unraid.net.staging.plg'
: '')),
"protocol" => $_SERVER['REQUEST_SCHEME'],
"reggen" => (int)$var['regGen'],
"regGuid" => $var['regGUID'],
File diff suppressed because one or more lines are too long