From e5d7f887ecd27e6a22fb02181d746ab5543464f2 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 24 Mar 2023 16:20:25 +0100 Subject: [PATCH] registration fixes --- Admin/Install/Application/Shop/Application.php | 12 ++++++------ .../Application/Shop/Controller/AppController.php | 4 ++-- Admin/Install/Application/Shop/ShopView.php | 4 ++-- .../Shop/Themes/Default/tpl/footer.tpl.php | 8 ++++---- .../Shop/Themes/Default/tpl/front.tpl.php | 2 +- .../Shop/Themes/Default/tpl/header.tpl.php | 6 +++--- .../Shop/Themes/Default/tpl/imprint.tpl.php | 2 +- .../Shop/Themes/Default/tpl/privacy.tpl.php | 2 +- .../Shop/Themes/Default/tpl/terms.tpl.php | 2 +- Admin/Install/Application/Shop/index.tpl.php | 4 ++-- Admin/Install/Application/Shop/lang/en.lang.php | 2 +- Admin/Install/CMS.php | 4 ++-- Admin/Install/Media.php | 4 ++-- Admin/Install/Navigation.php | 4 ++-- Admin/Installer.php | 4 ++-- Admin/Routes/Web/Api.php | 2 +- Admin/Routes/Web/Backend.php | 2 +- Admin/Status.php | 4 ++-- Admin/Uninstaller.php | 4 ++-- Admin/Updater.php | 4 ++-- Controller/ApiController.php | 6 +++--- Controller/BackendController.php | 4 ++-- Controller/Controller.php | 4 ++-- Controller/ShopController.php | 4 ++-- Models/PermissionCategory.php | 4 ++-- Theme/Backend/Lang/en.lang.php | 4 ++-- tests/Admin/AdminTest.php | 2 +- 27 files changed, 54 insertions(+), 54 deletions(-) diff --git a/Admin/Install/Application/Shop/Application.php b/Admin/Install/Application/Shop/Application.php index fd9d452..896cf49 100755 --- a/Admin/Install/Application/Shop/Application.php +++ b/Admin/Install/Application/Shop/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}\ShopView; * 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/Shop/Controller/AppController.php b/Admin/Install/Application/Shop/Controller/AppController.php index 07bc67a..11a6e23 100755 --- a/Admin/Install/Application/Shop/Controller/AppController.php +++ b/Admin/Install/Application/Shop/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/Shop/ShopView.php b/Admin/Install/Application/Shop/ShopView.php index 5b19e83..5761713 100755 --- a/Admin/Install/Application/Shop/ShopView.php +++ b/Admin/Install/Application/Shop/ShopView.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/Shop/Themes/Default/tpl/footer.tpl.php b/Admin/Install/Application/Shop/Themes/Default/tpl/footer.tpl.php index c537444..66e6d47 100755 --- a/Admin/Install/Application/Shop/Themes/Default/tpl/footer.tpl.php +++ b/Admin/Install/Application/Shop/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/Shop/Themes/Default/tpl/front.tpl.php b/Admin/Install/Application/Shop/Themes/Default/tpl/front.tpl.php index 3a8c873..6d10c1d 100755 --- a/Admin/Install/Application/Shop/Themes/Default/tpl/front.tpl.php +++ b/Admin/Install/Application/Shop/Themes/Default/tpl/front.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 */ diff --git a/Admin/Install/Application/Shop/Themes/Default/tpl/header.tpl.php b/Admin/Install/Application/Shop/Themes/Default/tpl/header.tpl.php index 8cde0da..c9b02c7 100755 --- a/Admin/Install/Application/Shop/Themes/Default/tpl/header.tpl.php +++ b/Admin/Install/Application/Shop/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;