From fabc68d13f2efc446802f1090a95440cb1615347 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 29 Jul 2022 09:49:24 +0200 Subject: [PATCH] pass mysql_server after adding to Mysqls.get command, do not validate in Mysqls.get if left empty on purpose Signed-off-by: Michael Kaufmann --- lib/Froxlor/Api/Commands/Mysqls.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/Froxlor/Api/Commands/Mysqls.php b/lib/Froxlor/Api/Commands/Mysqls.php index 51f7458f..89907da9 100644 --- a/lib/Froxlor/Api/Commands/Mysqls.php +++ b/lib/Froxlor/Api/Commands/Mysqls.php @@ -202,7 +202,8 @@ class Mysqls extends ApiCommand implements ResourceEntity $this->logger()->logAction($this->isAdmin() ? FroxlorLogger::ADM_ACTION : FroxlorLogger::USR_ACTION, LOG_WARNING, "[API] added mysql-database '" . $username . "'"); $result = $this->apiCall('Mysqls.get', [ - 'dbname' => $username + 'dbname' => $username, + 'mysql_server' => $dbserver ]); return $this->response($result); } @@ -230,7 +231,9 @@ class Mysqls extends ApiCommand implements ResourceEntity $dbname = $this->getParam('dbname', $dn_optional, ''); $dbserver = $this->getParam('mysql_server', true, -1); - $dbserver = Validate::validate($dbserver, html_entity_decode(lng('mysql.mysql_server')), '/^[0-9]+$/', '', 0, true); + if ($dbserver != -1) { + $dbserver = Validate::validate($dbserver, html_entity_decode(lng('mysql.mysql_server')), '/^[0-9]+$/', '', 0, true); + } if ($this->isAdmin()) { if ($this->getUserDetail('customers_see_all') != 1) {