From 795bfcacb0c79ec71af4692da4dff74bca2da8e6 Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Fri, 4 Oct 2024 12:09:04 +0200 Subject: [PATCH] remove ServerConfig dependancy - working first --- solid/lib/Settings/SolidAdmin.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/solid/lib/Settings/SolidAdmin.php b/solid/lib/Settings/SolidAdmin.php index 3aac4ef..302c300 100644 --- a/solid/lib/Settings/SolidAdmin.php +++ b/solid/lib/Settings/SolidAdmin.php @@ -10,12 +10,10 @@ class SolidAdmin implements ISettings { private IL10N $l; private IConfig $config; - private ServerConfig $serverConfig; - public function __construct(IConfig $config, IL10N $l, ServerConfig $serverConfig) { + public function __construct(IConfig $config, IL10N $l) { $this->config = $config; $this->l = $l; - $this->serverConfig = $serverConfig; } /** @@ -23,8 +21,8 @@ public function __construct(IConfig $config, IL10N $l, ServerConfig $serverConfi */ public function getForm() { $parameters = [ - 'privateKey' => $this->serverConfig->getPrivateKey(), - 'encryptionKey' => $this->serverConfig->getEncryptionKey() + 'privateKey' => $this->config->getAppValue('solid','privateKey'), + 'encryptionKey' => this->config->getAppValue('solid','encryptionKey'), ]; return new TemplateResponse('solid', 'admin', $parameters, '');