NiekRabelink/Fociz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor code structure for improved readability and maintainability

Browse Source
This commit is contained in:
Niek Rabelink
2026-09-09 16:30:11 +02:00
parent 4cb94d3897
commit 64a7a3bcf0
7 changed files with 235 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
auth/callback_microsoft.php
+2
View File
@@ -27,6 +27,8 @@ if (empty($_SESSION['user_id']) && $stateUserId) {
$_SESSION['user_email'] = $recoveredUser['email'];
$_SESSION['user_role'] = $recoveredUser['role'];
$_SESSION['is_2fa_verified'] = true;
$_SESSION['auth_date'] = date('Y-m-d');
$_SESSION['session_expires_at'] = strtotime('today 23:59:59');
issue_remember_token((int)$recoveredUser['id']);
}
} catch (Throwable $e) {
auth/invite.php
+3 -1
View File
@@ -75,12 +75,14 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
$db->commit();
// Start sessie
// Start dagsessie (geldig tot 23:59:59)
$_SESSION['user_id'] = $newUserId;
$_SESSION['user_name'] = $name;
$_SESSION['user_email'] = $invite['email'];
$_SESSION['user_role'] = $invite['role'];
$_SESSION['is_2fa_verified'] = true;
$_SESSION['auth_date'] = date('Y-m-d');
$_SESSION['session_expires_at'] = strtotime('today 23:59:59');
issue_remember_token($newUserId);
unset($_SESSION['invite_totp_secret']);
auth/login.php
+15 -2
View File
@@ -20,6 +20,10 @@ if ($currentUser) {
}
$error = null;
$infoMessage = null;
if (isset($_GET['expired'])) {
$infoMessage = "Uw dagsessie is om 23:59 beëindigd. Log opnieuw in om een nieuwe werkdag te starten.";
}
$step = isset($_SESSION['pending_2fa_user_id']) ? 2 : 1;
// Terug naar stap 1
@@ -95,14 +99,16 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
}
if ($isValid) {
// Volledige login succesvol
// Volledige login succesvol (geldig tot 23:59:59 van vandaag)
$_SESSION['user_id'] = $user['id'];
$_SESSION['user_name'] = $user['name'];
$_SESSION['user_email'] = $user['email'];
$_SESSION['user_role'] = $user['role'];
$_SESSION['is_2fa_verified'] = true;
$_SESSION['auth_date'] = date('Y-m-d');
$_SESSION['session_expires_at'] = strtotime('today 23:59:59');
// Activeer persistente remember token (30 dagen blijf ingelogd)
// Activeer dagspecifieke remember token (verloopt vannacht om 23:59:59)
issue_remember_token((int)$user['id']);
unset($_SESSION['pending_2fa_user_id'], $_SESSION['pending_2fa_user_email'], $_SESSION['pending_2fa_user_name']);
@@ -178,6 +184,13 @@ $pageTitle = "Fociz — Inloggen";
</p>
</div>
<?php if ($infoMessage): ?>
<div class="mb-6 p-4 rounded-2xl bg-sky-500/10 border border-sky-500/30 flex items-start space-x-3 text-sky-800 dark:text-sky-300 text-xs sm:text-sm">
<i data-lucide="info" class="w-5 h-5 flex-shrink-0 mt-0.5 text-sky-600 dark:text-sky-400"></i>
<span><?= htmlspecialchars($infoMessage) ?></span>
</div>
<?php endif; ?>
<?php if ($error): ?>
<div class="mb-6 p-4 rounded-2xl bg-red-500/10 border border-red-500/30 flex items-start space-x-3 text-red-700 dark:text-red-400 text-sm">
<i data-lucide="alert-triangle" class="w-5 h-5 flex-shrink-0 mt-0.5"></i>
auth/setup.php
+3 -1
View File
@@ -62,12 +62,14 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
$adminId = (int)$db->lastInsertId();
// Automatische sessie starten
// Automatische dagsessie starten (geldig tot 23:59:59)
$_SESSION['user_id'] = $adminId;
$_SESSION['user_name'] = $name;
$_SESSION['user_email'] = $email;
$_SESSION['user_role'] = 'ADMIN';
$_SESSION['is_2fa_verified'] = true;
$_SESSION['auth_date'] = date('Y-m-d');
$_SESSION['session_expires_at'] = strtotime('today 23:59:59');
issue_remember_token($adminId);
unset($_SESSION['setup_totp_secret']);