Jingga/oms-Shop
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Shop.git synced 2026-02-14 17:08:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

registration fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-03-24 16:20:25 +01:00
parent 68932c7a60
commit e5d7f887ec
27 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Admin/Install/Application/Shop/Application.php
View File

@ -6,7 +6,7 @@
* *
* @package Web\{APPNAME} * @package Web\{APPNAME}
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0
* @link https://jingga.app * @link https://jingga.app
*/ */
@ -50,7 +50,7 @@ use Web\{APPNAME}\ShopView;
* Application class. * Application class.
* *
* @package Web\{APPNAME} * @package Web\{APPNAME}
* @license OMS License 1.0 * @license OMS License 2.0
* @link https://jingga.app * @link https://jingga.app
* @since 1.0.0 * @since 1.0.0
* @codeCoverageIgnore * @codeCoverageIgnore
@ -101,7 +101,7 @@ final class Application
*/ */
public function run(HttpRequest $request, HttpResponse $response) : void 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->dbPool = new DatabasePool();
$this->app->sessionManager = new HttpSession(36000); $this->app->sessionManager = new HttpSession(36000);
$this->app->cookieJar = new CookieJar(); $this->app->cookieJar = new CookieJar();
@ -126,8 +126,8 @@ final class Application
); );
/* CSRF token OK? */ /* CSRF token OK? */
if ($request->getData('CSRF') !== null if ($request->hasData('CSRF')
&& !\hash_equals($this->app->sessionManager->get('CSRF'), $request->getData('CSRF')) && !\hash_equals($this->app->sessionManager->get('CSRF'), $request->getDataString('CSRF'))
) { ) {
$response->header->status = RequestStatusCode::R_403; $response->header->status = RequestStatusCode::R_403;
@ -210,7 +210,7 @@ final class Application
$dispatched = $this->app->dispatcher->dispatch( $dispatched = $this->app->dispatcher->dispatch(
$this->app->router->route( $this->app->router->route(
$request->uri->getRoute(), $request->uri->getRoute(),
$request->getData('CSRF'), $request->getDataString('CSRF'),
$request->getRouteVerb(), $request->getRouteVerb(),
$this->app->appName, $this->app->appName,
$this->app->unitId, $this->app->unitId,

4
Admin/Install/Application/Shop/Controller/AppController.php
View File

@ -6,7 +6,7 @@
* *
* @package Web\{APPNAME} * @package Web\{APPNAME}
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0
* @link https://jingga.app * @link https://jingga.app
*/ */
@ -24,7 +24,7 @@ use phpOMS\Views\View;
* App controller class. * App controller class.
* *
* @package Web\{APPNAME} * @package Web\{APPNAME}
* @license OMS License 1.0 * @license OMS License 2.0
* @link https://jingga.app * @link https://jingga.app
* @since 1.0.0 * @since 1.0.0
*/ */

4
Admin/Install/Application/Shop/ShopView.php
View File

@ -6,7 +6,7 @@
* *
* @package Web\{APPNAME} * @package Web\{APPNAME}
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0
* @link https://jingga.app * @link https://jingga.app
*/ */
@ -23,7 +23,7 @@ use phpOMS\Views\View;
* List view. * List view.
* *
* @package Web\{APPNAME} * @package Web\{APPNAME}
* @license OMS License 1.0 * @license OMS License 2.0
* @link https://jingga.app * @link https://jingga.app
* @since 1.0.0 * @since 1.0.0
*/ */

8
Admin/Install/Application/Shop/Themes/Default/tpl/footer.tpl.php
View File

@ -6,7 +6,7 @@
* *
* @package Template * @package Template
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0
* @link https://jingga.app * @link https://jingga.app
*/ */
@ -19,9 +19,9 @@ use phpOMS\Uri\UriFactory;
<div class="floater"> <div class="floater">
<hr> <hr>
<ul> <ul>
<li><a href="<?= UriFactory::build('{/lang}/{/app}/{/app}/terms'); ?>">Terms</a> <li><a href="<?= UriFactory::build('{/base}/{/app}/terms'); ?>">Terms</a>
<li><a href="<?= UriFactory::build('{/lang}/{/app}/{/app}/privacy'); ?>">Data Protection</a> <li><a href="<?= UriFactory::build('{/base}/{/app}/privacy'); ?>">Data Protection</a>
<li><a href="<?= UriFactory::build('{/lang}/{/app}/{/app}/imprint'); ?>">Imprint</a> <li><a href="<?= UriFactory::build('{/base}/{/app}/imprint'); ?>">Imprint</a>
</ul> </ul>
</div> </div>
</footer> </footer>

2
Admin/Install/Application/Shop/Themes/Default/tpl/front.tpl.php
View File

@ -6,7 +6,7 @@
* *
* @package Web\{APPNAME} * @package Web\{APPNAME}
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0
* @link https://jingga.app * @link https://jingga.app
*/ */

6
Admin/Install/Application/Shop/Themes/Default/tpl/header.tpl.php
View File

@ -6,7 +6,7 @@
* *
* @package Web\{APPNAME} * @package Web\{APPNAME}
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0
* @link https://jingga.app * @link https://jingga.app
*/ */
@ -18,8 +18,8 @@ use phpOMS\Uri\UriFactory;
<header> <header>
<nav> <nav>
<ul> <ul>
<li><a href="<?= UriFactory::build('{/lang}/{/app}/{/app}'); ?>">Website</a> <li><a href="<?= UriFactory::build('{/base}/{/app}'); ?>">Website</a>
<li><a href="<?= UriFactory::build('{/lang}/{/app}/{/app}/components'); ?>">Profile</a> <li><a href="<?= UriFactory::build('{/base}/{/app}/components'); ?>">Profile</a>
</ul> </ul>
</nav> </nav>
<div id="search"> <div id="search">

2
Admin/Install/Application/Shop/Themes/Default/tpl/imprint.tpl.php
View File

@ -6,7 +6,7 @@
* *
* @package Web\{APPNAME} * @package Web\{APPNAME}
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0
* @link https://jingga.app * @link https://jingga.app
*/ */

2
Admin/Install/Application/Shop/Themes/Default/tpl/privacy.tpl.php
View File

@ -6,7 +6,7 @@
* *
* @package Web\{APPNAME} * @package Web\{APPNAME}
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0
* @link https://jingga.app * @link https://jingga.app
*/ */

2
Admin/Install/Application/Shop/Themes/Default/tpl/terms.tpl.php
View File

@ -6,7 +6,7 @@
* *
* @package Web\{APPNAME} * @package Web\{APPNAME}
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0
* @link https://jingga.app * @link https://jingga.app
*/ */

4
Admin/Install/Application/Shop/index.tpl.php
View File

@ -6,7 +6,7 @@
* *
* @package Web\{APPNAME} * @package Web\{APPNAME}
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0
* *
* @link https://jingga.app * @link https://jingga.app
@ -32,7 +32,7 @@ $dispatch = $this->getData('dispatch') ?? [];
<meta name="description" content="<?= $this->getHtml(':meta', '0', '0'); ?>"> <meta name="description" content="<?= $this->getHtml(':meta', '0', '0'); ?>">
<?= $head->render(); ?> <?= $head->render(); ?>
<base href="<?= UriFactory::build('{/base}'); ?>/"> <base href="/">
<link rel="manifest" href="<?= UriFactory::build('Web/{APPNAME}/manifest.json'); ?>"> <link rel="manifest" href="<?= UriFactory::build('Web/{APPNAME}/manifest.json'); ?>">
<link rel="shortcut icon" href="<?= UriFactory::build('Web/{APPNAME}/img/favicon.ico'); ?>" type="image/x-icon"> <link rel="shortcut icon" href="<?= UriFactory::build('Web/{APPNAME}/img/favicon.ico'); ?>" type="image/x-icon">

2
Admin/Install/Application/Shop/lang/en.lang.php
View File

@ -6,7 +6,7 @@
* *
* @package Web\{APPNAME} * @package Web\{APPNAME}
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 2.0
* *
* @version 1.0.0 * @version 1.0.0
* *

4
Admin/Install/CMS.php
View File

@ -6,7 +6,7 @@
* *
* @package Modules\Shop\Admin\Install * @package Modules\Shop\Admin\Install
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0
* @link https://jingga.app * @link https://jingga.app
*/ */
@ -20,7 +20,7 @@ use phpOMS\Application\ApplicationAbstract;
* CMS class. * CMS class.
* *
* @package Modules\Shop\Admin\Install * @package Modules\Shop\Admin\Install
* @license OMS License 1.0 * @license OMS License 2.0
* @link https://jingga.app * @link https://jingga.app
* @since 1.0.0 * @since 1.0.0
*/ */

4
Admin/Install/Media.php
View File

@ -6,7 +6,7 @@
* *
* @package Modules\Shop\Admin\Install * @package Modules\Shop\Admin\Install
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0
* @link https://jingga.app * @link https://jingga.app
*/ */
@ -20,7 +20,7 @@ use phpOMS\Application\ApplicationAbstract;
* Media class. * Media class.
* *
* @package Modules\Shop\Admin\Install * @package Modules\Shop\Admin\Install
* @license OMS License 1.0 * @license OMS License 2.0
* @link https://jingga.app * @link https://jingga.app
* @since 1.0.0 * @since 1.0.0
*/ */

4
Admin/Install/Navigation.php
View File

@ -6,7 +6,7 @@
* *
* @package Modules\Shop\Admin\Install * @package Modules\Shop\Admin\Install
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0
* @link https://jingga.app * @link https://jingga.app
*/ */
@ -20,7 +20,7 @@ use phpOMS\Application\ApplicationAbstract;
* Navigation class. * Navigation class.
* *
* @package Modules\Shop\Admin\Install * @package Modules\Shop\Admin\Install
* @license OMS License 1.0 * @license OMS License 2.0
* @link https://jingga.app * @link https://jingga.app
* @since 1.0.0 * @since 1.0.0
*/ */

4
Admin/Installer.php
View File

@ -6,7 +6,7 @@
* *
* @package Modules\Shop\Admin * @package Modules\Shop\Admin
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0
* @link https://jingga.app * @link https://jingga.app
*/ */
@ -25,7 +25,7 @@ use phpOMS\System\File\Local\Directory;
* Installer class. * Installer class.
* *
* @package Modules\Shop\Admin * @package Modules\Shop\Admin
* @license OMS License 1.0 * @license OMS License 2.0
* @link https://jingga.app * @link https://jingga.app
* @since 1.0.0 * @since 1.0.0
*/ */

2
Admin/Routes/Web/Api.php
View File

@ -6,7 +6,7 @@
* *
* @package Modules * @package Modules
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0
* @link https://jingga.app * @link https://jingga.app
*/ */

2
Admin/Routes/Web/Backend.php
View File

@ -6,7 +6,7 @@
* *
* @package Modules * @package Modules
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0
* @link https://jingga.app * @link https://jingga.app
*/ */

4
Admin/Status.php
View File

@ -6,7 +6,7 @@
* *
* @package Modules\Shop\Admin * @package Modules\Shop\Admin
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0
* @link https://jingga.app * @link https://jingga.app
*/ */
@ -20,7 +20,7 @@ use phpOMS\Module\StatusAbstract;
* Shop class. * Shop class.
* *
* @package Modules\Shop\Admin * @package Modules\Shop\Admin
* @license OMS License 1.0 * @license OMS License 2.0
* @link https://jingga.app * @link https://jingga.app
* @since 1.0.0 * @since 1.0.0
*/ */

4
Admin/Uninstaller.php
View File

@ -6,7 +6,7 @@
* *
* @package Modules\Shop\Admin * @package Modules\Shop\Admin
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0
* @link https://jingga.app * @link https://jingga.app
*/ */
@ -20,7 +20,7 @@ use phpOMS\Module\UninstallerAbstract;
* Uninstaller class. * Uninstaller class.
* *
* @package Modules\Shop\Admin * @package Modules\Shop\Admin
* @license OMS License 1.0 * @license OMS License 2.0
* @link https://jingga.app * @link https://jingga.app
* @since 1.0.0 * @since 1.0.0
*/ */

4
Admin/Updater.php
View File

@ -6,7 +6,7 @@
* *
* @package Modules\Shop\Admin * @package Modules\Shop\Admin
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0
* @link https://jingga.app * @link https://jingga.app
*/ */
@ -20,7 +20,7 @@ use phpOMS\Module\UpdaterAbstract;
* Updater class. * Updater class.
* *
* @package Modules\Shop\Admin * @package Modules\Shop\Admin
* @license OMS License 1.0 * @license OMS License 2.0
* @link https://jingga.app * @link https://jingga.app
* @since 1.0.0 * @since 1.0.0
*/ */

6
Controller/ApiController.php
View File

@ -6,7 +6,7 @@
* *
* @package Modules\Shop * @package Modules\Shop
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0
* @link https://jingga.app * @link https://jingga.app
*/ */
@ -33,7 +33,7 @@ use phpOMS\Uri\HttpUri;
* Api controller * Api controller
* *
* @package Modules\Shop * @package Modules\Shop
* @license OMS License 1.0 * @license OMS License 2.0
* @link https://jingga.app * @link https://jingga.app
* @since 1.0.0 * @since 1.0.0
*/ */
@ -169,7 +169,7 @@ final class ApiController extends Controller
// \Stripe\Stripe::setApiKey($stripeSecretKey); // \Stripe\Stripe::setApiKey($stripeSecretKey);
$api_key = $_SERVER['OMS_STRIPE_SECRET'] ?? ''; $api_key = $_SERVER['OMS_STRIPE_SECRET'] ?? '';
$endpoint_secret = $_SERVER['OMS_STRIPE_PUBLIC'] ?? ''; $endpoint_secret = $_SERVER['OMS_STRIPE_PUBLIC'] ?? '';
$include = \realpath(__DIR__ . '/../../../Resources/'); $include = \realpath(__DIR__ . '/../../../Resources/');

4
Controller/BackendController.php
View File

@ -6,7 +6,7 @@
* *
* @package Modules\Shop * @package Modules\Shop
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0
* @link https://jingga.app * @link https://jingga.app
*/ */
@ -18,7 +18,7 @@ namespace Modules\Shop\Controller;
* Backend controller. * Backend controller.
* *
* @package Modules\Shop * @package Modules\Shop
* @license OMS License 1.0 * @license OMS License 2.0
* @link https://jingga.app * @link https://jingga.app
* @since 1.0.0 * @since 1.0.0
* @codeCoverageIgnore * @codeCoverageIgnore

4
Controller/Controller.php
View File

@ -6,7 +6,7 @@
* *
* @package Modules\Shop * @package Modules\Shop
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0
* @link https://jingga.app * @link https://jingga.app
*/ */
@ -22,7 +22,7 @@ use phpOMS\Module\WebInterface;
* Shop class. * Shop class.
* *
* @package Modules\Shop * @package Modules\Shop
* @license OMS License 1.0 * @license OMS License 2.0
* @link https://jingga.app * @link https://jingga.app
* @since 1.0.0 * @since 1.0.0
*/ */

4
Controller/ShopController.php
View File

@ -6,7 +6,7 @@
* *
* @package Modules\Shop * @package Modules\Shop
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0
* @link https://jingga.app * @link https://jingga.app
*/ */
@ -18,7 +18,7 @@ namespace Modules\Shop\Controller;
* Shop controller. * Shop controller.
* *
* @package Modules\Shop * @package Modules\Shop
* @license OMS License 1.0 * @license OMS License 2.0
* @link https://jingga.app * @link https://jingga.app
* @since 1.0.0 * @since 1.0.0
*/ */

4
Models/PermissionCategory.php
View File

@ -6,7 +6,7 @@
* *
* @package Modules\Shop\Models * @package Modules\Shop\Models
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0
* @link https://jingga.app * @link https://jingga.app
*/ */
@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum;
* Permision state enum. * Permision state enum.
* *
* @package Modules\Shop\Models * @package Modules\Shop\Models
* @license OMS License 1.0 * @license OMS License 2.0
* @link https://jingga.app * @link https://jingga.app
* @since 1.0.0 * @since 1.0.0
*/ */

2
Theme/Backend/Lang/en.lang.php
View File

@ -6,7 +6,7 @@
* *
* @package Modules\Localization * @package Modules\Localization
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0
* @link https://jingga.app * @link https://jingga.app
*/ */

2
tests/Admin/AdminTest.php
View File

@ -6,7 +6,7 @@
* *
* @package tests * @package tests
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0
* @link https://jingga.app * @link https://jingga.app
*/ */