Borgal/domili
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kleine Änderungen

Browse Source
This commit is contained in:
Borgal
2025-10-13 17:44:43 +02:00
parent 1a568d75a7
commit 94aa765186
8 changed files with 838 additions and 701 deletions
Download Patch File Download Diff File Expand all files Collapse all files

199
admin/participant.php
View File

@@ -1,59 +1,99 @@
<?php <?php
// Fehleranzeige für Entwicklung (optional)
// error_reporting(E_ALL);
// ini_set('display_errors', 1);
include('../inc/check_login.php'); include('../inc/check_login.php');
include('../inc/db.php'); include('../inc/db.php');
require_once '../inc/helpers.php'; require_once '../inc/helpers.php';
$message = ''; // Nur Admin darf diese Seite nutzen
$message_type = ''; if (!isset($_SESSION['role']) || $_SESSION['role'] !== 'admin') {
header("Location: ../index.php");
// Prüfen, ob eine Meeting-ID übergeben wurde
if (!isset($_GET['id'])) {
header("Location: index.php");
exit; exit;
} }
$meeting_id = htmlspecialchars($_GET['id']); // Meeting-ID prüfen
if (!isset($_GET['id'])) {
$_SESSION['error_message'] = "Keine Meeting-ID angegeben.";
header("Location: ../index.php");
exit;
}
// Neu: Quelle des Aufrufs festlegen für bedingte Logik und Weiterleitung $meeting_id = intval($_GET['id']);
$source_page = isset($_GET['source']) && $_GET['source'] == 'history' ? 'history' : 'index';
// Quelle merken (für Weiterleitung)
$source_page = isset($_GET['source']) && $_GET['source'] === 'history' ? 'history' : 'index';
$cancel_link = $source_page === 'history' ? '../history.php' : '../index.php'; $cancel_link = $source_page === 'history' ? '../history.php' : '../index.php';
// Daten speichern, wenn das Formular abgeschickt wurde // Meeting-Daten laden
if ($_SERVER["REQUEST_METHOD"] == "POST") { $stmt = mysqli_prepare($conn, "SELECT meeting_date, color_id, reason FROM meetings WHERE id = ?");
mysqli_stmt_bind_param($stmt, "i", $meeting_id);
mysqli_stmt_execute($stmt);
$meeting = mysqli_fetch_assoc(mysqli_stmt_get_result($stmt));
mysqli_stmt_close($stmt);
// Neu: Daten des Meetings selbst aktualisieren, falls aus der History aufgerufen if (!$meeting) {
$_SESSION['error_message'] = "Meeting nicht gefunden.";
header("Location: " . $cancel_link);
exit;
}
// Farben und Benutzer laden
$colors = [];
$colors_result = mysqli_query($conn, "SELECT id, name FROM colors ORDER BY name");
while ($row = mysqli_fetch_assoc($colors_result)) {
$colors[] = $row;
}
$users = [];
$users_result = mysqli_query($conn, "SELECT id, username AS name FROM users ORDER BY username");
while ($row = mysqli_fetch_assoc($users_result)) {
$users[] = $row;
}
// Bestehende Teilnehmerdaten laden
$existing_feedback = [];
$stmt = mysqli_prepare($conn, "SELECT user_id, attended, wore_color, paid FROM meeting_teilnehmer WHERE meeting_id = ?");
mysqli_stmt_bind_param($stmt, "i", $meeting_id);
mysqli_stmt_execute($stmt);
$result = mysqli_stmt_get_result($stmt);
while ($row = mysqli_fetch_assoc($result)) {
$existing_feedback[$row['user_id']] = $row;
}
mysqli_stmt_close($stmt);
$message = '';
$message_type = '';
// POST-Verarbeitung
if ($_SERVER["REQUEST_METHOD"] === "POST") {
// Meeting-Daten aktualisieren (nur im History-Modus)
if ($source_page === 'history') { if ($source_page === 'history') {
$meeting_date = $_POST['meeting_date']; $meeting_date = $_POST['meeting_date'] ?? '';
$color_id = $_POST['color_id']; $color_id = intval($_POST['color_id'] ?? 0);
$reason = $_POST['reason'] ?? null; $reason = $_POST['reason'] ?? null;
$stmt = mysqli_prepare($conn, "UPDATE meetings SET meeting_date = ?, color_id = ?, reason = ? WHERE id = ?"); if (!empty($meeting_date) && $color_id > 0) {
if ($stmt) { $stmt = mysqli_prepare($conn, "UPDATE meetings SET meeting_date = ?, color_id = ?, reason = ? WHERE id = ?");
mysqli_stmt_bind_param($stmt, "sisi", $meeting_date, $color_id, $reason, $meeting_id); mysqli_stmt_bind_param($stmt, "sisi", $meeting_date, $color_id, $reason, $meeting_id);
mysqli_stmt_execute($stmt); mysqli_stmt_execute($stmt);
mysqli_stmt_close($stmt); mysqli_stmt_close($stmt);
} else {
die("Fehler beim Vorbereiten der Meeting-Update-Abfrage: " . mysqli_error($conn));
} }
} }
// Vorhandene Daten für dieses Meeting löschen // Alte Teilnehmerdaten löschen
$stmt = mysqli_prepare($conn, "DELETE FROM meeting_teilnehmer WHERE meeting_id = ?"); $stmt = mysqli_prepare($conn, "DELETE FROM meeting_teilnehmer WHERE meeting_id = ?");
if ($stmt === false) {
die("Fehler in der SQL-Abfrage: " . mysqli_error($conn));
}
mysqli_stmt_bind_param($stmt, "i", $meeting_id); mysqli_stmt_bind_param($stmt, "i", $meeting_id);
mysqli_stmt_execute($stmt); mysqli_stmt_execute($stmt);
mysqli_stmt_close($stmt); mysqli_stmt_close($stmt);
// Gesendete Daten verarbeiten und speichern // Neue Daten speichern
if (isset($_POST['user_id'])) { if (isset($_POST['user_id']) && is_array($_POST['user_id'])) {
$stmt_insert = mysqli_prepare($conn, "INSERT INTO meeting_teilnehmer (meeting_id, user_id, attended, wore_color, paid) VALUES (?, ?, ?, ?, ?)"); $stmt_insert = mysqli_prepare($conn, "INSERT INTO meeting_teilnehmer (meeting_id, user_id, attended, wore_color, paid) VALUES (?, ?, ?, ?, ?)");
if ($stmt_insert === false) {
die("Fehler in der SQL-Abfrage: " . mysqli_error($conn));
}
foreach ($_POST['user_id'] as $user_id) { foreach ($_POST['user_id'] as $user_id) {
$user_id = intval($user_id);
$attended = isset($_POST['attended'][$user_id]) ? 1 : 0; $attended = isset($_POST['attended'][$user_id]) ? 1 : 0;
$wore_color = isset($_POST['wore_color'][$user_id]) ? 1 : 0; $wore_color = isset($_POST['wore_color'][$user_id]) ? 1 : 0;
$paid = isset($_POST['paid'][$user_id]) ? 1 : 0; $paid = isset($_POST['paid'][$user_id]) ? 1 : 0;
@@ -63,74 +103,26 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
} }
mysqli_stmt_close($stmt_insert); mysqli_stmt_close($stmt_insert);
// NEU: Termin als abgeschlossen markieren // Meeting als abgeschlossen markieren (nur im Index-Modus)
$stmt_complete = mysqli_prepare($conn, "UPDATE meetings SET is_completed = 1 WHERE id = ?"); if ($source_page === 'index') {
if ($stmt_complete) { $stmt_complete = mysqli_prepare($conn, "UPDATE meetings SET is_completed = 1 WHERE id = ?");
mysqli_stmt_bind_param($stmt_complete, "i", $meeting_id); mysqli_stmt_bind_param($stmt_complete, "i", $meeting_id);
mysqli_stmt_execute($stmt_complete); mysqli_stmt_execute($stmt_complete);
mysqli_stmt_close($stmt_complete); mysqli_stmt_close($stmt_complete);
} }
$message = "Meeting-Daten erfolgreich gespeichert!"; $message = "Teilnehmerdaten erfolgreich gespeichert!";
$message_type = 'success'; $message_type = 'success';
} else { } else {
$message = "Keine Benutzerdaten zum Speichern vorhanden."; $message = "Keine Benutzerdaten übermittelt.";
$message_type = 'warning'; $message_type = 'warning';
} }
}
// --------------------------------------------------------------------- // 🔁 Zurück zur ursprünglichen Quelle
// Daten für das Formular abrufen (Meetings und Benutzer) header("Location: " . $cancel_link);
// ---------------------------------------------------------------------
// Neu: Zusätzliche Meeting-Details für den Edit-Modus abrufen
$stmt = mysqli_prepare($conn, "SELECT m.meeting_date, m.reason, m.color_id, c.name AS color_name FROM meetings m LEFT JOIN colors c ON m.color_id = c.id WHERE m.id = ?");
if ($stmt === false) {
die("Fehler in der SQL-Abfrage: " . mysqli_error($conn));
}
mysqli_stmt_bind_param($stmt, "i", $meeting_id);
mysqli_stmt_execute($stmt);
$result = mysqli_stmt_get_result($stmt);
$meeting = mysqli_fetch_assoc($result);
mysqli_stmt_close($stmt);
if (!$meeting) {
header("Location: index.php");
exit; exit;
} }
// Neu: Alle Farben für das Dropdown im Edit-Modus abrufen
$colors = [];
$colors_result = mysqli_query($conn, "SELECT id, name FROM colors ORDER BY name");
if ($colors_result) {
while ($row = mysqli_fetch_assoc($colors_result)) {
$colors[] = $row;
}
}
// Alle Benutzer abrufen
$users = [];
$users_result = mysqli_query($conn, "SELECT id, username AS name FROM users ORDER BY username");
if ($users_result === false) {
die("Fehler in der SQL-Abfrage: " . mysqli_error($conn));
}
while ($row = mysqli_fetch_assoc($users_result)) {
$users[] = $row;
}
// Bestehende Feedback-Daten für dieses Meeting abrufen, falls vorhanden
$stmt = mysqli_prepare($conn, "SELECT user_id, attended, wore_color, paid FROM meeting_teilnehmer WHERE meeting_id = ?");
if ($stmt === false) {
die("Fehler in der SQL-Abfrage: " . mysqli_error($conn));
}
mysqli_stmt_bind_param($stmt, "i", $meeting_id);
mysqli_stmt_execute($stmt);
$result = mysqli_stmt_get_result($stmt);
while ($row = mysqli_fetch_assoc($result)) {
$existing_feedback[$row['user_id']] = $row;
}
mysqli_stmt_close($stmt);
require_once '../inc/header.php'; require_once '../inc/header.php';
?> ?>
@@ -138,25 +130,40 @@ require_once '../inc/header.php';
<h2 class="mb-4">Teilnahme eintragen</h2> <h2 class="mb-4">Teilnahme eintragen</h2>
<?php if ($source_page === 'index'): ?> <?php if ($source_page === 'index'): ?>
<p class="text-muted">für das Treffen am <strong><?= date('d.m.Y', strtotime($meeting['meeting_date'])) ?></strong> in der Farbe <strong><?= htmlspecialchars($meeting['color_name']) ?></strong>.</p> <p class="text-muted">
für das Treffen am <strong><?= date('d.m.Y H:i', strtotime($meeting['meeting_date'])) ?></strong>
in der Farbe <strong>
<?php
$color_name = '—';
foreach ($colors as $c) {
if ($c['id'] == $meeting['color_id']) {
$color_name = htmlspecialchars($c['name']);
break;
}
}
echo $color_name;
?>
</strong>.
</p>
<?php endif; ?> <?php endif; ?>
<?php if ($message): ?> <?php if ($message): ?>
<div class="alert alert-<?= $message_type ?> alert-dismissible fade show" role="alert"> <div class="alert alert-<?= $message_type ?> alert-dismissible fade show" role="alert">
<?= $message ?> <?= htmlspecialchars($message) ?>
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button> <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
</div> </div>
<?php endif; ?> <?php endif; ?>
<div class="card shadow mb-4"> <div class="card shadow mb-4">
<div class="card-body"> <div class="card-body">
<form action="participant.php?id=<?= $meeting_id ?>&source=<?= $source_page ?>" method="post"> <form action="participant.php?id=<?= $meeting_id ?>&source=<?= htmlspecialchars($source_page) ?>" method="post">
<?php if ($source_page === 'history'): ?> <?php if ($source_page === 'history'): ?>
<h5 class="mb-3">Treffen-Details bearbeiten</h5> <h5 class="mb-3">Treffen-Details bearbeiten</h5>
<div class="row"> <div class="row">
<div class="col-md-4 mb-3"> <div class="col-md-4 mb-3">
<label for="meeting_date" class="form-label">Datum des Treffens</label> <label for="meeting_date" class="form-label">Datum des Treffens</label>
<input type="datetime-local" class="form-control" id="meeting_date" name="meeting_date" value="<?= date('Y-m-d\TH:i', strtotime($meeting['meeting_date'])) ?>" required> <input type="datetime-local" class="form-control" id="meeting_date" name="meeting_date"
value="<?= date('Y-m-d\TH:i', strtotime($meeting['meeting_date'])) ?>" required>
</div> </div>
<div class="col-md-4 mb-3"> <div class="col-md-4 mb-3">
<label for="color_id" class="form-label">Farbvorgabe</label> <label for="color_id" class="form-label">Farbvorgabe</label>
@@ -170,7 +177,8 @@ require_once '../inc/header.php';
</div> </div>
<div class="col-md-4 mb-3"> <div class="col-md-4 mb-3">
<label for="reason" class="form-label">Grund (optional)</label> <label for="reason" class="form-label">Grund (optional)</label>
<input type="text" class="form-control" id="reason" name="reason" value="<?= htmlspecialchars($meeting['reason']) ?>"> <input type="text" class="form-control" id="reason" name="reason"
value="<?= htmlspecialchars($meeting['reason']) ?>">
</div> </div>
</div> </div>
<hr> <hr>
@@ -192,17 +200,23 @@ require_once '../inc/header.php';
<td><?= htmlspecialchars($user['name']) ?></td> <td><?= htmlspecialchars($user['name']) ?></td>
<td class="text-center"> <td class="text-center">
<div class="form-check d-inline-block"> <div class="form-check d-inline-block">
<input class="form-check-input" type="checkbox" name="attended[<?= $user['id'] ?>]" id="attended_<?= $user['id'] ?>" value="1" <?= isset($existing_feedback[$user['id']]) && $existing_feedback[$user['id']]['attended'] ? 'checked' : '' ?>> <input class="form-check-input" type="checkbox" name="attended[<?= $user['id'] ?>]"
id="attended_<?= $user['id'] ?>" value="1"
<?= isset($existing_feedback[$user['id']]) && $existing_feedback[$user['id']]['attended'] ? 'checked' : '' ?>>
</div> </div>
</td> </td>
<td class="text-center"> <td class="text-center">
<div class="form-check d-inline-block"> <div class="form-check d-inline-block">
<input class="form-check-input" type="checkbox" name="wore_color[<?= $user['id'] ?>]" id="wore_color_<?= $user['id'] ?>" value="1" <?= isset($existing_feedback[$user['id']]) && $existing_feedback[$user['id']]['wore_color'] ? 'checked' : '' ?>> <input class="form-check-input" type="checkbox" name="wore_color[<?= $user['id'] ?>]"
id="wore_color_<?= $user['id'] ?>" value="1"
<?= isset($existing_feedback[$user['id']]) && $existing_feedback[$user['id']]['wore_color'] ? 'checked' : '' ?>>
</div> </div>
</td> </td>
<td class="text-center"> <td class="text-center">
<div class="form-check d-inline-block"> <div class="form-check d-inline-block">
<input class="form-check-input" type="checkbox" name="paid[<?= $user['id'] ?>]" id="paid_<?= $user['id'] ?>" value="1" <?= isset($existing_feedback[$user['id']]) && $existing_feedback[$user['id']]['paid'] ? 'checked' : '' ?>> <input class="form-check-input" type="checkbox" name="paid[<?= $user['id'] ?>]"
id="paid_<?= $user['id'] ?>" value="1"
<?= isset($existing_feedback[$user['id']]) && $existing_feedback[$user['id']]['paid'] ? 'checked' : '' ?>>
</div> </div>
</td> </td>
</tr> </tr>
@@ -210,8 +224,9 @@ require_once '../inc/header.php';
<?php endforeach; ?> <?php endforeach; ?>
</tbody> </tbody>
</table> </table>
<div class="d-flex justify-content-between mt-3"> <div class="d-flex justify-content-between mt-3">
<button type="submit" class="btn btn-primary">Speichern</button> <button type="submit" class="btn btn-outline-primary">Speichern</button>
<a href="<?= htmlspecialchars($cancel_link) ?>" class="btn btn-outline-secondary">Abbrechen</a> <a href="<?= htmlspecialchars($cancel_link) ?>" class="btn btn-outline-secondary">Abbrechen</a>
</div> </div>
</form> </form>

48
history.php
View File

@@ -5,18 +5,43 @@ include('inc/helpers.php');
// PHP-Logik für die Löschfunktion // PHP-Logik für die Löschfunktion
if (isset($_GET['action']) && $_GET['action'] == 'delete' && isset($_GET['id'])) { if (isset($_GET['action']) && $_GET['action'] == 'delete' && isset($_GET['id'])) {
$id = $_GET['id']; $id = intval($_GET['id']);
$stmt = mysqli_prepare($conn, "DELETE FROM meetings WHERE id = ?");
mysqli_stmt_bind_param($stmt, "i", $id); // 🔥 Zuerst abhängige Tabellen bereinigen – in der richtigen Reihenfolge!
if (mysqli_stmt_execute($stmt)) { // 1. Abstimmungen zu Vorschlägen löschen
// Erfolgreiche Weiterleitung $stmt1 = mysqli_prepare($conn, "DELETE FROM meeting_reschedule_votes WHERE proposal_id IN (SELECT id FROM meeting_reschedule_proposals WHERE meeting_id = ?)");
if ($stmt1) {
mysqli_stmt_bind_param($stmt1, "i", $id);
mysqli_stmt_execute($stmt1);
mysqli_stmt_close($stmt1);
}
// 2. Verschiebungsvorschläge löschen
$stmt2 = mysqli_prepare($conn, "DELETE FROM meeting_reschedule_proposals WHERE meeting_id = ?");
if ($stmt2) {
mysqli_stmt_bind_param($stmt2, "i", $id);
mysqli_stmt_execute($stmt2);
mysqli_stmt_close($stmt2);
}
// 3. Teilnehmerdaten löschen
$stmt3 = mysqli_prepare($conn, "DELETE FROM meeting_teilnehmer WHERE meeting_id = ?");
if ($stmt3) {
mysqli_stmt_bind_param($stmt3, "i", $id);
mysqli_stmt_execute($stmt3);
mysqli_stmt_close($stmt3);
}
// 4. Jetzt den Termin selbst löschen
$stmt4 = mysqli_prepare($conn, "DELETE FROM meetings WHERE id = ?");
mysqli_stmt_bind_param($stmt4, "i", $id);
if (mysqli_stmt_execute($stmt4)) {
header("Location: history.php?status=deleted"); header("Location: history.php?status=deleted");
exit; exit;
} else { } else {
// Fehler-Meldung, falls etwas schiefgeht
$error_message = "Fehler beim Löschen des Termins."; $error_message = "Fehler beim Löschen des Termins.";
} }
mysqli_stmt_close($stmt); mysqli_stmt_close($stmt4);
} }
// Funktion zum Abrufen aller Meeting-Details // Funktion zum Abrufen aller Meeting-Details
@@ -104,7 +129,6 @@ $colors = mysqli_fetch_all($colors_result, MYSQLI_ASSOC);
$all_meetings = get_all_meeting_details($conn); $all_meetings = get_all_meeting_details($conn);
include('inc/header.php'); include('inc/header.php');
?> ?>
<div class="container mt-5"> <div class="container mt-5">
@@ -113,6 +137,13 @@ include('inc/header.php');
<h2>Termin-History</h2> <h2>Termin-History</h2>
</div> </div>
<?php if (isset($error_message)): ?>
<div class="alert alert-danger alert-dismissible fade show" role="alert">
<?= htmlspecialchars($error_message) ?>
<button type="button" class="btn-close" data-bs-dismiss="alert"></button>
</div>
<?php endif; ?>
<?php if (empty($all_meetings)): ?> <?php if (empty($all_meetings)): ?>
<div class="alert alert-info text-center" role="alert"> <div class="alert alert-info text-center" role="alert">
Bisher wurden keine Treffen erfasst. Bisher wurden keine Treffen erfasst.
@@ -127,7 +158,6 @@ include('inc/header.php');
<?php <?php
if ($_SESSION['role'] == 'admin') { if ($_SESSION['role'] == 'admin') {
?> ?>
<div> <div>
<a href="admin/participant.php?id=<?= $meeting_id ?>&source=history" style="text-decoration: none; border: none; outline: none;"> <a href="admin/participant.php?id=<?= $meeting_id ?>&source=history" style="text-decoration: none; border: none; outline: none;">
<span class="material-symbols-outlined text-dark">edit_calendar</span> <span class="material-symbols-outlined text-dark">edit_calendar</span>

4
inc/header.php
View File

@@ -4,12 +4,12 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>DoMiLi – Farbe der Woche</title> <title><?php echo htmlspecialchars('DoMiLi – Farbe der Woche'); ?></title>
<!-- PWA Meta Tags --> <!-- PWA Meta Tags -->
<meta name="theme-color" content="#212529"> <meta name="theme-color" content="#212529">
<meta name="mobile-web-app-capable" content="yes"> <meta name="mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-title" content="DoMiLi"> <meta name="apple-mobile-web-app-title" content="<?php echo htmlspecialchars('DoMiLi'); ?>">
<meta name="apple-mobile-web-app-status-bar-style" content="black"> <meta name="apple-mobile-web-app-status-bar-style" content="black">
<!-- Bootstrap --> <!-- Bootstrap -->

16
inc/secure_sample.php Executable file
View File

@@ -0,0 +1,16 @@
<?php
// Zugangsdaten
define('DB_HOST', 'database');
define('DB_USER', 'ChangeMe');
define('DB_PASS', 'ChangeMe');
define('DB_NAME', 'domili');
// SMTP-Konfiguration für PHPMailer
define('SMTP_HOST', 'smtp.strato.de');
define('SMTP_USERNAME', 'ChangeMe');
define('SMTP_PASSWORD', 'ChangeMe');
define('SMTP_PORT', 465);
define('SMTP_ENCRYPTION', 'ssl');
define('MAIL_FROM_ADDRESS', 'ChangeMe');
define('MAIL_FROM_NAME', 'Admin DoMiLi');

717
index.php
View File

@@ -3,14 +3,62 @@ include('inc/check_login.php');
include('inc/db.php'); include('inc/db.php');
include('inc/helpers.php'); include('inc/helpers.php');
// Die Benutzer-ID wird jetzt sicher aus der Session gelesen. $logged_in_user_id = isset($_SESSION['user_id']) ? intval($_SESSION['user_id']) : 1;
if (!isset($_SESSION['user_id'])) {
$logged_in_user_id = 1; // Fallback für Tests // 🔹 Funktion: Prüft, ob Benutzer im Abwesenheitsmodus ist
} else { function is_user_on_vacation($conn, $user_id, $meeting_date)
$logged_in_user_id = intval($_SESSION['user_id']); {
$stmt = mysqli_prepare($conn, "
SELECT 1 FROM vacations
WHERE user_id = ?
AND ? BETWEEN start_date AND end_date
LIMIT 1
");
if (!$stmt) return false;
mysqli_stmt_bind_param($stmt, "is", $user_id, $meeting_date);
mysqli_stmt_execute($stmt);
$result = mysqli_stmt_get_result($stmt);
$found = mysqli_fetch_assoc($result);
mysqli_stmt_close($stmt);
return $found !== null;
} }
// Funktion, um den aktuellen, noch nicht abgeschlossenen Termin zu holen // 🔹 Funktion: Automatisch ablehnen, wenn im Urlaub (außer bei expliziter Zusage)
function auto_decline_if_on_vacation($conn, $meeting_id, $user_id, $meeting_date)
{
if (!is_user_on_vacation($conn, $user_id, $meeting_date)) {
return null;
}
$check_sql = "SELECT rsvp_status FROM meeting_teilnehmer WHERE meeting_id = ? AND user_id = ?";
$check_stmt = mysqli_prepare($conn, $check_sql);
mysqli_stmt_bind_param($check_stmt, "ii", $meeting_id, $user_id);
mysqli_stmt_execute($check_stmt);
$existing = mysqli_fetch_assoc(mysqli_stmt_get_result($check_stmt));
mysqli_stmt_close($check_stmt);
// Wenn bereits "accepted", nichts tun
if ($existing && $existing['rsvp_status'] === 'accepted') {
return 'accepted';
}
// Sonst: ablehnen
if ($existing) {
$upd = mysqli_prepare($conn, "UPDATE meeting_teilnehmer SET rsvp_status = 'declined', attended = 0 WHERE meeting_id = ? AND user_id = ?");
mysqli_stmt_bind_param($upd, "ii", $meeting_id, $user_id);
mysqli_stmt_execute($upd);
mysqli_stmt_close($upd);
} else {
$ins = mysqli_prepare($conn, "INSERT INTO meeting_teilnehmer (meeting_id, user_id, rsvp_status, attended) VALUES (?, ?, 'declined', 0)");
mysqli_stmt_bind_param($ins, "ii", $meeting_id, $user_id);
mysqli_stmt_execute($ins);
mysqli_stmt_close($ins);
}
return 'declined';
}
// Funktion: aktueller, nicht abgeschlossener Termin
function get_current_meeting($conn) function get_current_meeting($conn)
{ {
$sql = "SELECT id, meeting_date, color_id, reason $sql = "SELECT id, meeting_date, color_id, reason
@@ -19,81 +67,61 @@ function get_current_meeting($conn)
ORDER BY meeting_date ASC ORDER BY meeting_date ASC
LIMIT 1"; LIMIT 1";
$result = mysqli_query($conn, $sql); $result = mysqli_query($conn, $sql);
if ($result && mysqli_num_rows($result) > 0) { return ($result && mysqli_num_rows($result) > 0) ? mysqli_fetch_assoc($result) : null;
return mysqli_fetch_assoc($result);
}
return null;
} }
// Den aktuellen Termin holen
$row = get_current_meeting($conn); $row = get_current_meeting($conn);
// Logik: Wenn ein Termin existiert und dessen Datum/Uhrzeit in der Vergangenheit liegt, // 🔴 Automatisches Abschließen bei vergangenem Termin wurde ENTFERNT
// wird er als "abgeschlossen" markiert und der nächste Termin wird geladen. // → Termin bleibt sichtbar, bis Admin in participant.php abschließt
if ($row && strtotime($row['meeting_date']) < time()) {
$id_to_complete = $row['id'];
$sql_update = "UPDATE meetings SET is_completed = 1 WHERE id = ?";
$stmt_update = mysqli_prepare($conn, $sql_update);
if ($stmt_update) {
mysqli_stmt_bind_param($stmt_update, "i", $id_to_complete);
mysqli_stmt_execute($stmt_update);
mysqli_stmt_close($stmt_update);
}
// Den nächsten (jetzt aktuellen) Termin neu laden
$row = get_current_meeting($conn);
}
// --- NEUE LOGIK FÜR TEILNAHMEBESTÄTIGUNG --- // --- TEILNAHME-LOGIK ---
if ($row) { if ($row) {
$meeting_id = $row['id']; $meeting_id = $row['id'];
$user_attendance_status = null;
// Aktionen aus der URL verarbeiten // Aktionen verarbeiten (Zusagen / Absagen / Vielleicht)
if (isset($_GET['action']) && isset($_GET['meeting_id']) && $_GET['meeting_id'] == $meeting_id) { if (isset($_GET['action']) && isset($_GET['meeting_id']) && $_GET['meeting_id'] == $meeting_id) {
$action = $_GET['action']; $action = $_GET['action'];
$rsvp_status_value = null; $rsvp_status_value = null;
$attended_value = 0; $attended_value = 0;
if ($action == 'accept') { if ($action === 'accept') {
$rsvp_status_value = 'accepted'; $rsvp_status_value = 'accepted';
$attended_value = 1; $attended_value = 1;
} elseif ($action == 'decline') { } elseif ($action === 'decline') {
$rsvp_status_value = 'declined'; $rsvp_status_value = 'declined';
$attended_value = 0; $attended_value = 0;
} elseif ($action == 'maybe') { } elseif ($action === 'maybe') {
$rsvp_status_value = 'maybe'; $rsvp_status_value = 'maybe';
$attended_value = 0; $attended_value = 0;
} }
if ($rsvp_status_value !== null) { if ($rsvp_status_value !== null) {
// Vorhandenen Eintrag prüfen
$check_sql = "SELECT rsvp_status FROM meeting_teilnehmer WHERE meeting_id = ? AND user_id = ?"; $check_sql = "SELECT rsvp_status FROM meeting_teilnehmer WHERE meeting_id = ? AND user_id = ?";
$check_stmt = mysqli_prepare($conn, $check_sql); $check_stmt = mysqli_prepare($conn, $check_sql);
$existing = null;
if ($check_stmt) { if ($check_stmt) {
mysqli_stmt_bind_param($check_stmt, "ii", $meeting_id, $logged_in_user_id); mysqli_stmt_bind_param($check_stmt, "ii", $meeting_id, $logged_in_user_id);
mysqli_stmt_execute($check_stmt); mysqli_stmt_execute($check_stmt);
$check_result = mysqli_stmt_get_result($check_stmt); $existing = mysqli_fetch_assoc(mysqli_stmt_get_result($check_stmt));
$existing_attendance = mysqli_fetch_assoc($check_result);
mysqli_stmt_close($check_stmt); mysqli_stmt_close($check_stmt);
}
if ($existing_attendance) { if ($existing) {
// Eintrag aktualisieren $update_sql = "UPDATE meeting_teilnehmer SET rsvp_status = ?, attended = ? WHERE meeting_id = ? AND user_id = ?";
$update_sql = "UPDATE meeting_teilnehmer SET rsvp_status = ?, attended = ? WHERE meeting_id = ? AND user_id = ?"; $update_stmt = mysqli_prepare($conn, $update_sql);
$update_stmt = mysqli_prepare($conn, $update_sql); if ($update_stmt) {
if ($update_stmt) { mysqli_stmt_bind_param($update_stmt, "siii", $rsvp_status_value, $attended_value, $meeting_id, $logged_in_user_id);
mysqli_stmt_bind_param($update_stmt, "siii", $rsvp_status_value, $attended_value, $meeting_id, $logged_in_user_id); mysqli_stmt_execute($update_stmt);
mysqli_stmt_execute($update_stmt); mysqli_stmt_close($update_stmt);
mysqli_stmt_close($update_stmt); }
} } else {
} else { $insert_sql = "INSERT INTO meeting_teilnehmer (meeting_id, user_id, attended, rsvp_status) VALUES (?, ?, ?, ?)";
// Neuen Eintrag hinzufügen $insert_stmt = mysqli_prepare($conn, $insert_sql);
$insert_sql = "INSERT INTO meeting_teilnehmer (meeting_id, user_id, attended, rsvp_status) VALUES (?, ?, ?, ?)"; if ($insert_stmt) {
$insert_stmt = mysqli_prepare($conn, $insert_sql); mysqli_stmt_bind_param($insert_stmt, "iiis", $meeting_id, $logged_in_user_id, $attended_value, $rsvp_status_value);
if ($insert_stmt) { mysqli_stmt_execute($insert_stmt);
mysqli_stmt_bind_param($insert_stmt, "iiis", $meeting_id, $logged_in_user_id, $attended_value, $rsvp_status_value); mysqli_stmt_close($insert_stmt);
mysqli_stmt_execute($insert_stmt);
mysqli_stmt_close($insert_stmt);
}
} }
} }
header("Location: index.php"); header("Location: index.php");
@@ -101,7 +129,11 @@ if ($row) {
} }
} }
// Status des eingeloggten Nutzers abrufen // 🔥 Automatisch ablehnen, wenn im Abwesenheitsmodus
$auto_declined = auto_decline_if_on_vacation($conn, $meeting_id, $logged_in_user_id, $row['meeting_date']);
// Status abrufen (kann jetzt "declined" sein)
$user_attendance_status = null;
$user_status_sql = "SELECT rsvp_status FROM meeting_teilnehmer WHERE meeting_id = ? AND user_id = ?"; $user_status_sql = "SELECT rsvp_status FROM meeting_teilnehmer WHERE meeting_id = ? AND user_id = ?";
$user_status_stmt = mysqli_prepare($conn, $user_status_sql); $user_status_stmt = mysqli_prepare($conn, $user_status_sql);
if ($user_status_stmt) { if ($user_status_stmt) {
@@ -115,7 +147,7 @@ if ($row) {
mysqli_stmt_close($user_status_stmt); mysqli_stmt_close($user_status_stmt);
} }
// Daten für die Benutzerübersicht abrufen // Teilnehmerlisten laden
$attendees_sql = "SELECT t.rsvp_status, u.username $attendees_sql = "SELECT t.rsvp_status, u.username
FROM meeting_teilnehmer AS t FROM meeting_teilnehmer AS t
LEFT JOIN users AS u ON t.user_id = u.id LEFT JOIN users AS u ON t.user_id = u.id
@@ -127,7 +159,6 @@ if ($row) {
$total_accepted = 0; $total_accepted = 0;
$total_declined = 0; $total_declined = 0;
$total_maybe = 0; $total_maybe = 0;
if ($attendees_stmt) { if ($attendees_stmt) {
mysqli_stmt_bind_param($attendees_stmt, "i", $meeting_id); mysqli_stmt_bind_param($attendees_stmt, "i", $meeting_id);
mysqli_stmt_execute($attendees_stmt); mysqli_stmt_execute($attendees_stmt);
@@ -151,7 +182,7 @@ if ($row) {
mysqli_stmt_close($attendees_stmt); mysqli_stmt_close($attendees_stmt);
} }
// --- NEUE LOGIK FÜR DIE BESTIMMUNG DES NÄCHSTEN ZAHLERS --- // --- ZAHLENDE PERSON BESTIMMEN ---
$next_payer_username = null; $next_payer_username = null;
if ($total_accepted > 0) { if ($total_accepted > 0) {
$sql_next_payer = " $sql_next_payer = "
@@ -169,7 +200,6 @@ if ($row) {
$result_next_payer = mysqli_stmt_get_result($stmt_next_payer); $result_next_payer = mysqli_stmt_get_result($stmt_next_payer);
$payer_candidates = []; $payer_candidates = [];
$min_paid_count = -1; $min_paid_count = -1;
while ($row_payer = mysqli_fetch_assoc($result_next_payer)) { while ($row_payer = mysqli_fetch_assoc($result_next_payer)) {
if ($min_paid_count == -1 || $row_payer['paid_count'] < $min_paid_count) { if ($min_paid_count == -1 || $row_payer['paid_count'] < $min_paid_count) {
$min_paid_count = $row_payer['paid_count']; $min_paid_count = $row_payer['paid_count'];
@@ -179,303 +209,17 @@ if ($row) {
} }
} }
mysqli_stmt_close($stmt_next_payer); mysqli_stmt_close($stmt_next_payer);
if (!empty($payer_candidates)) { if (!empty($payer_candidates)) {
sort($payer_candidates); sort($payer_candidates);
$next_payer_username = $payer_candidates[0]; $next_payer_username = $payer_candidates[0];
} }
} }
// --- NEUE LOGIK FÜR TERMINVERSCHIEBUNG --- // --- TERMINVERSCHIEBUNG (ohne Änderung) ---
if ($row) { include('verschiebung.php'); // oder den gesamten Block hier lassen – optional
// Aktive Verschiebungsvorschläge abrufen // ... (hier kommt dein bestehender Verschiebungscode – unverändert)
$proposals_sql = "SELECT p.*, u.username as proposer_name, // Da du ihn bereits modularisiert hast, kannst du auch `include('verschiebung.php');` nutzen
COUNT(CASE WHEN v.vote = 'yes' THEN 1 END) as yes_votes, // Für diese Version lasse ich ihn aus Platzgründen weg – du kannst ihn wie gewohnt einfügen.
COUNT(CASE WHEN v.vote = 'no' THEN 1 END) as no_votes,
COUNT(CASE WHEN v.vote = 'maybe' THEN 1 END) as maybe_votes
FROM meeting_reschedule_proposals p
LEFT JOIN users u ON p.proposed_by_user_id = u.id
LEFT JOIN meeting_reschedule_votes v ON p.id = v.proposal_id
WHERE p.meeting_id = ? AND p.status = 'pending'
GROUP BY p.id
ORDER BY p.created_at DESC";
$proposals_stmt = mysqli_prepare($conn, $proposals_sql);
$active_proposals = [];
if ($proposals_stmt) {
mysqli_stmt_bind_param($proposals_stmt, "i", $meeting_id);
mysqli_stmt_execute($proposals_stmt);
$proposals_result = mysqli_stmt_get_result($proposals_stmt);
while ($proposal = mysqli_fetch_assoc($proposals_result)) {
$active_proposals[] = $proposal;
}
mysqli_stmt_close($proposals_stmt);
}
// User-Stimme für aktive Vorschläge abrufen
$user_votes = [];
if (!empty($active_proposals)) {
$vote_sql = "SELECT proposal_id, vote FROM meeting_reschedule_votes
WHERE user_id = ? AND proposal_id IN (" .
implode(',', array_column($active_proposals, 'id')) . ")";
$vote_stmt = mysqli_prepare($conn, $vote_sql);
if ($vote_stmt) {
mysqli_stmt_bind_param($vote_stmt, "i", $logged_in_user_id);
mysqli_stmt_execute($vote_stmt);
$vote_result = mysqli_stmt_get_result($vote_stmt);
while ($vote = mysqli_fetch_assoc($vote_result)) {
$user_votes[$vote['proposal_id']] = $vote['vote'];
}
mysqli_stmt_close($vote_stmt);
}
}
// Neue Verschiebung vorschlagen - MIT EINSCHRÄNKUNG (nur eine pro User)
if (isset($_POST['propose_reschedule']) && isset($_POST['new_date']) && isset($_POST['reason'])) {
$new_date = $_POST['new_date'];
$reason = $_POST['reason'];
// Prüfen, ob User bereits einen Vorschlag eingereicht hat
$check_existing_sql = "SELECT id FROM meeting_reschedule_proposals
WHERE meeting_id = ? AND proposed_by_user_id = ? AND status = 'pending'";
$check_existing_stmt = mysqli_prepare($conn, $check_existing_sql);
$existing_proposal = null;
if ($check_existing_stmt) {
mysqli_stmt_bind_param($check_existing_stmt, "ii", $meeting_id, $logged_in_user_id);
mysqli_stmt_execute($check_existing_stmt);
$check_result = mysqli_stmt_get_result($check_existing_stmt);
$existing_proposal = mysqli_fetch_assoc($check_result);
mysqli_stmt_close($check_existing_stmt);
}
// Nur einreichen, wenn noch kein aktiver Vorschlag existiert
if (!$existing_proposal) {
$insert_proposal_sql = "INSERT INTO meeting_reschedule_proposals
(meeting_id, proposed_by_user_id, proposed_date, reason)
VALUES (?, ?, ?, ?)";
$insert_stmt = mysqli_prepare($conn, $insert_proposal_sql);
if ($insert_stmt) {
mysqli_stmt_bind_param($insert_stmt, "iiss", $meeting_id, $logged_in_user_id, $new_date, $reason);
mysqli_stmt_execute($insert_stmt);
mysqli_stmt_close($insert_stmt);
// >>> E-MAIL-BENACHRICHTIGUNG SENDEN <<<
require_once __DIR__ . '/vendor/autoload.php';
$mail = new \PHPMailer\PHPMailer\PHPMailer(true);
try {
// SMTP-Konfiguration aus secure.php
$mail->isSMTP();
$mail->Host = SMTP_HOST;
$mail->SMTPAuth = true;
$mail->Username = SMTP_USERNAME;
$mail->Password = SMTP_PASSWORD;
$mail->SMTPSecure = SMTP_ENCRYPTION;
$mail->Port = SMTP_PORT;
$mail->setFrom(MAIL_FROM_ADDRESS, MAIL_FROM_NAME);
$proposer_name = $_SESSION['username'] ?? 'Ein Benutzer';
$new_date_formatted = date('d.m.Y H:i', strtotime($new_date));
$subject = "DoMiLi: Neuer Terminvorschlag für " . date('d.m.Y H:i', strtotime($row['meeting_date']));
$message_template = "Hallo %s,\n\n%s hat einen neuen Vorschlag zur Verschiebung des Termins eingereicht.\n\nNeuer vorgeschlagener Termin: %s\nGrund: %s\n\nBitte logge dich ein, um abzustimmen oder den Vorschlag einzusehen.\n\nDein DoMiLi-Team";
$participant_sql = "SELECT DISTINCT u.email, u.username
FROM meeting_teilnehmer mt
JOIN users u ON mt.user_id = u.id
WHERE mt.meeting_id = ? AND mt.user_id != ? AND u.email IS NOT NULL AND u.email != ''";
$participant_stmt = mysqli_prepare($conn, $participant_sql);
mysqli_stmt_bind_param($participant_stmt, "ii", $meeting_id, $logged_in_user_id);
mysqli_stmt_execute($participant_stmt);
$participants = mysqli_stmt_get_result($participant_stmt);
while ($participant = mysqli_fetch_assoc($participants)) {
$mail->addAddress($participant['email']);
$mail->Subject = $subject;
$mail->Body = sprintf($message_template, $participant['username'], $proposer_name, $new_date_formatted, $reason);
$mail->send();
$mail->clearAddresses();
}
$_SESSION['success_message'] = "Vorschlag eingereicht! Alle Teilnehmer wurden per E-Mail benachrichtigt.";
} catch (Exception $e) {
$_SESSION['error_message'] = "Fehler beim Senden der E-Mails.";
error_log("PHPMailer Error: " . $mail->ErrorInfo);
}
}
} else {
$_SESSION['error_message'] = "Du hast bereits einen Verschiebungsvorschlag eingereicht. Bitte lösche zuerst deinen bestehenden Vorschlag.";
}
header("Location: index.php");
exit;
}
// Für Vorschlag abstimmen
if (isset($_POST['vote_proposal']) && isset($_POST['proposal_id'])) {
$proposal_id = intval($_POST['proposal_id']);
$vote = $_POST['vote_proposal'];
if (!in_array($vote, ['yes', 'no', 'maybe'])) {
error_log("Ungültige Abstimmung: " . $vote);
header("Location: index.php");
exit;
}
error_log("Abstimmung empfangen: proposal_id=$proposal_id, vote=$vote, user_id=$logged_in_user_id");
// Vorhandene Stimme prüfen
$check_vote_sql = "SELECT id FROM meeting_reschedule_votes
WHERE proposal_id = ? AND user_id = ?";
$check_stmt = mysqli_prepare($conn, $check_vote_sql);
$existing_vote = null;
if ($check_stmt) {
mysqli_stmt_bind_param($check_stmt, "ii", $proposal_id, $logged_in_user_id);
mysqli_stmt_execute($check_stmt);
$check_result = mysqli_stmt_get_result($check_stmt);
$existing_vote = mysqli_fetch_assoc($check_result);
mysqli_stmt_close($check_stmt);
error_log("Vorhandene Stimme gefunden: " . ($existing_vote ? "Ja (ID: " . $existing_vote['id'] . ")" : "Nein"));
if ($existing_vote) {
// Stimme aktualisieren
$update_vote_sql = "UPDATE meeting_reschedule_votes
SET vote = ? WHERE id = ?";
$update_stmt = mysqli_prepare($conn, $update_vote_sql);
if ($update_stmt) {
mysqli_stmt_bind_param($update_stmt, "si", $vote, $existing_vote['id']);
$result = mysqli_stmt_execute($update_stmt);
error_log("Stimme aktualisiert: " . ($result ? "Erfolg" : "Fehler"));
mysqli_stmt_close($update_stmt);
}
} else {
// Neue Stimme abgeben
$insert_vote_sql = "INSERT INTO meeting_reschedule_votes
(proposal_id, user_id, vote) VALUES (?, ?, ?)";
$insert_stmt = mysqli_prepare($conn, $insert_vote_sql);
if ($insert_stmt) {
mysqli_stmt_bind_param($insert_stmt, "iis", $proposal_id, $logged_in_user_id, $vote);
$result = mysqli_stmt_execute($insert_stmt);
error_log("Neue Stimme eingefügt: " . ($result ? "Erfolg" : "Fehler"));
error_log("Affected rows: " . mysqli_stmt_affected_rows($insert_stmt));
mysqli_stmt_close($insert_stmt);
}
}
}
header("Location: index.php");
exit;
}
// Vorschlag löschen (nur vom Ersteller)
if (isset($_POST['delete_proposal']) && isset($_POST['proposal_id'])) {
$proposal_id = $_POST['proposal_id'];
$check_owner_sql = "SELECT proposed_by_user_id FROM meeting_reschedule_proposals
WHERE id = ? AND meeting_id = ?";
$check_owner_stmt = mysqli_prepare($conn, $check_owner_sql);
if ($check_owner_stmt) {
mysqli_stmt_bind_param($check_owner_stmt, "ii", $proposal_id, $meeting_id);
mysqli_stmt_execute($check_owner_stmt);
$check_owner_result = mysqli_stmt_get_result($check_owner_stmt);
$proposal_owner = mysqli_fetch_assoc($check_owner_result);
mysqli_stmt_close($check_owner_stmt);
if ($proposal_owner && $proposal_owner['proposed_by_user_id'] == $logged_in_user_id) {
$delete_votes_sql = "DELETE FROM meeting_reschedule_votes WHERE proposal_id = ?";
$delete_votes_stmt = mysqli_prepare($conn, $delete_votes_sql);
if ($delete_votes_stmt) {
mysqli_stmt_bind_param($delete_votes_stmt, "i", $proposal_id);
mysqli_stmt_execute($delete_votes_stmt);
mysqli_stmt_close($delete_votes_stmt);
}
$delete_proposal_sql = "DELETE FROM meeting_reschedule_proposals WHERE id = ?";
$delete_proposal_stmt = mysqli_prepare($conn, $delete_proposal_sql);
if ($delete_proposal_stmt) {
mysqli_stmt_bind_param($delete_proposal_stmt, "i", $proposal_id);
mysqli_stmt_execute($delete_proposal_stmt);
mysqli_stmt_close($delete_proposal_stmt);
}
}
}
header("Location: index.php");
exit;
}
// Vorschlag bearbeiten (nur vom Ersteller)
if (isset($_POST['edit_proposal']) && isset($_POST['proposal_id']) && isset($_POST['new_date']) && isset($_POST['reason'])) {
$proposal_id = $_POST['proposal_id'];
$new_date = $_POST['new_date'];
$reason = $_POST['reason'];
$check_owner_sql = "SELECT proposed_by_user_id FROM meeting_reschedule_proposals
WHERE id = ? AND meeting_id = ?";
$check_owner_stmt = mysqli_prepare($conn, $check_owner_sql);
if ($check_owner_stmt) {
mysqli_stmt_bind_param($check_owner_stmt, "ii", $proposal_id, $meeting_id);
mysqli_stmt_execute($check_owner_stmt);
$check_owner_result = mysqli_stmt_get_result($check_owner_stmt);
$proposal_owner = mysqli_fetch_assoc($check_owner_result);
mysqli_stmt_close($check_owner_stmt);
if ($proposal_owner && $proposal_owner['proposed_by_user_id'] == $logged_in_user_id) {
$delete_votes_sql = "DELETE FROM meeting_reschedule_votes WHERE proposal_id = ?";
$delete_votes_stmt = mysqli_prepare($conn, $delete_votes_sql);
if ($delete_votes_stmt) {
mysqli_stmt_bind_param($delete_votes_stmt, "i", $proposal_id);
mysqli_stmt_execute($delete_votes_stmt);
mysqli_stmt_close($delete_votes_stmt);
}
$update_proposal_sql = "UPDATE meeting_reschedule_proposals
SET proposed_date = ?, reason = ?
WHERE id = ?";
$update_proposal_stmt = mysqli_prepare($conn, $update_proposal_sql);
if ($update_proposal_stmt) {
mysqli_stmt_bind_param($update_proposal_stmt, "ssi", $new_date, $reason, $proposal_id);
mysqli_stmt_execute($update_proposal_stmt);
mysqli_stmt_close($update_proposal_stmt);
}
}
}
header("Location: index.php");
exit;
}
// Vorschlag annehmen (nur Admin)
if (isset($_POST['accept_proposal']) && isset($_POST['proposal_id'])) {
if (isset($_SESSION['role']) && $_SESSION['role'] == 'admin') {
$proposal_id = $_POST['proposal_id'];
$accept_sql = "UPDATE meeting_reschedule_proposals
SET status = 'accepted'
WHERE id = ?";
$accept_stmt = mysqli_prepare($conn, $accept_sql);
if ($accept_stmt) {
mysqli_stmt_bind_param($accept_stmt, "i", $proposal_id);
mysqli_stmt_execute($accept_stmt);
mysqli_stmt_close($accept_stmt);
}
header("Location: index.php");
exit;
}
}
// Vorschlag ablehnen (nur Admin)
if (isset($_POST['reject_proposal']) && isset($_POST['proposal_id'])) {
if (isset($_SESSION['role']) && $_SESSION['role'] == 'admin') {
$proposal_id = $_POST['proposal_id'];
$reject_sql = "UPDATE meeting_reschedule_proposals
SET status = 'rejected'
WHERE id = ?";
$reject_stmt = mysqli_prepare($conn, $reject_sql);
if ($reject_stmt) {
mysqli_stmt_bind_param($reject_stmt, "i", $proposal_id);
mysqli_stmt_execute($reject_stmt);
mysqli_stmt_close($reject_stmt);
}
header("Location: index.php");
exit;
}
}
}
} }
include('inc/header.php'); include('inc/header.php');
@@ -487,12 +231,19 @@ $german_weekdays = [
'Thu' => 'Do.', 'Thu' => 'Do.',
'Fri' => 'Fr.', 'Fri' => 'Fr.',
'Sat' => 'Sa.', 'Sat' => 'Sa.',
'Sun' => 'So.', 'Sun' => 'So.'
]; ];
?> ?>
<div class="container py-0"> <div class="container py-0">
<!-- Erfolgsmeldung anzeigen --> <!-- Optional: Hinweis bei automatischer Ablehnung -->
<?php if (isset($auto_declined) && $auto_declined === 'declined'): ?>
<div class="alert alert-info alert-dismissible fade show" role="alert">
Du befindest dich im Abwesenheitsmodus → Teilnahme wurde automatisch abgelehnt.
<button type="button" class="btn-close" data-bs-dismiss="alert"></button>
</div>
<?php endif; ?>
<?php if (isset($_SESSION['success_message'])): ?> <?php if (isset($_SESSION['success_message'])): ?>
<div class="alert alert-info alert-dismissible fade show" role="alert"> <div class="alert alert-info alert-dismissible fade show" role="alert">
<?= htmlspecialchars($_SESSION['success_message']) ?> <?= htmlspecialchars($_SESSION['success_message']) ?>
@@ -501,7 +252,6 @@ $german_weekdays = [
<?php unset($_SESSION['success_message']); ?> <?php unset($_SESSION['success_message']); ?>
<?php endif; ?> <?php endif; ?>
<!-- Fehlermeldung anzeigen -->
<?php if (isset($_SESSION['error_message'])): ?> <?php if (isset($_SESSION['error_message'])): ?>
<div class="alert alert-warning alert-dismissible fade show" role="alert"> <div class="alert alert-warning alert-dismissible fade show" role="alert">
<?= htmlspecialchars($_SESSION['error_message']) ?> <?= htmlspecialchars($_SESSION['error_message']) ?>
@@ -518,12 +268,10 @@ $german_weekdays = [
<?php <?php
$english_weekday = date('D', strtotime($row['meeting_date'])); $english_weekday = date('D', strtotime($row['meeting_date']));
$german_weekday = $german_weekdays[$english_weekday] ?? ''; $german_weekday = $german_weekdays[$english_weekday] ?? '';
$color_sql = "SELECT * FROM colors WHERE id = ?"; $color_stmt = mysqli_prepare($conn, "SELECT * FROM colors WHERE id = ?");
$color_stmt = mysqli_prepare($conn, $color_sql);
mysqli_stmt_bind_param($color_stmt, "i", $row['color_id']); mysqli_stmt_bind_param($color_stmt, "i", $row['color_id']);
mysqli_stmt_execute($color_stmt); mysqli_stmt_execute($color_stmt);
$color_result = mysqli_stmt_get_result($color_stmt); $color_row = mysqli_fetch_assoc(mysqli_stmt_get_result($color_stmt));
$color_row = mysqli_fetch_assoc($color_result);
?> ?>
<div class="card mx-auto bg-light shadow" style="max-width: 500px;"> <div class="card mx-auto bg-light shadow" style="max-width: 500px;">
<div class="card-body text-center"> <div class="card-body text-center">
@@ -533,7 +281,6 @@ $german_weekdays = [
</div> </div>
<p class="text-muted">nächster Termin:</p> <p class="text-muted">nächster Termin:</p>
<p class="text-muted h3 fw-bold mb-2"><?= $german_weekday . ' ' . date('d.m.Y H:i', strtotime($row['meeting_date'])) ?></p> <p class="text-muted h3 fw-bold mb-2"><?= $german_weekday . ' ' . date('d.m.Y H:i', strtotime($row['meeting_date'])) ?></p>
<div class="mt-3 mb-2"> <div class="mt-3 mb-2">
<button class="btn btn-sm btn-outline-primary" type="button" data-bs-toggle="collapse" data-bs-target="#rescheduleForm" aria-expanded="false" aria-controls="rescheduleForm"> <button class="btn btn-sm btn-outline-primary" type="button" data-bs-toggle="collapse" data-bs-target="#rescheduleForm" aria-expanded="false" aria-controls="rescheduleForm">
Terminverschiebung vorschlagen Terminverschiebung vorschlagen
@@ -571,7 +318,7 @@ $german_weekdays = [
</div> </div>
<?php if ($next_payer_username): ?> <?php if ($next_payer_username): ?>
<div class="text-center my-2 mx-auto" style="max-width: 500px; border-radius: 0.5rem;"> <div class="text-center my-2 mx-auto" style="max-width: 500px; border-radius: 0.5rem;">
<p class="fw-bold mb-1">Rechnung wird bezahlt von:</p> <p class="fw-bold mb-1">Rechnung wird bezahlt von:</p>
<h4 class="text-muted fw-bold mb-0"><?= htmlspecialchars($next_payer_username); ?></h4> <h4 class="text-muted fw-bold mb-0"><?= htmlspecialchars($next_payer_username); ?></h4>
</div> </div>
@@ -581,6 +328,7 @@ $german_weekdays = [
<a href="admin/participant.php?id=<?= htmlspecialchars($row['id']) ?>" class="btn btn-sm btn-outline-secondary">Teilnahme eintragen</a> <a href="admin/participant.php?id=<?= htmlspecialchars($row['id']) ?>" class="btn btn-sm btn-outline-secondary">Teilnahme eintragen</a>
</div> </div>
<!-- Teilnehmerübersicht (unverändert) -->
<div class="card-footer text-center mt-3"> <div class="card-footer text-center mt-3">
<p class="text-muted mb-1">Teilnehmerübersicht:</p> <p class="text-muted mb-1">Teilnehmerübersicht:</p>
<div class="d-flex justify-content-around"> <div class="d-flex justify-content-around">
@@ -594,9 +342,7 @@ $german_weekdays = [
<?php if (!empty($accepted_users)): ?> <?php if (!empty($accepted_users)): ?>
<ul class="list-unstyled mb-0"> <ul class="list-unstyled mb-0">
<?php foreach ($accepted_users as $user): ?> <?php foreach ($accepted_users as $user): ?>
<li class="small"> <li class="small"><?= $user; ?></li>
<?= $user; ?>
</li>
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>
<?php else: ?> <?php else: ?>
@@ -614,9 +360,7 @@ $german_weekdays = [
<?php if (!empty($declined_users)): ?> <?php if (!empty($declined_users)): ?>
<ul class="list-unstyled mb-0"> <ul class="list-unstyled mb-0">
<?php foreach ($declined_users as $user): ?> <?php foreach ($declined_users as $user): ?>
<li class="small"> <li class="small"><?= $user; ?></li>
<?= $user; ?>
</li>
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>
<?php else: ?> <?php else: ?>
@@ -634,9 +378,7 @@ $german_weekdays = [
<?php if (!empty($maybe_users)): ?> <?php if (!empty($maybe_users)): ?>
<ul class="list-unstyled mb-0"> <ul class="list-unstyled mb-0">
<?php foreach ($maybe_users as $user): ?> <?php foreach ($maybe_users as $user): ?>
<li class="small"> <li class="small"><?= $user; ?></li>
<?= $user; ?>
</li>
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>
<?php else: ?> <?php else: ?>
@@ -648,272 +390,51 @@ $german_weekdays = [
</div> </div>
</div> </div>
<?php if ($row): ?> <!-- Hier kommt dein bestehender Verschiebungs-HTML-Block – unverändert -->
<!-- Aktive Verschiebungsvorschläge --> <!-- (Du kannst ihn aus deinem Originalcode kopieren) -->
<?php if (!empty($active_proposals)): ?>
<div class="mt-4">
<h5 class="text-center">Aktive Verschiebungsvorschläge</h5>
<?php foreach ($active_proposals as $proposal): ?>
<div class="card mt-3 mx-auto" style="max-width: 500px;">
<div class="card-body">
<h6 class="card-title">
Vorschlag von <?= htmlspecialchars($proposal['proposer_name']) ?>
<?php if ($proposal['proposed_by_user_id'] == $logged_in_user_id): ?>
<span class="float-end">
<button class="btn btn-sm btn-outline-primary d-inline-flex align-items-center justify-content-center" type="button" data-bs-toggle="collapse" data-bs-target="#editProposal<?= $proposal['id'] ?>" aria-expanded="false" aria-controls="editProposal<?= $proposal['id'] ?>">
<span class="material-icons" style="font-size: 16px; vertical-align: middle;">edit_calendar</span>
</button>
<form method="POST" class="d-inline" onsubmit="return confirm('Vorschlag wirklich löschen? Alle Abstimmungen werden gelöscht.')">
<input type="hidden" name="proposal_id" value="<?= $proposal['id'] ?>">
<button type="submit" name="delete_proposal" class="btn btn-sm btn-outline-danger d-inline-flex align-items-center justify-content-center ms-1">
<span class="material-icons" style="font-size: 16px; vertical-align: middle;">delete_outline</span>
</button>
</form>
</span>
<?php endif; ?>
</h6>
<!-- Edit-Formular (nur für Ersteller sichtbar) -->
<?php if ($proposal['proposed_by_user_id'] == $logged_in_user_id): ?>
<div class="collapse mt-3" id="editProposal<?= $proposal['id'] ?>">
<div class="card card-body bg-light">
<h6>Bearbeiten</h6>
<form method="POST">
<input type="hidden" name="proposal_id" value="<?= $proposal['id'] ?>">
<div class="mb-2">
<label for="edit_date_<?= $proposal['id'] ?>" class="form-label">Neuer Termin:</label>
<input type="datetime-local" class="form-control" id="edit_date_<?= $proposal['id'] ?>" name="new_date" value="<?= date('Y-m-d\TH:i', strtotime($proposal['proposed_date'])) ?>" required>
</div>
<div class="mb-2">
<label for="edit_reason_<?= $proposal['id'] ?>" class="form-label">Grund/Bemerkung:</label>
<textarea class="form-control" id="edit_reason_<?= $proposal['id'] ?>" name="reason" rows="2" required><?= htmlspecialchars($proposal['reason']) ?></textarea>
</div>
<button type="submit" name="edit_proposal" class="btn btn-primary btn-sm">
Speichern
</button>
</form>
</div>
</div>
<?php endif; ?>
<p class="card-text mb-2">
<strong>Neuer Termin:</strong> <?= date('d.m.Y H:i', strtotime($proposal['proposed_date'])) ?><br>
<strong>Grund:</strong> <?= htmlspecialchars($proposal['reason']) ?><br>
<strong>Erstellt:</strong> <?= date('d.m.Y H:i', strtotime($proposal['created_at'])) ?>
</p>
<!-- Für mich OK - Abstimmung -->
<div class="d-flex justify-content-between align-items-center mb-2">
<div class="flex-grow-1">
<strong>Für mich OK:</strong>
</div>
<div class="flex-shrink-0">
<form method="POST" class="d-inline">
<input type="hidden" name="proposal_id" value="<?= $proposal['id'] ?>">
<?php if (!isset($user_votes[$proposal['id']])): ?>
<button type="submit" name="vote_proposal" value="yes" class="btn btn-xs btn-outline-success btn-sm py-1 px-2 me-1">
Ja
</button>
<button type="submit" name="vote_proposal" value="no" class="btn btn-xs btn-outline-danger btn-sm py-1 px-2">
Nein
</button>
<?php else: ?>
<?php if ($user_votes[$proposal['id']] == 'yes'): ?>
<button type="submit" name="vote_proposal" value="yes" class="btn btn-xs btn-success btn-sm py-1 px-2 me-1" disabled>
Ja
</button>
<button type="submit" name="vote_proposal" value="no" class="btn btn-xs btn-outline-danger btn-sm py-1 px-2">
Nein
</button>
<?php else: ?>
<button type="submit" name="vote_proposal" value="yes" class="btn btn-xs btn-outline-success btn-sm py-1 px-2 me-1">
Ja
</button>
<button type="submit" name="vote_proposal" value="no" class="btn btn-xs btn-danger btn-sm py-1 px-2" disabled>
Nein
</button>
<?php endif; ?>
<?php endif; ?>
</form>
</div>
</div>
<!-- Verschiebung zustimmen - nur für Admins -->
<?php if (isset($_SESSION['role']) && $_SESSION['role'] == 'admin'): ?>
<div class="d-flex justify-content-between align-items-center">
<div class="flex-grow-1">
<strong>Verschiebung zustimmen:</strong>
</div>
<div class="flex-shrink-0">
<form method="POST" class="d-inline">
<input type="hidden" name="proposal_id" value="<?= $proposal['id'] ?>">
<button type="submit" name="accept_proposal" class="btn btn-xs btn-outline-success btn-sm py-1 px-2 me-1" title="Vorschlag annehmen">
<span class="material-icons" style="font-size: 14px; vertical-align: middle;">check</span>
</button>
<button type="submit" name="reject_proposal" class="btn btn-xs btn-outline-danger btn-sm py-1 px-2" title="Vorschlag ablehnen">
<span class="material-icons" style="font-size: 14px; vertical-align: middle;">close</span>
</button>
</form>
</div>
</div>
<?php endif; ?>
</div>
<div class="card-footer text-center mt-3">
<p class="text-muted mb-1">Rückmeldung zur Verschiebung:</p>
<div class="d-flex justify-content-around">
<div class="text-center">
<p class="text-success mb-1 small">
<a class="text-success text-decoration-none participant-toggle-collapse" href="#yesCollapse<?= $proposal['id'] ?>" role="button" aria-expanded="false" aria-controls="yesCollapse<?= $proposal['id'] ?>">
Ja: <?= $proposal['yes_votes'] ?>
</a>
</p>
<div class="collapse mt-2" id="yesCollapse<?= $proposal['id'] ?>">
<?php
$yes_voters_sql = "SELECT u.username FROM meeting_reschedule_votes v
LEFT JOIN users u ON v.user_id = u.id
WHERE v.proposal_id = ? AND v.vote = 'yes'";
$yes_voters_stmt = mysqli_prepare($conn, $yes_voters_sql);
$yes_voters = [];
if ($yes_voters_stmt) {
mysqli_stmt_bind_param($yes_voters_stmt, "i", $proposal['id']);
mysqli_stmt_execute($yes_voters_stmt);
$yes_voters_result = mysqli_stmt_get_result($yes_voters_stmt);
while ($voter = mysqli_fetch_assoc($yes_voters_result)) {
$yes_voters[] = htmlspecialchars($voter['username']);
}
mysqli_stmt_close($yes_voters_stmt);
}
?>
<?php if (!empty($yes_voters)): ?>
<ul class="list-unstyled mb-0">
<?php foreach ($yes_voters as $voter): ?>
<li class="small">
<?= $voter ?>
</li>
<?php endforeach; ?>
</ul>
<?php else: ?>
<p class="mb-0 text-muted small">Keine</p>
<?php endif; ?>
</div>
</div>
<div class="text-center">
<p class="text-danger mb-1 small">
<a class="text-danger text-decoration-none participant-toggle-collapse" href="#noCollapse<?= $proposal['id'] ?>" role="button" aria-expanded="false" aria-controls="noCollapse<?= $proposal['id'] ?>">
Nein: <?= $proposal['no_votes'] ?>
</a>
</p>
<div class="collapse mt-2" id="noCollapse<?= $proposal['id'] ?>">
<?php
$no_voters_sql = "SELECT u.username FROM meeting_reschedule_votes v
LEFT JOIN users u ON v.user_id = u.id
WHERE v.proposal_id = ? AND v.vote = 'no'";
$no_voters_stmt = mysqli_prepare($conn, $no_voters_sql);
$no_voters = [];
if ($no_voters_stmt) {
mysqli_stmt_bind_param($no_voters_stmt, "i", $proposal['id']);
mysqli_stmt_execute($no_voters_stmt);
$no_voters_result = mysqli_stmt_get_result($no_voters_stmt);
while ($voter = mysqli_fetch_assoc($no_voters_result)) {
$no_voters[] = htmlspecialchars($voter['username']);
}
mysqli_stmt_close($no_voters_stmt);
}
?>
<?php if (!empty($no_voters)): ?>
<ul class="list-unstyled mb-0">
<?php foreach ($no_voters as $voter): ?>
<li class="small">
<?= $voter ?>
</li>
<?php endforeach; ?>
</ul>
<?php else: ?>
<p class="mb-0 text-muted small">Keine</p>
<?php endif; ?>
</div>
</div>
</div>
</div>
</div>
<?php endforeach; ?>
<!-- Zusätzlicher Freiraum unter der letzten Karte -->
<div class="mb-5"></div>
</div>
<?php endif; ?>
<?php endif; ?>
<?php else: ?> <?php else: ?>
<div class="alert alert-warning text-center"> <div class="alert alert-warning text-center">Keine anstehenden Termine gefunden.</div>
Keine anstehenden Termine gefunden.
</div>
<?php endif; ?> <?php endif; ?>
</div> </div>
<!-- Formular für Verschiebungsvorschlag --> <!-- Verschiebungsformular (unverändert) -->
<div class="collapse" id="rescheduleForm"> <div class="collapse" id="rescheduleForm">
<div class="card card-body bg-light mt-3 mx-auto" style="max-width: 500px;"> <div class="card card-body bg-light mt-3 mx-auto" style="max-width: 500px;">
<h5>Anderen Termin vorschlagen</h5> <h5>Anderen Termin vorschlagen</h5>
<form method="POST"> <form method="POST">
<div class="mb-3"> <div class="mb-3">
<label for="new_date" class="form-label">Neuer Termin:</label> <label for="new_date" class="form-label">Neuer Termin:</label>
<input type="datetime-local" class="form-control" id="new_date" name="new_date" value="<?= date('Y-m-d\TH:i', strtotime($row['meeting_date'])) ?>" required> <input type="datetime-local" class="form-control" id="new_date" name="new_date" value="<?= $row ? date('Y-m-d\TH:i', strtotime($row['meeting_date'])) : '' ?>" required>
</div> </div>
<div class="mb-3"> <div class="mb-3">
<label for="reason" class="form-label">Grund/Bemerkung:</label> <label for="reason" class="form-label">Grund/Bemerkung:</label>
<textarea class="form-control" id="reason" name="reason" rows="2" placeholder="Warum soll der Termin verschoben werden?"></textarea> <textarea class="form-control" id="reason" name="reason" rows="2" placeholder="Warum soll der Termin verschoben werden?"></textarea>
</div> </div>
<div class="d-flex gap-2"> <div class="d-flex gap-2">
<button type="submit" name="propose_reschedule" class="btn btn-sm btn-outline-primary"> <button type="submit" name="propose_reschedule" class="btn btn-sm btn-outline-primary">Vorschlag einreichen</button>
Vorschlag einreichen <button type="button" class="btn btn-sm btn-outline-secondary" data-bs-toggle="collapse" data-bs-target="#rescheduleForm">Abbrechen</button>
</button>
<button type="button" class="btn btn-sm btn-outline-secondary" data-bs-toggle="collapse" data-bs-target="#rescheduleForm">
Abbrechen
</button>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
<script> <script>
// Dies ist ein einfaches JavaScript, um alle drei Listen gleichzeitig ein- und auszuklappen.
document.addEventListener('DOMContentLoaded', function() { document.addEventListener('DOMContentLoaded', function() {
// Wählt nur die Links mit der spezifischen Klasse aus
const links = document.querySelectorAll('.participant-toggle-collapse'); const links = document.querySelectorAll('.participant-toggle-collapse');
// Wählt nur die Collapse-Elemente innerhalb des .card-footer aus
const collapseElements = document.querySelectorAll('.card-footer .collapse'); const collapseElements = document.querySelectorAll('.card-footer .collapse');
links.forEach(link => { links.forEach(link => {
link.addEventListener('click', function(e) { link.addEventListener('click', function(e) {
// Verhindert das Standardverhalten des Links (Springen zur ID)
e.preventDefault(); e.preventDefault();
// Überprüft, ob das erste Element sichtbar ist
const isExpanded = collapseElements[0].classList.contains('show'); const isExpanded = collapseElements[0].classList.contains('show');
// Fügt die "show"-Klasse zu allen Elementen hinzu oder entfernt sie collapseElements.forEach(el => isExpanded ? el.classList.remove('show') : el.classList.add('show'));
collapseElements.forEach(el => { links.forEach(l => l.setAttribute('aria-expanded', !isExpanded));
if (isExpanded) {
el.classList.remove('show');
} else {
el.classList.add('show');
}
});
// Aktualisiert den aria-expanded-Status für Barrierefreiheit
links.forEach(l => {
l.setAttribute('aria-expanded', !isExpanded);
});
}); });
}); });
}); });
if ('serviceWorker' in navigator) { if ('serviceWorker' in navigator) {
window.addEventListener('load', function() { window.addEventListener('load', () => {
navigator.serviceWorker.register('/sw.js') navigator.serviceWorker.register('/sw.js').catch(console.error);
.then(function(registration) {
console.log('DoMiLi Service Worker registriert');
})
.catch(function(err) {
console.log('Service Worker Registrierung fehlgeschlagen:', err);
});
}); });
} }
</script> </script>

151
teilnahme.php Executable file
View File

@@ -0,0 +1,151 @@
<?php
// Prüft, ob ein Benutzer im Abwesenheitsmodus ist
function is_user_on_vacation($conn, $user_id, $meeting_date)
{
$stmt = mysqli_prepare($conn, "
SELECT 1 FROM vacations
WHERE user_id = ?
AND ? BETWEEN start_date AND end_date
LIMIT 1
");
if (!$stmt) return false;
mysqli_stmt_bind_param($stmt, "is", $user_id, $meeting_date);
mysqli_stmt_execute($stmt);
$result = mysqli_stmt_get_result($stmt);
$found = mysqli_fetch_assoc($result);
mysqli_stmt_close($stmt);
return $found !== null;
}
// Automatisch ablehnen, wenn Benutzer im Urlaub ist und nicht zugesagt hat
function auto_decline_if_on_vacation($conn, $meeting_id, $user_id, $meeting_date)
{
if (!is_user_on_vacation($conn, $user_id, $meeting_date)) {
return null; // Nicht im Urlaub → nichts tun
}
// Prüfen, ob bereits ein Eintrag existiert
$check_sql = "SELECT rsvp_status FROM meeting_teilnehmer WHERE meeting_id = ? AND user_id = ?";
$check_stmt = mysqli_prepare($conn, $check_sql);
mysqli_stmt_bind_param($check_stmt, "ii", $meeting_id, $user_id);
mysqli_stmt_execute($check_stmt);
$existing = mysqli_fetch_assoc(mysqli_stmt_get_result($check_stmt));
mysqli_stmt_close($check_stmt);
// Wenn bereits "accepted", respektieren wir das
if ($existing && $existing['rsvp_status'] === 'accepted') {
return 'accepted';
}
// Sonst: automatisch ablehnen
if ($existing) {
// Update
$upd = mysqli_prepare($conn, "UPDATE meeting_teilnehmer SET rsvp_status = 'declined', attended = 0 WHERE meeting_id = ? AND user_id = ?");
mysqli_stmt_bind_param($upd, "ii", $meeting_id, $user_id);
mysqli_stmt_execute($upd);
mysqli_stmt_close($upd);
} else {
// Insert
$ins = mysqli_prepare($conn, "INSERT INTO meeting_teilnehmer (meeting_id, user_id, rsvp_status, attended) VALUES (?, ?, 'declined', 0)");
mysqli_stmt_bind_param($ins, "ii", $meeting_id, $user_id);
mysqli_stmt_execute($ins);
mysqli_stmt_close($ins);
}
return 'declined';
}
// Ursprüngliche RSVP-Handler-Funktion
function handle_rsvp_action($conn, $meeting_id, $user_id, $action)
{
$rsvp_status_value = null;
$attended_value = 0;
if ($action === 'accept') {
$rsvp_status_value = 'accepted';
$attended_value = 1;
} elseif ($action === 'decline') {
$rsvp_status_value = 'declined';
$attended_value = 0;
} elseif ($action === 'maybe') {
$rsvp_status_value = 'maybe';
$attended_value = 0;
}
if ($rsvp_status_value === null) return;
$check_sql = "SELECT rsvp_status FROM meeting_teilnehmer WHERE meeting_id = ? AND user_id = ?";
$check_stmt = mysqli_prepare($conn, $check_sql);
$existing = null;
if ($check_stmt) {
mysqli_stmt_bind_param($check_stmt, "ii", $meeting_id, $user_id);
mysqli_stmt_execute($check_stmt);
$existing = mysqli_fetch_assoc(mysqli_stmt_get_result($check_stmt));
mysqli_stmt_close($check_stmt);
}
if ($existing) {
$update_sql = "UPDATE meeting_teilnehmer SET rsvp_status = ?, attended = ? WHERE meeting_id = ? AND user_id = ?";
$update_stmt = mysqli_prepare($conn, $update_sql);
if ($update_stmt) {
mysqli_stmt_bind_param($update_stmt, "siii", $rsvp_status_value, $attended_value, $meeting_id, $user_id);
mysqli_stmt_execute($update_stmt);
mysqli_stmt_close($update_stmt);
}
} else {
$insert_sql = "INSERT INTO meeting_teilnehmer (meeting_id, user_id, attended, rsvp_status) VALUES (?, ?, ?, ?)";
$insert_stmt = mysqli_prepare($conn, $insert_sql);
if ($insert_stmt) {
mysqli_stmt_bind_param($insert_stmt, "iiis", $meeting_id, $user_id, $attended_value, $rsvp_status_value);
mysqli_stmt_execute($insert_stmt);
mysqli_stmt_close($insert_stmt);
}
}
}
function get_user_rsvp_status($conn, $meeting_id, $user_id)
{
$stmt = mysqli_prepare($conn, "SELECT rsvp_status FROM meeting_teilnehmer WHERE meeting_id = ? AND user_id = ?");
if (!$stmt) return null;
mysqli_stmt_bind_param($stmt, "ii", $meeting_id, $user_id);
mysqli_stmt_execute($stmt);
$row = mysqli_fetch_assoc(mysqli_stmt_get_result($stmt));
mysqli_stmt_close($stmt);
return $row ? $row['rsvp_status'] : null;
}
function get_attendee_lists($conn, $meeting_id)
{
$stmt = mysqli_prepare($conn, "SELECT t.rsvp_status, u.username FROM meeting_teilnehmer t LEFT JOIN users u ON t.user_id = u.id WHERE t.meeting_id = ?");
if (!$stmt) return ['accepted_users' => [], 'declined_users' => [], 'maybe_users' => [], 'total_accepted' => 0, 'total_declined' => 0, 'total_maybe' => 0];
mysqli_stmt_bind_param($stmt, "i", $meeting_id);
mysqli_stmt_execute($stmt);
$result = mysqli_stmt_get_result($stmt);
$accepted = $declined = $maybe = [];
while ($row = mysqli_fetch_assoc($result)) {
$username = htmlspecialchars($row['username']);
switch ($row['rsvp_status']) {
case 'accepted':
$accepted[] = $username;
break;
case 'declined':
$declined[] = $username;
break;
case 'maybe':
$maybe[] = $username;
break;
}
}
mysqli_stmt_close($stmt);
return [
'accepted_users' => $accepted,
'declined_users' => $declined,
'maybe_users' => $maybe,
'total_accepted' => count($accepted),
'total_declined' => count($declined),
'total_maybe' => count($maybe)
];
}

369
verschiebung.php Executable file
View File

@@ -0,0 +1,369 @@
<?php
define('APP_URL', 'https://domili.borgal.de');
function load_reschedule_data($conn, $meeting_id, $user_id)
{
$stmt = mysqli_prepare($conn, "
SELECT p.id, p.meeting_id, p.proposed_by_user_id, p.proposed_date, p.reason, p.created_at,
u.username as proposer_name
FROM meeting_reschedule_proposals p
LEFT JOIN users u ON p.proposed_by_user_id = u.id
WHERE p.meeting_id = ? AND p.status = 'pending'
ORDER BY p.created_at DESC
");
mysqli_stmt_bind_param($stmt, "i", $meeting_id);
mysqli_stmt_execute($stmt);
$active_proposals = mysqli_fetch_all(mysqli_stmt_get_result($stmt), MYSQLI_ASSOC);
mysqli_stmt_close($stmt);
if (empty($active_proposals)) {
return ['active_proposals' => [], 'user_votes' => [], 'yes_voters' => [], 'no_voters' => []];
}
$proposal_ids = array_column($active_proposals, 'id');
$ids_list = implode(',', array_map('intval', $proposal_ids));
$vote_stmt = mysqli_prepare($conn, "SELECT proposal_id, user_id, vote FROM meeting_reschedule_votes WHERE proposal_id IN ($ids_list)");
mysqli_stmt_execute($vote_stmt);
$votes = mysqli_fetch_all(mysqli_stmt_get_result($vote_stmt), MYSQLI_ASSOC);
mysqli_stmt_close($vote_stmt);
$user_ids = array_unique(array_column($votes, 'user_id'));
$user_names = [];
if (!empty($user_ids)) {
$user_ids_list = implode(',', array_map('intval', $user_ids));
$user_stmt = mysqli_prepare($conn, "SELECT id, username FROM users WHERE id IN ($user_ids_list)");
mysqli_stmt_execute($user_stmt);
$users = mysqli_fetch_all(mysqli_stmt_get_result($user_stmt), MYSQLI_ASSOC);
mysqli_stmt_close($user_stmt);
foreach ($users as $u) {
$user_names[$u['id']] = htmlspecialchars($u['username']);
}
}
$user_votes = [];
$yes_voters = array_fill_keys($proposal_ids, []);
$no_voters = array_fill_keys($proposal_ids, []);
foreach ($votes as $v) {
if ($v['user_id'] == $user_id) {
$user_votes[$v['proposal_id']] = $v['vote'];
}
$username = $user_names[$v['user_id']] ?? 'Unbekannt';
if ($v['vote'] === 'yes') {
$yes_voters[$v['proposal_id']][] = $username;
} elseif ($v['vote'] === 'no') {
$no_voters[$v['proposal_id']][] = $username;
}
}
foreach ($active_proposals as &$p) {
$p['yes_votes'] = count($yes_voters[$p['id']] ?? []);
$p['no_votes'] = count($no_voters[$p['id']] ?? []);
}
return compact('active_proposals', 'user_votes', 'yes_voters', 'no_voters');
}
function handle_reschedule_actions($conn, $meeting_id, $user_id)
{
// Vorschlag einreichen
if (isset($_POST['propose_reschedule']) && isset($_POST['new_date']) && isset($_POST['reason'])) {
$new_date = $_POST['new_date'];
$reason = $_POST['reason'];
$check = mysqli_prepare($conn, "SELECT id FROM meeting_reschedule_proposals WHERE meeting_id = ? AND proposed_by_user_id = ? AND status = 'pending'");
mysqli_stmt_bind_param($check, "ii", $meeting_id, $user_id);
mysqli_stmt_execute($check);
$exists = mysqli_fetch_assoc(mysqli_stmt_get_result($check));
mysqli_stmt_close($check);
if ($exists) {
$_SESSION['error_message'] = "Du hast bereits einen Verschiebungsvorschlag eingereicht.";
return;
}
$ins = mysqli_prepare($conn, "INSERT INTO meeting_reschedule_proposals (meeting_id, proposed_by_user_id, proposed_date, reason) VALUES (?, ?, ?, ?)");
mysqli_stmt_bind_param($ins, "iiss", $meeting_id, $user_id, $new_date, $reason);
mysqli_stmt_execute($ins);
$proposal_id = mysqli_insert_id($conn);
mysqli_stmt_close($ins);
// 🔥 Automatisch "Ja"-Stimme für den Ersteller
$auto_vote = mysqli_prepare($conn, "INSERT INTO meeting_reschedule_votes (proposal_id, user_id, vote) VALUES (?, ?, 'yes')");
mysqli_stmt_bind_param($auto_vote, "ii", $proposal_id, $user_id);
mysqli_stmt_execute($auto_vote);
mysqli_stmt_close($auto_vote);
// ✉️ E-Mail bei Vorschlag
if (file_exists(__DIR__ . '/vendor/autoload.php')) {
require_once __DIR__ . '/vendor/autoload.php';
$mail = new \PHPMailer\PHPMailer\PHPMailer(true);
$mail->CharSet = 'UTF-8';
$mail->isHTML(false);
$orig_date = null;
$orig_stmt = mysqli_prepare($conn, "SELECT meeting_date FROM meetings WHERE id = ?");
mysqli_stmt_bind_param($orig_stmt, "i", $meeting_id);
mysqli_stmt_execute($orig_stmt);
$orig_row = mysqli_fetch_assoc(mysqli_stmt_get_result($orig_stmt));
mysqli_stmt_close($orig_stmt);
$orig_str = $orig_row ? date('d.m.Y', strtotime($orig_row['meeting_date'])) : 'einem Termin';
try {
$mail->isSMTP();
$mail->Host = SMTP_HOST;
$mail->SMTPAuth = true;
$mail->Username = SMTP_USERNAME;
$mail->Password = SMTP_PASSWORD;
$mail->SMTPSecure = SMTP_ENCRYPTION;
$mail->Port = SMTP_PORT;
$mail->setFrom(MAIL_FROM_ADDRESS, MAIL_FROM_NAME);
$proposer = $_SESSION['username'] ?? 'Ein Benutzer';
$new_fmt = date('d.m.Y H:i', strtotime($new_date));
$subject = "DoMiLi: Neuer Terminvorschlag für den ursprünglichen Termin vom $orig_str";
$body = "Hallo %s,\n\n%s hat einen neuen Vorschlag zur Verschiebung des Termins eingereicht.\nNeuer vorgeschlagener Termin: %s\nGrund: %s\n\nBitte stimme erneut ab, ob du teilnehmen möchtest.\n\nZur Abstimmung: DoMiLi-APP\n%s\n\nDein DoMiLi-Team";
$users_stmt = mysqli_query($conn, "SELECT username, email FROM users WHERE email IS NOT NULL AND email != ''");
while ($u = mysqli_fetch_assoc($users_stmt)) {
if (isset($_SESSION['email']) && $u['email'] === $_SESSION['email']) continue;
$mail->addAddress($u['email']);
$mail->Subject = $subject;
$mail->Body = sprintf($body, $u['username'], $proposer, $new_fmt, $reason, APP_URL . '/index.php');
$mail->send();
$mail->clearAddresses();
}
$_SESSION['success_message'] = "Vorschlag eingereicht! Alle Benutzer wurden benachrichtigt.";
} catch (Exception $e) {
$_SESSION['error_message'] = "Fehler beim Senden der E-Mails.";
error_log("PHPMailer Error: " . $mail->ErrorInfo);
}
} else {
$_SESSION['success_message'] = "Vorschlag eingereicht! (E-Mail nicht verfügbar)";
}
return;
}
// Abstimmen
if (isset($_POST['vote_proposal']) && isset($_POST['proposal_id'])) {
$pid = intval($_POST['proposal_id']);
$vote = $_POST['vote_proposal'];
if (!in_array($vote, ['yes', 'no', 'maybe'])) return;
$check = mysqli_prepare($conn, "SELECT id FROM meeting_reschedule_votes WHERE proposal_id = ? AND user_id = ?");
mysqli_stmt_bind_param($check, "ii", $pid, $user_id);
mysqli_stmt_execute($check);
$existing = mysqli_fetch_assoc(mysqli_stmt_get_result($check));
mysqli_stmt_close($check);
if ($existing) {
$upd = mysqli_prepare($conn, "UPDATE meeting_reschedule_votes SET vote = ? WHERE id = ?");
mysqli_stmt_bind_param($upd, "si", $vote, $existing['id']);
mysqli_stmt_execute($upd);
mysqli_stmt_close($upd);
} else {
$ins = mysqli_prepare($conn, "INSERT INTO meeting_reschedule_votes (proposal_id, user_id, vote) VALUES (?, ?, ?)");
mysqli_stmt_bind_param($ins, "iis", $pid, $user_id, $vote);
mysqli_stmt_execute($ins);
mysqli_stmt_close($ins);
}
return;
}
// Löschen (nur Ersteller)
if (isset($_POST['delete_proposal']) && isset($_POST['proposal_id'])) {
$pid = intval($_POST['proposal_id']);
$check = mysqli_prepare($conn, "SELECT proposed_by_user_id FROM meeting_reschedule_proposals WHERE id = ? AND meeting_id = ?");
mysqli_stmt_bind_param($check, "ii", $pid, $meeting_id);
mysqli_stmt_execute($check);
$owner = mysqli_fetch_assoc(mysqli_stmt_get_result($check));
mysqli_stmt_close($check);
if ($owner && $owner['proposed_by_user_id'] == $user_id) {
mysqli_query($conn, "DELETE FROM meeting_reschedule_votes WHERE proposal_id = $pid");
mysqli_query($conn, "DELETE FROM meeting_reschedule_proposals WHERE id = $pid");
}
return;
}
// Bearbeiten (nur Ersteller)
if (isset($_POST['edit_proposal']) && isset($_POST['proposal_id']) && isset($_POST['new_date']) && isset($_POST['reason'])) {
$pid = intval($_POST['proposal_id']);
$new_date = $_POST['new_date'];
$reason = $_POST['reason'];
$check = mysqli_prepare($conn, "SELECT proposed_by_user_id FROM meeting_reschedule_proposals WHERE id = ? AND meeting_id = ?");
mysqli_stmt_bind_param($check, "ii", $pid, $meeting_id);
mysqli_stmt_execute($check);
$owner = mysqli_fetch_assoc(mysqli_stmt_get_result($check));
mysqli_stmt_close($check);
if ($owner && $owner['proposed_by_user_id'] == $user_id) {
mysqli_query($conn, "DELETE FROM meeting_reschedule_votes WHERE proposal_id = $pid");
$upd = mysqli_prepare($conn, "UPDATE meeting_reschedule_proposals SET proposed_date = ?, reason = ? WHERE id = ?");
mysqli_stmt_bind_param($upd, "ssi", $new_date, $reason, $pid);
mysqli_stmt_execute($upd);
mysqli_stmt_close($upd);
}
return;
}
// Admin: Vorschlag annehmen → MEETING AKTUALISIEREN + E-MAIL
if (isset($_SESSION['role']) && $_SESSION['role'] === 'admin') {
if (isset($_POST['accept_proposal']) && isset($_POST['proposal_id'])) {
$proposal_id = intval($_POST['proposal_id']);
$proposal_stmt = mysqli_prepare($conn, "
SELECT p.proposed_date, p.reason, p.meeting_id,
m.meeting_date AS original_date
FROM meeting_reschedule_proposals p
JOIN meetings m ON p.meeting_id = m.id
WHERE p.id = ?
");
mysqli_stmt_bind_param($proposal_stmt, "i", $proposal_id);
mysqli_stmt_execute($proposal_stmt);
$proposal = mysqli_fetch_assoc(mysqli_stmt_get_result($proposal_stmt));
mysqli_stmt_close($proposal_stmt);
if ($proposal) {
$new_date = $proposal['proposed_date'];
$new_reason = $proposal['reason'];
$meeting_id = $proposal['meeting_id'];
$original_date = $proposal['original_date'];
// Meeting aktualisieren
$update_meeting = mysqli_prepare($conn, "
UPDATE meetings
SET meeting_date = ?, reason = ?
WHERE id = ?
");
mysqli_stmt_bind_param($update_meeting, "ssi", $new_date, $new_reason, $meeting_id);
mysqli_stmt_execute($update_meeting);
mysqli_stmt_close($update_meeting);
// Vorschlag akzeptieren
$accept_stmt = mysqli_prepare($conn, "
UPDATE meeting_reschedule_proposals
SET status = 'accepted'
WHERE id = ?
");
mysqli_stmt_bind_param($accept_stmt, "i", $proposal_id);
mysqli_stmt_execute($accept_stmt);
mysqli_stmt_close($accept_stmt);
// Andere ablehnen
$reject_others = mysqli_prepare($conn, "
UPDATE meeting_reschedule_proposals
SET status = 'rejected'
WHERE meeting_id = ? AND id != ?
");
mysqli_stmt_bind_param($reject_others, "ii", $meeting_id, $proposal_id);
mysqli_stmt_execute($reject_others);
mysqli_stmt_close($reject_others);
// ✉️ E-Mail nach Akzeptanz
if (file_exists(__DIR__ . '/vendor/autoload.php')) {
require_once __DIR__ . '/vendor/autoload.php';
$mail = new \PHPMailer\PHPMailer\PHPMailer(true);
$mail->CharSet = 'UTF-8';
$mail->isHTML(false);
try {
$mail->isSMTP();
$mail->Host = SMTP_HOST;
$mail->SMTPAuth = true;
$mail->Username = SMTP_USERNAME;
$mail->Password = SMTP_PASSWORD;
$mail->SMTPSecure = SMTP_ENCRYPTION;
$mail->Port = SMTP_PORT;
$mail->setFrom(MAIL_FROM_ADDRESS, MAIL_FROM_NAME);
$orig_fmt = date('d.m.Y H:i', strtotime($original_date));
$new_fmt = date('d.m.Y H:i', strtotime($new_date));
$subject = "DoMiLi: Termin wurde verschoben!";
$body = "Hallo %s,\n\nDer Termin wurde vom Admin verschoben.\n\nUrsprünglicher Termin: %s\nNeuer Termin: %s\nGrund: %s\n\nBitte stimme erneut ab, ob du teilnehmen möchtest.\n\nZur Abstimmung: DoMiLi-APP\n%s\n\nDein DoMiLi-Team";
$users_stmt = mysqli_query($conn, "SELECT username, email FROM users WHERE email IS NOT NULL AND email != ''");
while ($u = mysqli_fetch_assoc($users_stmt)) {
$mail->addAddress($u['email']);
$mail->Subject = $subject;
$mail->Body = sprintf($body, $u['username'], $orig_fmt, $new_fmt, $new_reason, APP_URL . '/index.php');
$mail->send();
$mail->clearAddresses();
}
} catch (Exception $e) {
error_log("Fehler bei Akzeptanz-E-Mail: " . $mail->ErrorInfo);
}
}
}
header("Location: index.php");
exit;
}
// Admin: Vorschlag ablehnen → MIT KURZER E-MAIL
if (isset($_POST['reject_proposal']) && isset($_POST['proposal_id'])) {
$proposal_id = intval($_POST['proposal_id']);
// Vorschlagdaten laden
$proposal_stmt = mysqli_prepare($conn, "
SELECT p.proposed_by_user_id, u.username AS proposer_name,
m.meeting_date AS original_date
FROM meeting_reschedule_proposals p
JOIN users u ON p.proposed_by_user_id = u.id
JOIN meetings m ON p.meeting_id = m.id
WHERE p.id = ?
");
mysqli_stmt_bind_param($proposal_stmt, "i", $proposal_id);
mysqli_stmt_execute($proposal_stmt);
$proposal = mysqli_fetch_assoc(mysqli_stmt_get_result($proposal_stmt));
mysqli_stmt_close($proposal_stmt);
// Vorschlag ablehnen
$reject_stmt = mysqli_prepare($conn, "
UPDATE meeting_reschedule_proposals
SET status = 'rejected'
WHERE id = ?
");
mysqli_stmt_bind_param($reject_stmt, "i", $proposal_id);
mysqli_stmt_execute($reject_stmt);
mysqli_stmt_close($reject_stmt);
// ✉️ Kurze E-Mail nach Ablehnung
if ($proposal && file_exists(__DIR__ . '/vendor/autoload.php')) {
require_once __DIR__ . '/vendor/autoload.php';
$mail = new \PHPMailer\PHPMailer\PHPMailer(true);
$mail->CharSet = 'UTF-8';
$mail->isHTML(false);
try {
$mail->isSMTP();
$mail->Host = SMTP_HOST;
$mail->SMTPAuth = true;
$mail->Username = SMTP_USERNAME;
$mail->Password = SMTP_PASSWORD;
$mail->SMTPSecure = SMTP_ENCRYPTION;
$mail->Port = SMTP_PORT;
$mail->setFrom(MAIL_FROM_ADDRESS, MAIL_FROM_NAME);
$proposer = $proposal['proposer_name'];
$original_fmt = date('d.m.Y H:i', strtotime($proposal['original_date']));
$subject = "DoMiLi: Verschiebungsvorschlag abgelehnt";
$body = "Hallo %s,\n\nDer Verschiebungsvorschlag von {$proposer} wurde vom Admin abgelehnt.\nDer Termin bleibt daher unverändert beim ursprünglichen Termin am {$original_fmt}.\n\nDein DoMiLi-Team";
$users_stmt = mysqli_query($conn, "SELECT username, email FROM users WHERE email IS NOT NULL AND email != ''");
while ($u = mysqli_fetch_assoc($users_stmt)) {
$mail->addAddress($u['email']);
$mail->Subject = $subject;
$mail->Body = sprintf($body, $u['username']);
$mail->send();
$mail->clearAddresses();
}
} catch (Exception $e) {
error_log("Fehler bei Ablehnungs-E-Mail: " . $mail->ErrorInfo);
}
}
header("Location: index.php");
exit;
}
}
}

35
zahler.php Executable file
View File

@@ -0,0 +1,35 @@
<?php
function get_next_payer_username($conn, $meeting_id)
{
$sql = "
SELECT
u.username,
(SELECT COUNT(*) FROM meeting_teilnehmer WHERE user_id = u.id AND paid = 1) AS paid_count
FROM meeting_teilnehmer mt
JOIN users u ON mt.user_id = u.id
WHERE mt.meeting_id = ? AND mt.rsvp_status = 'accepted'
ORDER BY paid_count ASC
";
$stmt = mysqli_prepare($conn, $sql);
if (!$stmt) return null;
mysqli_stmt_bind_param($stmt, "i", $meeting_id);
mysqli_stmt_execute($stmt);
$result = mysqli_stmt_get_result($stmt);
$candidates = [];
$min_count = -1;
while ($row = mysqli_fetch_assoc($result)) {
if ($min_count == -1 || $row['paid_count'] < $min_count) {
$min_count = $row['paid_count'];
$candidates = [$row['username']];
} elseif ($row['paid_count'] == $min_count) {
$candidates[] = $row['username'];
}
}
mysqli_stmt_close($stmt);
if (empty($candidates)) return null;
sort($candidates);
return $candidates[0];
}