mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-01-18 15:40:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: KeyInstaller class responseComplete usage

Browse Source
This commit is contained in:
Zack Spear
2025-03-20 12:41:38 -07:00
parent 80869a032c
commit 58bee5744d
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
emhttp/plugins/dynamix/include/InstallKey.php
View File

@@ -32,20 +32,20 @@ class KeyInstaller
* @param int $httpcode https://developer.mozilla.org/en-US/docs/Web/HTTP/Status
* @param string|array $result - strings are assumed to be encoded JSON. Arrays will be encoded to JSON.
*/
private function responseComplete($httpcode, $result)
private function responseComplete($httpcode, $result): string
{
$mutatedResult = is_array($result) ? json_encode($result) : $result;
if ($this->isGetRequest && $this->getHasUrlParam) { // return JSON to the caller
header('Content-Type: application/json');
http_response_code($httpcode);
exit((string)$mutatedResult);
header('Content-Type: application/json');
http_response_code($httpcode);
exit((string)$mutatedResult);
} else { // return the result to the caller
return $mutatedResult;
return $mutatedResult;
}
}
public function installKey($keyUrl = null)
public function installKey($keyUrl = null): string
{
$url = unscript($keyUrl ?? _var($_GET, 'url'));
$host = parse_url($url)['host'] ?? '';
@@ -61,9 +61,12 @@ class KeyInstaller
if ($returnVar === 0) {
$var = (array)@parse_ini_file('/var/local/emhttp/var.ini');
if (_var($var, 'mdState') == "STARTED") {
return $this->responseComplete(200, ['status' => _('Please Stop array to complete key installation')], _('success') . ', ' . _('Please Stop array to complete key installation'));
return $this->responseComplete(200, [
'status' => 'success',
'message' => _('Please Stop array to complete key installation'),
]);
} else {
return $this->responseComplete(200, ['status' => ''], _('success'));
return $this->responseComplete(200, ['status' => 'success']);
}
} else {
@unlink(escapeshellarg("/boot/config/$keyFile"));
@@ -81,4 +84,4 @@ $getHasUrlParam = $_GET !== null && !empty($_GET) && isset($_GET['url']);
if ($isGetRequest && $getHasUrlParam) {
$keyInstaller = new KeyInstaller();
$keyInstaller->installKey();
}
}