Merge branch 'main' of http://git.pb.bib.de/PBBFA23CIV/EIANotesApp
This commit is contained in:
commit
7d1d48199a
@ -22,7 +22,9 @@ class UserController
|
|||||||
$erg = array();
|
$erg = array();
|
||||||
$erg = $this->userModel->verifyLogin($_POST["username"], $_POST["password"]);
|
$erg = $this->userModel->verifyLogin($_POST["username"], $_POST["password"]);
|
||||||
if ($erg["success"] == true) {
|
if ($erg["success"] == true) {
|
||||||
echo "success";
|
header("Location: ?controller=Welcome&do=showWelcome");
|
||||||
|
exit();
|
||||||
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$this->view->setDoMethodName("showUserLoginForm");
|
$this->view->setDoMethodName("showUserLoginForm");
|
||||||
@ -34,6 +36,13 @@ class UserController
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function logoutUser()
|
||||||
|
{
|
||||||
|
$this->userModel->logoutUser();
|
||||||
|
header("Location: ?controller=Welcome&do=showWelcome");
|
||||||
|
exit();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public function showUserLoginForm()
|
public function showUserLoginForm()
|
||||||
{
|
{
|
||||||
|
@ -20,7 +20,7 @@ class UserModel extends Database
|
|||||||
$_SESSION['user_id'] = $user['id'];
|
$_SESSION['user_id'] = $user['id'];
|
||||||
$_SESSION['username'] = $user['username'];
|
$_SESSION['username'] = $user['username'];
|
||||||
$_SESSION['role'] = $user['role']; // Store role
|
$_SESSION['role'] = $user['role']; // Store role
|
||||||
return ['success' => true, 'message' => 'Login successful!', 'redirect' => "xx"];
|
return ['success' => true, 'message' => 'Login successful!'];
|
||||||
}
|
}
|
||||||
return ['success' => false, 'message' => 'Invalid username or password.'];
|
return ['success' => false, 'message' => 'Invalid username or password.'];
|
||||||
} catch (PDOException $e) {
|
} catch (PDOException $e) {
|
||||||
@ -28,4 +28,11 @@ class UserModel extends Database
|
|||||||
return ['success' => false, 'message' => 'An error occurred during login.'];
|
return ['success' => false, 'message' => 'An error occurred during login.'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function logoutUser()
|
||||||
|
{
|
||||||
|
session_unset(); // Unset all session variables
|
||||||
|
session_destroy();
|
||||||
|
return ['success' => true, 'message' => 'Logged out successfully.'];
|
||||||
|
}
|
||||||
}
|
}
|
@ -9,13 +9,12 @@
|
|||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<header class="top-bar">
|
<header class="top-bar">
|
||||||
<h1>Notes App <?php if($_SESSION['role'] === 'admin') echo "<span style='font-size:0.7em; color:#ffdd57;'>(Admin Panel)</span>"; ?></h1>
|
<h1>Notes App <?php if(isset($_SESSION['role']) && $_SESSION['role'] === 'admin') echo "<span style='font-size:0.7em; color:#ffdd57;'>(Admin Panel)</span>"; ?></h1>
|
||||||
<?php if (isset($_SESSION['user_id'])): ?>
|
<?php if (isset($_SESSION['user_id'])): ?>
|
||||||
<div class="user-info">
|
<div class="user-info">
|
||||||
<span>Welcome, <?php echo htmlspecialchars($_SESSION['username'], ENT_QUOTES, 'UTF-8'); ?>!</span>
|
<span>Welcome, <?php echo htmlspecialchars($_SESSION['username'], ENT_QUOTES, 'UTF-8'); ?>!</span>
|
||||||
<form id="logout-form" method="POST" style="display: inline;">
|
<form id="logout-form" method="POST" style="display: inline;">
|
||||||
<input type="hidden" name="action" value="logout">
|
<a class="icon-button" href="?controller=User&do=logoutUser">→</a>
|
||||||
<button type="submit" class="icon-button" title="Logout">→</button>
|
|
||||||
</form>
|
</form>
|
||||||
<!-- <button class="icon-button" title="More options">⋮</button> -->
|
<!-- <button class="icon-button" title="More options">⋮</button> -->
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user