From e74b3801a8d0859a1e9f4741e1e26aa02ffb7496 Mon Sep 17 00:00:00 2001 From: Adrian Gebhart Date: Wed, 1 Dec 2021 01:06:17 +0100 Subject: [PATCH] #9 show setup page as long as no password is configured --- php/src/Data/ConfigurationManager.php | 9 ++++++--- php/src/Data/Setup.php | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/php/src/Data/ConfigurationManager.php b/php/src/Data/ConfigurationManager.php index f368a564..2cdd52aa 100644 --- a/php/src/Data/ConfigurationManager.php +++ b/php/src/Data/ConfigurationManager.php @@ -22,9 +22,12 @@ class ConfigurationManager return $this->GetConfig()['username']; } - public function GetPassword() : string { - return $this->GetConfig()['password']; - } + public function GetPassword() : ?string { + if(array_key_exists('password', $this->GetConfig())){ + return $this->GetConfig()['password']; + } + else return null; + } public function GetToken() : string { return $this->GetConfig()['AIO_TOKEN']; diff --git a/php/src/Data/Setup.php b/php/src/Data/Setup.php index 2ab87e36..f90170db 100644 --- a/php/src/Data/Setup.php +++ b/php/src/Data/Setup.php @@ -27,6 +27,6 @@ class Setup } public function CanBeInstalled() : bool { - return !file_exists(DataConst::GetConfigFile()); + return is_null($this->configurationManager->GetPassword()); } }