versustunez/venom
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

VENOM-2: Fixed Login, fixed missing scripts.min.js,

Browse source
This commit is contained in:
Maurice Grönwoldt 2020-10-05 20:38:36 +02:00
commit 0baed1a7fc
8 changed files with 38 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Venom/Admin/AdminController.php
View file

@ -24,7 +24,7 @@ class AdminController implements RenderController
public function render(VenomRenderer $renderer): bool
{
if (URLHelper::getInstance()->getUrl() !== '/admin/') {
if (!in_array(URLHelper::getInstance()->getUrl(), ['/admin/', '/admin'])) {
http_response_code(404);
$this->tpl = 'async';
}
@ -32,9 +32,9 @@ class AdminController implements RenderController
$isLogin = Security::get()->hasRole(User::ADMIN_ROLE);
$renderer->addVar('isLoggedIn', $isLogin);
if (!$isLogin) {
Asset::get()->addCSS('login','login.css');
Asset::get()->addCSS('login', 'login.css');
}
Asset::get()->addCSS('styles','style.css', 1);
Asset::get()->addCSS('styles', 'style.css', 1);
Asset::get()->addJS('scripts', 'scripts.min.js', 1);
return true;

2
src/Venom/Helper/URLHelper.php
View file

@ -45,6 +45,6 @@ class URLHelper
public function isAdminUrl(): bool
{
return strpos($this->parsedUrl, '/admin/') === 0;
return strpos($this->parsedUrl, '/admin') === 0;
}
}

6
src/Venom/Security/BaseLogin.php
View file

@ -31,7 +31,11 @@ class BaseLogin implements Login
public function redirect(): void
{
$url = ArgumentHandler::get()->getPostItem('REDIRECT_TO', URLHelper::getInstance()->getUrl());
header('Location: ' . $url);
if($url === 'NO') {
echo json_encode(['message' => 'login'], JSON_THROW_ON_ERROR);
} else {
header('Location: ' . $url);
}
die();
}