From 464f5b7bed10068de2e0289ce9532f6f3cce84d4 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Wed, 19 Apr 2023 20:58:48 +0200 Subject: [PATCH] fix adding mysql-server to customers without any prior assigned mysql-server, fixes #1123; fix issues with displaying set value if path-mode is 'dropdown' Signed-off-by: Michael Kaufmann --- lib/Froxlor/Api/Commands/MysqlServer.php | 2 +- lib/Froxlor/FileDir.php | 3 ++- lib/formfields/customer/domains/formfield.domains_edit.php | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/Froxlor/Api/Commands/MysqlServer.php b/lib/Froxlor/Api/Commands/MysqlServer.php index f44b45d1..c1fbbea2 100644 --- a/lib/Froxlor/Api/Commands/MysqlServer.php +++ b/lib/Froxlor/Api/Commands/MysqlServer.php @@ -516,7 +516,7 @@ class MysqlServer extends ApiCommand implements ResourceEntity `allowed_mysqlserver` = :am WHERE `customerid` = :cid "); while ($customer = $sel_stmt->fetch(PDO::FETCH_ASSOC)) { - $allowed_mysqls = json_decode(($customer['allowed_mysqlserver'] ?? '[]'), true); + $allowed_mysqls = json_decode(($customer['allowed_mysqlserver'] ?: '[]'), true); if (!in_array($dbserver, $allowed_mysqls)) { $allowed_mysqls[] = $dbserver; $allowed_mysqls = json_encode($allowed_mysqls); diff --git a/lib/Froxlor/FileDir.php b/lib/Froxlor/FileDir.php index 79f60b75..2502a4a9 100644 --- a/lib/Froxlor/FileDir.php +++ b/lib/Froxlor/FileDir.php @@ -447,7 +447,8 @@ class FileDir $field = [ 'type' => 'select', 'select_var' => $_field, - 'selected' => $value + 'selected' => $value, + 'value' => $value ]; } else { $field = [ diff --git a/lib/formfields/customer/domains/formfield.domains_edit.php b/lib/formfields/customer/domains/formfield.domains_edit.php index 2374029b..6d89369c 100644 --- a/lib/formfields/customer/domains/formfield.domains_edit.php +++ b/lib/formfields/customer/domains/formfield.domains_edit.php @@ -57,7 +57,7 @@ return [ 'label' => lng('panel.path'), 'desc' => (Settings::Get('panel.pathedit') != 'Dropdown' ? lng('panel.pathDescriptionSubdomain').(Settings::Get('system.documentroot_use_default_value') == 1 ? lng('panel.pathDescriptionEx') : '') : null), 'type' => $pathSelect['type'], - 'select_var' => $pathSelect['value'], + 'select_var' => $pathSelect['select_var'] ?? '', 'selected' => $pathSelect['value'], 'value' => $pathSelect['value'], 'note' => $pathSelect['note'] ?? '',