From aa6f510d0b1c531932ca1a2ff59f87f484516bc2 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Mon, 5 Oct 2020 19:30:55 +0200 Subject: [PATCH] Improve settings and settings tests --- Controller/ApiController.php | 8 ++++---- Controller/BackendController.php | 8 ++++---- Theme/Backend/settings-general.tpl.php | 12 ++++++------ .../Controller/Api/ApiControllerSettingsTrait.php | 14 +++++++------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 8e8b5ca..c4e0638 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -14,7 +14,7 @@ declare(strict_types=1); namespace Modules\Admin\Controller; -use Model\Settings; +use Model\SettingsEnum; use Modules\Admin\Models\Account; use Modules\Admin\Models\AccountMapper; use Modules\Admin\Models\AccountPermission; @@ -176,8 +176,8 @@ final class ApiController extends Controller [ 'response' => $this->app->appSettings->get( $id !== null ? (int) $id : $id, - $request->getData('name'), - $request->getData('module'), + $request->getData('name') ?? '', + $request->getData('module') ?? null, $group !== null ? (int) $group : $group, $account !== null ? (int) $account : $account ), @@ -775,7 +775,7 @@ final class ApiController extends Controller ); $this->updateModel($request->getHeader()->getAccount(), $old, $account, function() use($account) : void { - $account->setLoginTries((int) $this->app->appSettings->get(null, (string) Settings::LOGIN_TRIES)); + $account->setLoginTries((int) $this->app->appSettings->get(null, SettingsENUM::LOGIN_TRIES)['content']); AccountMapper::update($account); }, 'account', $request->getOrigin()); } diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 73a34e2..8dfc119 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -14,7 +14,7 @@ declare(strict_types=1); namespace Modules\Admin\Controller; -use Model\Settings; +use Model\SettingsEnum; use Modules\Admin\Models\AccountMapper; use Modules\Admin\Models\AccountPermissionMapper; use Modules\Admin\Models\GroupMapper; @@ -79,14 +79,14 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $settings = $this->app->appSettings->get(null, [ - Settings::PASSWORD_PATTERN, Settings::LOGIN_TIMEOUT, Settings::PASSWORD_INTERVAL, Settings::PASSWORD_HISTORY, Settings::LOGIN_TRIES, Settings::LOGGING_STATUS, Settings::LOGGING_PATH, Settings::DEFAULT_ORGANIZATION, - Settings::LOGIN_STATUS, Settings::DEFAULT_LOCALIZATION, Settings::ADMIN_MAIL, + SettingsEnum::PASSWORD_PATTERN, SettingsEnum::LOGIN_TIMEOUT, SettingsEnum::PASSWORD_INTERVAL, SettingsEnum::PASSWORD_HISTORY, SettingsEnum::LOGIN_TRIES, SettingsEnum::LOGGING_STATUS, SettingsEnum::LOGGING_PATH, SettingsEnum::DEFAULT_ORGANIZATION, + SettingsEnum::LOGIN_STATUS, SettingsEnum::DEFAULT_LOCALIZATION, SettingsEnum::ADMIN_MAIL, ]); $view->setTemplate('/Modules/Admin/Theme/Backend/settings-general'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000104001, $request, $response)); $view->setData('settings', $settings); - $view->setData('defaultlocalization', LocalizationMapper::get((int) $settings[Settings::DEFAULT_LOCALIZATION])); + $view->setData('defaultlocalization', LocalizationMapper::get((int) $settings[SettingsEnum::DEFAULT_LOCALIZATION])); return $view; } diff --git a/Theme/Backend/settings-general.tpl.php b/Theme/Backend/settings-general.tpl.php index f0744a4..656ebe9 100755 --- a/Theme/Backend/settings-general.tpl.php +++ b/Theme/Backend/settings-general.tpl.php @@ -80,23 +80,23 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization(); - + - + - + - + - +
@@ -118,7 +118,7 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization(); getHtml('Log'); ?> - +
diff --git a/tests/Controller/Api/ApiControllerSettingsTrait.php b/tests/Controller/Api/ApiControllerSettingsTrait.php index 5245115..8fdb915 100755 --- a/tests/Controller/Api/ApiControllerSettingsTrait.php +++ b/tests/Controller/Api/ApiControllerSettingsTrait.php @@ -14,7 +14,7 @@ declare(strict_types=1); namespace Modules\Admin\tests\Controller\Api; -use Model\Settings; +use Model\SettingsEnum; use phpOMS\Message\Http\HttpRequest; use phpOMS\Message\Http\HttpResponse; use phpOMS\Uri\HttpUri; @@ -32,10 +32,10 @@ trait ApiControllerSettingsTrait $request = new HttpRequest(new HttpUri('')); $request->getHeader()->setAccount(1); - $request->setData('name', Settings::PASSWORD_INTERVAL); + $request->setData('name', SettingsEnum::PASSWORD_INTERVAL); $this->module->apiSettingsGet($request, $response); - self::assertEquals('90', $response->get('')['response']); + self::assertEquals('90', $response->get('')['response']['content']); } /** @@ -49,14 +49,14 @@ trait ApiControllerSettingsTrait $request = new HttpRequest(new HttpUri('')); $request->getHeader()->setAccount(1); - $request->setData('settings', \json_encode([['name' => Settings::PASSWORD_INTERVAL, 'content' => '60']])); + $request->setData('settings', \json_encode([['name' => SettingsEnum::PASSWORD_INTERVAL, 'content' => '60']])); $this->module->apiSettingsSet($request, $response); - $request->setData('name', Settings::PASSWORD_INTERVAL); + $request->setData('name', SettingsEnum::PASSWORD_INTERVAL); $this->module->apiSettingsGet($request, $response); - self::assertEquals('60', $response->get('')['response']); + self::assertEquals('60', $response->get('')['response']['content']); - $request->setData('settings', \json_encode([['name' => Settings::PASSWORD_INTERVAL, 'content' => '90']]), true); + $request->setData('settings', \json_encode([['name' => SettingsEnum::PASSWORD_INTERVAL, 'content' => '90']]), true); $this->module->apiSettingsSet($request, $response); }