mirror of
https://github.com/Karaka-Management/oms-Shop.git
synced 2026-01-11 10:38:40 +00:00
registration fixes
This commit is contained in:
parent
68932c7a60
commit
e5d7f887ec
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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;
|
|||
<div class="floater">
|
||||
<hr>
|
||||
<ul>
|
||||
<li><a href="<?= UriFactory::build('{/lang}/{/app}/{/app}/terms'); ?>">Terms</a>
|
||||
<li><a href="<?= UriFactory::build('{/lang}/{/app}/{/app}/privacy'); ?>">Data Protection</a>
|
||||
<li><a href="<?= UriFactory::build('{/lang}/{/app}/{/app}/imprint'); ?>">Imprint</a>
|
||||
<li><a href="<?= UriFactory::build('{/base}/{/app}/terms'); ?>">Terms</a>
|
||||
<li><a href="<?= UriFactory::build('{/base}/{/app}/privacy'); ?>">Data Protection</a>
|
||||
<li><a href="<?= UriFactory::build('{/base}/{/app}/imprint'); ?>">Imprint</a>
|
||||
</ul>
|
||||
</div>
|
||||
</footer>
|
||||
|
|
@ -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
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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;
|
|||
<header>
|
||||
<nav>
|
||||
<ul>
|
||||
<li><a href="<?= UriFactory::build('{/lang}/{/app}/{/app}'); ?>">Website</a>
|
||||
<li><a href="<?= UriFactory::build('{/lang}/{/app}/{/app}/components'); ?>">Profile</a>
|
||||
<li><a href="<?= UriFactory::build('{/base}/{/app}'); ?>">Website</a>
|
||||
<li><a href="<?= UriFactory::build('{/base}/{/app}/components'); ?>">Profile</a>
|
||||
</ul>
|
||||
</nav>
|
||||
<div id="search">
|
||||
|
|
|
|||
|
|
@ -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
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -32,7 +32,7 @@ $dispatch = $this->getData('dispatch') ?? [];
|
|||
<meta name="description" content="<?= $this->getHtml(':meta', '0', '0'); ?>">
|
||||
<?= $head->render(); ?>
|
||||
|
||||
<base href="<?= UriFactory::build('{/base}'); ?>/">
|
||||
<base href="/">
|
||||
|
||||
<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">
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
*
|
||||
* @package Web\{APPNAME}
|
||||
* @copyright Dennis Eichhorn
|
||||
* @license OMS License 1.0
|
||||
* @license OMS License 2.0
|
||||
*
|
||||
* @version 1.0.0
|
||||
*
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
*
|
||||
* @package Modules\Shop\Admin\Install
|
||||
* @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 @@ use phpOMS\Application\ApplicationAbstract;
|
|||
* CMS class.
|
||||
*
|
||||
* @package Modules\Shop\Admin\Install
|
||||
* @license OMS License 1.0
|
||||
* @license OMS License 2.0
|
||||
* @link https://jingga.app
|
||||
* @since 1.0.0
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
*
|
||||
* @package Modules\Shop\Admin\Install
|
||||
* @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 @@ use phpOMS\Application\ApplicationAbstract;
|
|||
* Media class.
|
||||
*
|
||||
* @package Modules\Shop\Admin\Install
|
||||
* @license OMS License 1.0
|
||||
* @license OMS License 2.0
|
||||
* @link https://jingga.app
|
||||
* @since 1.0.0
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
*
|
||||
* @package Modules\Shop\Admin\Install
|
||||
* @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 @@ use phpOMS\Application\ApplicationAbstract;
|
|||
* Navigation class.
|
||||
*
|
||||
* @package Modules\Shop\Admin\Install
|
||||
* @license OMS License 1.0
|
||||
* @license OMS License 2.0
|
||||
* @link https://jingga.app
|
||||
* @since 1.0.0
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
*
|
||||
* @package Modules\Shop\Admin
|
||||
* @copyright Dennis Eichhorn
|
||||
* @license OMS License 1.0
|
||||
* @license OMS License 2.0
|
||||
* @version 1.0.0
|
||||
* @link https://jingga.app
|
||||
*/
|
||||
|
|
@ -25,7 +25,7 @@ use phpOMS\System\File\Local\Directory;
|
|||
* Installer class.
|
||||
*
|
||||
* @package Modules\Shop\Admin
|
||||
* @license OMS License 1.0
|
||||
* @license OMS License 2.0
|
||||
* @link https://jingga.app
|
||||
* @since 1.0.0
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
*
|
||||
* @package Modules
|
||||
* @copyright Dennis Eichhorn
|
||||
* @license OMS License 1.0
|
||||
* @license OMS License 2.0
|
||||
* @version 1.0.0
|
||||
* @link https://jingga.app
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
*
|
||||
* @package Modules
|
||||
* @copyright Dennis Eichhorn
|
||||
* @license OMS License 1.0
|
||||
* @license OMS License 2.0
|
||||
* @version 1.0.0
|
||||
* @link https://jingga.app
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
*
|
||||
* @package Modules\Shop\Admin
|
||||
* @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 @@ use phpOMS\Module\StatusAbstract;
|
|||
* Shop class.
|
||||
*
|
||||
* @package Modules\Shop\Admin
|
||||
* @license OMS License 1.0
|
||||
* @license OMS License 2.0
|
||||
* @link https://jingga.app
|
||||
* @since 1.0.0
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
*
|
||||
* @package Modules\Shop\Admin
|
||||
* @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 @@ use phpOMS\Module\UninstallerAbstract;
|
|||
* Uninstaller class.
|
||||
*
|
||||
* @package Modules\Shop\Admin
|
||||
* @license OMS License 1.0
|
||||
* @license OMS License 2.0
|
||||
* @link https://jingga.app
|
||||
* @since 1.0.0
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
*
|
||||
* @package Modules\Shop\Admin
|
||||
* @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 @@ use phpOMS\Module\UpdaterAbstract;
|
|||
* Updater class.
|
||||
*
|
||||
* @package Modules\Shop\Admin
|
||||
* @license OMS License 1.0
|
||||
* @license OMS License 2.0
|
||||
* @link https://jingga.app
|
||||
* @since 1.0.0
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
*
|
||||
* @package Modules\Shop
|
||||
* @copyright Dennis Eichhorn
|
||||
* @license OMS License 1.0
|
||||
* @license OMS License 2.0
|
||||
* @version 1.0.0
|
||||
* @link https://jingga.app
|
||||
*/
|
||||
|
|
@ -33,7 +33,7 @@ use phpOMS\Uri\HttpUri;
|
|||
* Api controller
|
||||
*
|
||||
* @package Modules\Shop
|
||||
* @license OMS License 1.0
|
||||
* @license OMS License 2.0
|
||||
* @link https://jingga.app
|
||||
* @since 1.0.0
|
||||
*/
|
||||
|
|
@ -169,7 +169,7 @@ final class ApiController extends Controller
|
|||
|
||||
// \Stripe\Stripe::setApiKey($stripeSecretKey);
|
||||
|
||||
$api_key = $_SERVER['OMS_STRIPE_SECRET'] ?? '';
|
||||
$api_key = $_SERVER['OMS_STRIPE_SECRET'] ?? '';
|
||||
$endpoint_secret = $_SERVER['OMS_STRIPE_PUBLIC'] ?? '';
|
||||
|
||||
$include = \realpath(__DIR__ . '/../../../Resources/');
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
*
|
||||
* @package Modules\Shop
|
||||
* @copyright Dennis Eichhorn
|
||||
* @license OMS License 1.0
|
||||
* @license OMS License 2.0
|
||||
* @version 1.0.0
|
||||
* @link https://jingga.app
|
||||
*/
|
||||
|
|
@ -18,7 +18,7 @@ namespace Modules\Shop\Controller;
|
|||
* Backend controller.
|
||||
*
|
||||
* @package Modules\Shop
|
||||
* @license OMS License 1.0
|
||||
* @license OMS License 2.0
|
||||
* @link https://jingga.app
|
||||
* @since 1.0.0
|
||||
* @codeCoverageIgnore
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
*
|
||||
* @package Modules\Shop
|
||||
* @copyright Dennis Eichhorn
|
||||
* @license OMS License 1.0
|
||||
* @license OMS License 2.0
|
||||
* @version 1.0.0
|
||||
* @link https://jingga.app
|
||||
*/
|
||||
|
|
@ -22,7 +22,7 @@ use phpOMS\Module\WebInterface;
|
|||
* Shop class.
|
||||
*
|
||||
* @package Modules\Shop
|
||||
* @license OMS License 1.0
|
||||
* @license OMS License 2.0
|
||||
* @link https://jingga.app
|
||||
* @since 1.0.0
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
*
|
||||
* @package Modules\Shop
|
||||
* @copyright Dennis Eichhorn
|
||||
* @license OMS License 1.0
|
||||
* @license OMS License 2.0
|
||||
* @version 1.0.0
|
||||
* @link https://jingga.app
|
||||
*/
|
||||
|
|
@ -18,7 +18,7 @@ namespace Modules\Shop\Controller;
|
|||
* Shop controller.
|
||||
*
|
||||
* @package Modules\Shop
|
||||
* @license OMS License 1.0
|
||||
* @license OMS License 2.0
|
||||
* @link https://jingga.app
|
||||
* @since 1.0.0
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
*
|
||||
* @package Modules\Shop\Models
|
||||
* @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 @@ use phpOMS\Stdlib\Base\Enum;
|
|||
* Permision state enum.
|
||||
*
|
||||
* @package Modules\Shop\Models
|
||||
* @license OMS License 1.0
|
||||
* @license OMS License 2.0
|
||||
* @link https://jingga.app
|
||||
* @since 1.0.0
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
*
|
||||
* @package Modules\Localization
|
||||
* @copyright Dennis Eichhorn
|
||||
* @license OMS License 1.0
|
||||
* @license OMS License 2.0
|
||||
* @version 1.0.0
|
||||
* @link https://jingga.app
|
||||
*/
|
||||
|
|
@ -18,4 +18,4 @@ return ['Shop' => [
|
|||
'Website' => 'Website',
|
||||
'Demo' => 'Demo',
|
||||
'Download' => 'Download',
|
||||
]];
|
||||
]];
|
||||
|
|
|
|||
|
|
@ -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
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user