Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-04-30 11:19:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix admin logout

Browse Source
This commit is contained in:
slawkens 2023-02-03 13:00:49 +01:00
parent 6c5215a8ed
commit 7e62bd74a3
4 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/index.php
View File

@ -47,6 +47,10 @@ require ADMIN . 'includes/functions.php';
$twig->addGlobal('config', $config); $twig->addGlobal('config', $config);
$twig->addGlobal('status', $status); $twig->addGlobal('status', $status);
if (ACTION == 'logout') {
require SYSTEM . 'logout.php';
}
// if we're not logged in - show login box // if we're not logged in - show login box
if(!$logged || !admin()) { if(!$logged || !admin()) {
$page = 'login'; $page = 'login';

18
system/logout.php Normal file
View File

@ -0,0 +1,18 @@
<?php
if(isset($account_logged) && $account_logged->isLoaded()) {
if($hooks->trigger(HOOK_LOGOUT, ['account_id' => $account_logged->getId()])) {
unsetSession('account');
unsetSession('password');
unsetSession('remember_me');
$logged = false;
unset($account_logged);
if(isset($_REQUEST['redirect']))
{
header('Location: ' . urldecode($_REQUEST['redirect']));
exit;
}
}
}

17
system/pages/account/logout.php
View File

@ -17,21 +17,6 @@ if(!$logged) {
return; return;
} }
if(isset($account_logged) && $account_logged->isLoaded()) { require SYSTEM . 'logout.php';
if($hooks->trigger(HOOK_LOGOUT, ['account_id' => $account_logged->getId()])) {
unsetSession('account');
unsetSession('password');
unsetSession('remember_me');
$logged = false;
unset($account_logged);
if(isset($_REQUEST['redirect']))
{
header('Location: ' . urldecode($_REQUEST['redirect']));
exit;
}
}
}
$twig->display('account.logout.html.twig'); $twig->display('account.logout.html.twig');

2
system/templates/admin.login.html.twig
View File

@ -18,7 +18,7 @@
<div class="card-body"> <div class="card-body">
<p class="login-box-msg">Please login.</p> <p class="login-box-msg">Please login.</p>
<form method="post"> <form method="post" action="{{ constant('ADMIN_URL') }}">
<div class="input-group mb-3"> <div class="input-group mb-3">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lock"></i></span> <span class="input-group-text"><i class="fa fa-lock"></i></span>