Enhance session management and user authentication flow; implement day session tokens, improve cookie handling, and streamline date handling in planner
This commit is contained in:
+36
-14
@@ -21,6 +21,13 @@ require_once __DIR__ . '/includes/integrations/jira.php';
|
||||
$db = get_db_connection();
|
||||
$userId = (int)($currentUser['id'] ?? 0);
|
||||
$today = date('Y-m-d');
|
||||
|
||||
// Indien de datum van vandaag via de URL is meegegeven bij een normale pagina-aanroep, schoon de URL op naar zuiver 'planner.php'
|
||||
if (!$isAjaxRequest && isset($_GET['date']) && $_GET['date'] === $today) {
|
||||
header('Location: planner.php', true, 302);
|
||||
exit;
|
||||
}
|
||||
|
||||
$selectedDate = (!empty($_GET['date']) && preg_match('/^\d{4}-\d{2}-\d{2}$/', $_GET['date'])) ? $_GET['date'] : $today;
|
||||
$isTodaySelected = ($selectedDate === $today);
|
||||
$selectedTs = strtotime($selectedDate);
|
||||
@@ -298,13 +305,16 @@ for ($h = $startHour; $h <= $endHour; $h++) {
|
||||
$hours[] = sprintf('%02d:00', $h);
|
||||
}
|
||||
?>
|
||||
<?php if (!$isAjaxRequest): ?>
|
||||
<style>
|
||||
.line-clamp-1 { display: -webkit-box; -webkit-line-clamp: 1; -webkit-box-orient: vertical; overflow: hidden; }
|
||||
.line-clamp-2 { display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; }
|
||||
</style>
|
||||
|
||||
<div id="plannerContentArea" class="space-y-6 max-w-7xl mx-auto transition-opacity duration-200">
|
||||
<?php if ($isAjaxRequest) ob_start(); ?>
|
||||
<?php else: ?>
|
||||
<?php ob_start(); ?>
|
||||
<?php endif; ?>
|
||||
<!-- Top Banner: Datum, Hoofddoel & Integraties Status -->
|
||||
<div class="fociz-card p-6 sm:p-7 relative overflow-hidden">
|
||||
<div class="flex flex-col lg:flex-row lg:items-center justify-between gap-4">
|
||||
@@ -392,16 +402,16 @@ for ($h = $startHour; $h <= $endHour; $h++) {
|
||||
<div class="flex flex-col md:flex-row md:items-center justify-between gap-4 pb-4 mb-4 border-b border-slate-100 dark:border-slate-800/60">
|
||||
<!-- Navigatie controls -->
|
||||
<div class="flex items-center space-x-2">
|
||||
<a href="planner.php?date=<?= $prevWeekDate ?>" onclick="switchPlannerDate('<?= $prevWeekDate ?>', event)" class="flex items-center space-x-1.5 px-3.5 py-1.5 rounded-xl bg-slate-100 hover:bg-slate-200 dark:bg-slate-800/80 dark:hover:bg-slate-700/80 text-slate-700 dark:text-slate-300 text-xs font-semibold transition shadow-2xs" title="Vorige week (Maandag <?= date('j M', strtotime($prevWeekDate)) ?>)">
|
||||
<a href="planner.php?date=<?= $prevWeekDate ?>" onclick="switchPlannerDate('<?= $prevWeekDate ?>', event); return false;" class="flex items-center space-x-1.5 px-3.5 py-1.5 rounded-xl bg-slate-100 hover:bg-slate-200 dark:bg-slate-800/80 dark:hover:bg-slate-700/80 text-slate-700 dark:text-slate-300 text-xs font-semibold transition shadow-2xs" title="Vorige week (Maandag <?= date('j M', strtotime($prevWeekDate)) ?>)">
|
||||
<i data-lucide="chevron-left" class="w-4 h-4"></i>
|
||||
<span class="hidden sm:inline">Vorige week</span>
|
||||
</a>
|
||||
|
||||
<a href="planner.php?date=<?= $today ?>" onclick="switchPlannerDate('<?= $today ?>', event)" class="px-3.5 py-1.5 rounded-xl <?= $isTodaySelected ? 'bg-slate-900 text-white dark:bg-white dark:text-slate-900 font-bold shadow-xs' : 'bg-slate-100 hover:bg-slate-200 dark:bg-slate-800/80 dark:hover:bg-slate-700/80 text-slate-700 dark:text-slate-300 font-semibold shadow-2xs' ?> text-xs transition" title="Spring direct naar vandaag">
|
||||
<a href="planner.php" onclick="switchPlannerDate('<?= $today ?>', event); return false;" class="px-3.5 py-1.5 rounded-xl <?= $isTodaySelected ? 'bg-slate-900 text-white dark:bg-white dark:text-slate-900 font-bold shadow-xs' : 'bg-slate-100 hover:bg-slate-200 dark:bg-slate-800/80 dark:hover:bg-slate-700/80 text-slate-700 dark:text-slate-300 font-semibold shadow-2xs' ?> text-xs transition" title="Spring direct naar vandaag">
|
||||
Vandaag
|
||||
</a>
|
||||
|
||||
<a href="planner.php?date=<?= $nextWeekDate ?>" onclick="switchPlannerDate('<?= $nextWeekDate ?>', event)" class="flex items-center space-x-1.5 px-3.5 py-1.5 rounded-xl bg-slate-100 hover:bg-slate-200 dark:bg-slate-800/80 dark:hover:bg-slate-700/80 text-slate-700 dark:text-slate-300 text-xs font-semibold transition shadow-2xs" title="Volgende week (Maandag <?= date('j M', strtotime($nextWeekDate)) ?>)">
|
||||
<a href="planner.php?date=<?= $nextWeekDate ?>" onclick="switchPlannerDate('<?= $nextWeekDate ?>', event); return false;" class="flex items-center space-x-1.5 px-3.5 py-1.5 rounded-xl bg-slate-100 hover:bg-slate-200 dark:bg-slate-800/80 dark:hover:bg-slate-700/80 text-slate-700 dark:text-slate-300 text-xs font-semibold transition shadow-2xs" title="Volgende week (Maandag <?= date('j M', strtotime($nextWeekDate)) ?>)">
|
||||
<span class="hidden sm:inline">Volgende week</span>
|
||||
<i data-lucide="chevron-right" class="w-4 h-4"></i>
|
||||
</a>
|
||||
@@ -424,7 +434,7 @@ for ($h = $startHour; $h <= $endHour; $h++) {
|
||||
type="date"
|
||||
id="jumpDateInput"
|
||||
value="<?= htmlspecialchars($selectedDate) ?>"
|
||||
onchange="if(this.value) switchPlannerDate(this.value, event);"
|
||||
onchange="if(this.value) { switchPlannerDate(this.value, event); }"
|
||||
class="bg-slate-50 dark:bg-slate-950 border border-slate-200 dark:border-slate-800 rounded-xl px-3 py-1.5 text-xs text-slate-800 dark:text-slate-200 focus:outline-none focus:ring-2 focus:ring-indigo-500/30 font-medium cursor-pointer shadow-2xs"
|
||||
>
|
||||
</div>
|
||||
@@ -434,8 +444,8 @@ for ($h = $startHour; $h <= $endHour; $h++) {
|
||||
<div class="grid grid-cols-2 sm:grid-cols-4 md:grid-cols-7 gap-3">
|
||||
<?php foreach ($weekDays as $wd): ?>
|
||||
<a
|
||||
href="planner.php?date=<?= $wd['date'] ?>"
|
||||
onclick="switchPlannerDate('<?= $wd['date'] ?>', event)"
|
||||
href="<?= ($wd['date'] === $today) ? 'planner.php' : ('planner.php?date=' . $wd['date']) ?>"
|
||||
onclick="switchPlannerDate('<?= $wd['date'] ?>', event); return false;"
|
||||
class="fociz-card-interactive group relative flex flex-col p-3.5 rounded-2xl border transition-all text-left <?= $wd['is_selected']
|
||||
? 'bg-gradient-to-b from-indigo-500/15 via-indigo-500/5 to-transparent dark:from-indigo-500/25 dark:via-indigo-500/10 dark:to-transparent border-indigo-500 ring-2 ring-indigo-500/40 shadow-sm'
|
||||
: 'bg-slate-50/70 dark:bg-[#0c0f17]/50 border-slate-200/80 dark:border-slate-800/80 hover:border-indigo-300 dark:hover:border-indigo-600/50 hover:bg-white dark:hover:bg-[#111624] shadow-2xs' ?>"
|
||||
@@ -931,6 +941,9 @@ for ($h = $startHour; $h <= $endHour; $h++) {
|
||||
<?php
|
||||
if ($isAjaxRequest) {
|
||||
$contentHtml = ob_get_clean();
|
||||
while (ob_get_level() > 0) {
|
||||
ob_end_clean();
|
||||
}
|
||||
header('Content-Type: application/json; charset=utf-8');
|
||||
echo json_encode([
|
||||
'success' => true,
|
||||
@@ -950,7 +963,9 @@ if ($isAjaxRequest) {
|
||||
exit;
|
||||
}
|
||||
?>
|
||||
<?php if (!$isAjaxRequest): ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
|
||||
<!-- Modal: Taak & Tijdblok Bewerken (Vrij invullen van tijden & duur) -->
|
||||
<div id="editTaskModal" class="fixed inset-0 z-50 bg-slate-950/70 backdrop-blur-sm hidden items-center justify-center p-4">
|
||||
@@ -1229,7 +1244,8 @@ async function switchPlannerDate(newDate, event = null, pushState = true) {
|
||||
|
||||
// Werk URL bij in adresbalk zonder paginaherlaad
|
||||
if (pushState && window.history && window.history.pushState) {
|
||||
const newUrl = `planner.php?date=${encodeURIComponent(newDate)}`;
|
||||
const todayStr = '<?= $today ?>';
|
||||
const newUrl = (newDate === todayStr) ? 'planner.php' : `planner.php?date=${encodeURIComponent(newDate)}`;
|
||||
window.history.pushState({ date: newDate }, data.title || '', newUrl);
|
||||
}
|
||||
|
||||
@@ -1246,8 +1262,6 @@ async function switchPlannerDate(newDate, event = null, pushState = true) {
|
||||
|
||||
} catch (err) {
|
||||
console.error('Fout bij wisselen van datum via AJAX:', err);
|
||||
// Veilige fallback bij netwerkonderbreking
|
||||
window.location.href = 'planner.php?date=' + encodeURIComponent(newDate);
|
||||
} finally {
|
||||
isDateSwitching = false;
|
||||
container.classList.remove('opacity-60', 'pointer-events-none');
|
||||
@@ -1257,12 +1271,20 @@ async function switchPlannerDate(newDate, event = null, pushState = true) {
|
||||
// Browser Terug/Vooruit knoppen opvangen (popstate)
|
||||
window.addEventListener('popstate', (event) => {
|
||||
const urlParams = new URLSearchParams(window.location.search);
|
||||
const dateFromUrl = urlParams.get('date');
|
||||
if (dateFromUrl && dateFromUrl !== activePlannerDate) {
|
||||
const dateFromUrl = urlParams.get('date') || '<?= $today ?>';
|
||||
if (dateFromUrl !== activePlannerDate) {
|
||||
switchPlannerDate(dateFromUrl, null, false);
|
||||
}
|
||||
});
|
||||
|
||||
// Schoon direct de browser URL op indien deze ?date=VANDAAG bevat
|
||||
if (window.history && window.history.replaceState) {
|
||||
const urlParams = new URLSearchParams(window.location.search);
|
||||
if (urlParams.get('date') === '<?= $today ?>') {
|
||||
window.history.replaceState({}, document.title, 'planner.php');
|
||||
}
|
||||
}
|
||||
|
||||
// --- Dagdoel & Taken AJAX ---
|
||||
|
||||
async function saveGoal() {
|
||||
@@ -1694,8 +1716,8 @@ async function syncTaskToOutlook(taskId, btn) {
|
||||
btn.innerHTML = '<i data-lucide="check" class="w-3.5 h-3.5 text-teal-500"></i>';
|
||||
if (typeof lucide !== 'undefined') lucide.createIcons();
|
||||
setTimeout(() => {
|
||||
location.reload();
|
||||
}, 600);
|
||||
switchPlannerDate(activePlannerDate, null, false);
|
||||
}, 300);
|
||||
} else {
|
||||
alert(data.error || 'Kon taak niet synchroniseren naar Outlook');
|
||||
btn.innerHTML = originalHtml;
|
||||
|
||||
Reference in New Issue
Block a user