From 0c0b5cb10d1826a4fdaefb4f51626052ae58e7e9 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 24 Mar 2023 16:20:24 +0100 Subject: [PATCH] registration fixes --- Admin/Install/Application/QA/Application.php | 12 ++++----- .../QA/Controller/AppController.php | 4 +-- Admin/Install/Application/QA/QAView.php | 4 +-- .../QA/Themes/Default/tpl/footer.tpl.php | 8 +++--- .../QA/Themes/Default/tpl/header.tpl.php | 6 ++--- .../QA/Themes/Default/tpl/imprint.tpl.php | 2 +- .../QA/Themes/Default/tpl/privacy.tpl.php | 2 +- .../QA/Themes/Default/tpl/profile.tpl.php | 2 +- .../QA/Themes/Default/tpl/terms.tpl.php | 2 +- Admin/Install/Application/QA/index.tpl.php | 4 +-- Admin/Install/Application/QA/lang/en.lang.php | 2 +- Admin/Install/CMS.php | 4 +-- Admin/Install/Media.php | 4 +-- Admin/Install/Navigation.install.json | 8 +++--- Admin/Install/Navigation.php | 4 +-- Admin/Installer.php | 4 +-- Admin/Routes/Web/Api.php | 2 +- Admin/Routes/Web/Backend.php | 2 +- Admin/Settings/Theme/Backend/settings.tpl.php | 4 +-- Admin/Status.php | 4 +-- Admin/Uninstaller.php | 4 +-- Admin/Updater.php | 4 +-- Controller/ApiController.php | 26 +++++++++---------- Controller/BackendController.php | 6 ++--- Controller/Controller.php | 4 +-- Models/NullQAAnswer.php | 4 +-- Models/NullQAAnswerVote.php | 4 +-- Models/NullQAApp.php | 4 +-- Models/NullQAQuestion.php | 4 +-- Models/NullQAQuestionVote.php | 4 +-- Models/PermissionCategory.php | 4 +-- Models/QAAnswer.php | 4 +-- Models/QAAnswerMapper.php | 4 +-- Models/QAAnswerStatus.php | 4 +-- Models/QAAnswerVote.php | 4 +-- Models/QAAnswerVoteMapper.php | 4 +-- Models/QAApp.php | 4 +-- Models/QAAppMapper.php | 4 +-- Models/QAHelperMapper.php | 4 +-- Models/QAQuestion.php | 4 +-- Models/QAQuestionMapper.php | 4 +-- Models/QAQuestionStatus.php | 4 +-- Models/QAQuestionVote.php | 4 +-- Models/QAQuestionVoteMapper.php | 4 +-- Theme/Backend/Lang/Navigation.ar.lang.php | 2 +- Theme/Backend/Lang/Navigation.cs.lang.php | 2 +- Theme/Backend/Lang/Navigation.da.lang.php | 2 +- Theme/Backend/Lang/Navigation.de.lang.php | 2 +- Theme/Backend/Lang/Navigation.el.lang.php | 2 +- Theme/Backend/Lang/Navigation.en.lang.php | 2 +- Theme/Backend/Lang/Navigation.es.lang.php | 2 +- Theme/Backend/Lang/Navigation.fi.lang.php | 2 +- Theme/Backend/Lang/Navigation.fr.lang.php | 2 +- Theme/Backend/Lang/Navigation.hu.lang.php | 2 +- Theme/Backend/Lang/Navigation.it.lang.php | 2 +- Theme/Backend/Lang/Navigation.ja.lang.php | 2 +- Theme/Backend/Lang/Navigation.ko.lang.php | 2 +- Theme/Backend/Lang/Navigation.no.lang.php | 2 +- Theme/Backend/Lang/Navigation.pl.lang.php | 2 +- Theme/Backend/Lang/Navigation.pt.lang.php | 2 +- Theme/Backend/Lang/Navigation.ru.lang.php | 2 +- Theme/Backend/Lang/Navigation.sv.lang.php | 2 +- Theme/Backend/Lang/Navigation.th.lang.php | 2 +- Theme/Backend/Lang/Navigation.tr.lang.php | 2 +- Theme/Backend/Lang/Navigation.uk.lang.php | 2 +- Theme/Backend/Lang/Navigation.zh.lang.php | 2 +- Theme/Backend/Lang/ar.lang.php | 2 +- Theme/Backend/Lang/cs.lang.php | 2 +- Theme/Backend/Lang/da.lang.php | 2 +- Theme/Backend/Lang/de.lang.php | 2 +- Theme/Backend/Lang/el.lang.php | 2 +- Theme/Backend/Lang/en.lang.php | 2 +- Theme/Backend/Lang/es.lang.php | 2 +- Theme/Backend/Lang/fi.lang.php | 2 +- Theme/Backend/Lang/fr.lang.php | 2 +- Theme/Backend/Lang/hu.lang.php | 2 +- Theme/Backend/Lang/it.lang.php | 2 +- Theme/Backend/Lang/ja.lang.php | 2 +- Theme/Backend/Lang/ko.lang.php | 2 +- Theme/Backend/Lang/no.lang.php | 2 +- Theme/Backend/Lang/pl.lang.php | 2 +- Theme/Backend/Lang/pt.lang.php | 2 +- Theme/Backend/Lang/ru.lang.php | 2 +- Theme/Backend/Lang/sv.lang.php | 2 +- Theme/Backend/Lang/th.lang.php | 2 +- Theme/Backend/Lang/tr.lang.php | 2 +- Theme/Backend/Lang/uk.lang.php | 2 +- Theme/Backend/Lang/zh.lang.php | 2 +- Theme/Backend/qa-dashboard.tpl.php | 8 +++--- Theme/Backend/qa-question.tpl.php | 2 +- Theme/Backend/qa-tag-edit.tpl.php | 2 +- Theme/Backend/qa-tag-list.tpl.php | 4 +-- tests/Admin/AdminTest.php | 2 +- tests/Autoloader.php | 4 +-- tests/Controller/ApiControllerTest.php | 2 +- tests/Models/NullQAAnswerTest.php | 2 +- tests/Models/NullQAAnswerVoteTest.php | 2 +- tests/Models/NullQAAppTest.php | 2 +- tests/Models/NullQAQuestionTest.php | 2 +- tests/Models/NullQAQuestionVoteTest.php | 2 +- tests/Models/QAAnswerMapperTest.php | 2 +- tests/Models/QAAnswerTest.php | 2 +- tests/Models/QAAnswerVoteMapperTest.php | 2 +- tests/Models/QAAnswerVoteTest.php | 2 +- tests/Models/QAAppTest.php | 2 +- tests/Models/QAHelperMapperTest.php | 2 +- tests/Models/QAQuestionMapperTest.php | 2 +- tests/Models/QAQuestionTest.php | 2 +- tests/Models/QAQuestionVoteMapperTest.php | 2 +- tests/Models/QAQuestionVoteTest.php | 2 +- 110 files changed, 173 insertions(+), 173 deletions(-) diff --git a/Admin/Install/Application/QA/Application.php b/Admin/Install/Application/QA/Application.php index 2fe8452..ba55a7b 100755 --- a/Admin/Install/Application/QA/Application.php +++ b/Admin/Install/Application/QA/Application.php @@ -6,7 +6,7 @@ * * @package Web\{APPNAME} * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -50,7 +50,7 @@ use Web\{APPNAME}\QAView; * Application class. * * @package Web\{APPNAME} - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * @codeCoverageIgnore @@ -101,7 +101,7 @@ final class Application */ public function run(HttpRequest $request, HttpResponse $response) : void { - $this->app->l11nManager = new L11nManager($this->app->appName); + $this->app->l11nManager = new L11nManager(); $this->app->dbPool = new DatabasePool(); $this->app->sessionManager = new HttpSession(36000); $this->app->cookieJar = new CookieJar(); @@ -126,8 +126,8 @@ final class Application ); /* CSRF token OK? */ - if ($request->getData('CSRF') !== null - && !\hash_equals($this->app->sessionManager->get('CSRF'), $request->getData('CSRF')) + if ($request->hasData('CSRF') + && !\hash_equals($this->app->sessionManager->get('CSRF'), $request->getDataString('CSRF')) ) { $response->header->status = RequestStatusCode::R_403; @@ -210,7 +210,7 @@ final class Application $dispatched = $this->app->dispatcher->dispatch( $this->app->router->route( $request->uri->getRoute(), - $request->getData('CSRF'), + $request->getDataString('CSRF'), $request->getRouteVerb(), $this->app->appName, $this->app->unitId, diff --git a/Admin/Install/Application/QA/Controller/AppController.php b/Admin/Install/Application/QA/Controller/AppController.php index 89ebd21..3bd8857 100755 --- a/Admin/Install/Application/QA/Controller/AppController.php +++ b/Admin/Install/Application/QA/Controller/AppController.php @@ -6,7 +6,7 @@ * * @package Web\{APPNAME} * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -24,7 +24,7 @@ use phpOMS\Views\View; * App controller class. * * @package Web\{APPNAME} - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Install/Application/QA/QAView.php b/Admin/Install/Application/QA/QAView.php index 5b19e83..5761713 100755 --- a/Admin/Install/Application/QA/QAView.php +++ b/Admin/Install/Application/QA/QAView.php @@ -6,7 +6,7 @@ * * @package Web\{APPNAME} * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Views\View; * List view. * * @package Web\{APPNAME} - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Install/Application/QA/Themes/Default/tpl/footer.tpl.php b/Admin/Install/Application/QA/Themes/Default/tpl/footer.tpl.php index c537444..66e6d47 100755 --- a/Admin/Install/Application/QA/Themes/Default/tpl/footer.tpl.php +++ b/Admin/Install/Application/QA/Themes/Default/tpl/footer.tpl.php @@ -6,7 +6,7 @@ * * @package Template * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -19,9 +19,9 @@ use phpOMS\Uri\UriFactory;
\ No newline at end of file diff --git a/Admin/Install/Application/QA/Themes/Default/tpl/header.tpl.php b/Admin/Install/Application/QA/Themes/Default/tpl/header.tpl.php index 8cde0da..c9b02c7 100755 --- a/Admin/Install/Application/QA/Themes/Default/tpl/header.tpl.php +++ b/Admin/Install/Application/QA/Themes/Default/tpl/header.tpl.php @@ -6,7 +6,7 @@ * * @package Web\{APPNAME} * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,8 +18,8 @@ use phpOMS\Uri\UriFactory;
- printHtml($question->name); ?> + printHtml($question->name); ?>
@@ -62,10 +62,10 @@ echo $this->getData('nav')->render(); ?> - diff --git a/Theme/Backend/qa-question.tpl.php b/Theme/Backend/qa-question.tpl.php index 9261a97..625f448 100755 --- a/Theme/Backend/qa-question.tpl.php +++ b/Theme/Backend/qa-question.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\QA * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/qa-tag-edit.tpl.php b/Theme/Backend/qa-tag-edit.tpl.php index 39f9244..739d6f4 100755 --- a/Theme/Backend/qa-tag-edit.tpl.php +++ b/Theme/Backend/qa-tag-edit.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\QA * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/qa-tag-list.tpl.php b/Theme/Backend/qa-tag-list.tpl.php index 54808ee..19d4943 100755 --- a/Theme/Backend/qa-tag-list.tpl.php +++ b/Theme/Backend/qa-tag-list.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\QA * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -32,7 +32,7 @@ echo $this->getData('nav')->render(); $value) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('{/lang}/{/app}/admin/account/settings?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('{/base}/admin/account/settings?{?}&id=' . $value->getId()); ?> getId(); ?> printHtml($value->name); ?> diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php index 2903ee5..1822041 100755 --- a/tests/Admin/AdminTest.php +++ b/tests/Admin/AdminTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Autoloader.php b/tests/Autoloader.php index d032623..d08f1b7 100755 --- a/tests/Autoloader.php +++ b/tests/Autoloader.php @@ -6,7 +6,7 @@ * * @package Modules/tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace tests; * Autoloader class. * * @package tests - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index e2dea95..be068a1 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/NullQAAnswerTest.php b/tests/Models/NullQAAnswerTest.php index f1a74e1..593b5b1 100755 --- a/tests/Models/NullQAAnswerTest.php +++ b/tests/Models/NullQAAnswerTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/NullQAAnswerVoteTest.php b/tests/Models/NullQAAnswerVoteTest.php index f1b11a7..e51f393 100755 --- a/tests/Models/NullQAAnswerVoteTest.php +++ b/tests/Models/NullQAAnswerVoteTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/NullQAAppTest.php b/tests/Models/NullQAAppTest.php index 3004126..0e2541f 100755 --- a/tests/Models/NullQAAppTest.php +++ b/tests/Models/NullQAAppTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/NullQAQuestionTest.php b/tests/Models/NullQAQuestionTest.php index 4426799..e53dc25 100755 --- a/tests/Models/NullQAQuestionTest.php +++ b/tests/Models/NullQAQuestionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/NullQAQuestionVoteTest.php b/tests/Models/NullQAQuestionVoteTest.php index 345153d..f8e7705 100755 --- a/tests/Models/NullQAQuestionVoteTest.php +++ b/tests/Models/NullQAQuestionVoteTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/QAAnswerMapperTest.php b/tests/Models/QAAnswerMapperTest.php index 7e57218..0782a18 100755 --- a/tests/Models/QAAnswerMapperTest.php +++ b/tests/Models/QAAnswerMapperTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/QAAnswerTest.php b/tests/Models/QAAnswerTest.php index f6c119a..adc8fad 100755 --- a/tests/Models/QAAnswerTest.php +++ b/tests/Models/QAAnswerTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/QAAnswerVoteMapperTest.php b/tests/Models/QAAnswerVoteMapperTest.php index 6504e1d..08aacc8 100755 --- a/tests/Models/QAAnswerVoteMapperTest.php +++ b/tests/Models/QAAnswerVoteMapperTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/QAAnswerVoteTest.php b/tests/Models/QAAnswerVoteTest.php index 3e43be0..c39ce2b 100755 --- a/tests/Models/QAAnswerVoteTest.php +++ b/tests/Models/QAAnswerVoteTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/QAAppTest.php b/tests/Models/QAAppTest.php index b5bd067..32bda72 100755 --- a/tests/Models/QAAppTest.php +++ b/tests/Models/QAAppTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/QAHelperMapperTest.php b/tests/Models/QAHelperMapperTest.php index f867e93..c6ac860 100755 --- a/tests/Models/QAHelperMapperTest.php +++ b/tests/Models/QAHelperMapperTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/QAQuestionMapperTest.php b/tests/Models/QAQuestionMapperTest.php index 97679d9..d069654 100755 --- a/tests/Models/QAQuestionMapperTest.php +++ b/tests/Models/QAQuestionMapperTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/QAQuestionTest.php b/tests/Models/QAQuestionTest.php index c8066e3..e92287f 100755 --- a/tests/Models/QAQuestionTest.php +++ b/tests/Models/QAQuestionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/QAQuestionVoteMapperTest.php b/tests/Models/QAQuestionVoteMapperTest.php index b2d7467..40e8dce 100755 --- a/tests/Models/QAQuestionVoteMapperTest.php +++ b/tests/Models/QAQuestionVoteMapperTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/QAQuestionVoteTest.php b/tests/Models/QAQuestionVoteTest.php index fbfe16a..45cfe70 100755 --- a/tests/Models/QAQuestionVoteTest.php +++ b/tests/Models/QAQuestionVoteTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */