v1.3.1 Geburtstaglogik komplett überarbeitet

backup.php

@@ -0,0 +1,102 @@
+<?php
+include('inc/check_login.php');
+include('inc/db.php');
+
+// 🔒 Nur Admins dürfen diese Seite sehen
+if ($_SESSION['role'] !== 'admin') {
+    $_SESSION['error_message'] = "Zugriff verweigert.";
+    header("Location: index.php");
+    exit;
+}
+
+// 🔹 Pfad zum Backup-Ordner (relativ zum Projekt)
+$backup_dir = __DIR__ . '/backups/';
+$backup_url = 'backups/'; // öffentliche URL
+
+// Prüfen, ob Ordner existiert
+if (!is_dir($backup_dir)) {
+    mkdir($backup_dir, 0755, true);
+}
+
+// PDF-Dateien holen
+$files = [];
+if ($handle = opendir($backup_dir)) {
+    while (false !== ($entry = readdir($handle))) {
+        if ($entry !== '.' && $entry !== '..' && pathinfo($entry, PATHINFO_EXTENSION) === 'pdf') {
+            $full_path = $backup_dir . $entry;
+            $files[] = [
+                'name' => $entry,
+                'size' => filesize($full_path),
+                'mtime' => filemtime($full_path)
+            ];
+        }
+    }
+    closedir($handle);
+    // Sortieren: neueste zuerst
+    usort($files, fn($a, $b) => $b['mtime'] <=> $a['mtime']);
+}
+
+require_once 'inc/header.php';
+?>
+
+<div class="container mt-5">
+    <div class="d-flex justify-content-between align-items-center mb-4">
+        <h2 class="mb-0">PDF-Backups</h2>
+        <a href="index.php" class="btn btn-sm btn-outline-secondary">Zurück</a>
+    </div>
+
+    <?php if (empty($files)): ?>
+        <div class="alert alert-info">
+            <span class="material-symbols-outlined align-text-bottom me-2">info</span>
+            Keine PDF-Backups gefunden.
+        </div>
+    <?php else: ?>
+        <div class="card shadow">
+            <div class="card-body p-0">
+                <div class="table-responsive">
+                    <table class="table table-hover mb-0">
+                        <thead class="table-light">
+                            <tr>
+                                <th>Datei</th>
+                                <th>Datum</th>
+                                <th class="d-none d-md-table-cell">Größe</th>
+                                <th class="text-end">Aktion</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <?php foreach ($files as $file): ?>
+                                <tr>
+                                    <td style="white-space: nowrap;">
+                                        <div class="d-flex align-items-center" style="min-height: 1.4rem;">
+                                            <span class="material-symbols-outlined text-info me-2" style="font-size: 1.1em; line-height: 1; flex-shrink: 0;">picture_as_pdf</span>
+                                            <span class="fw-medium text-break" style="font-size: 0.92rem; line-height: 1.3; min-width: 0; white-space: normal;">
+                                                <?= htmlspecialchars(pathinfo($file['name'], PATHINFO_FILENAME)) ?>
+                                            </span>
+                                        </div>
+                                    </td>
+                                    <td><?= date('d.m.y', $file['mtime']) ?></td>
+                                    <td class="d-none d-md-table-cell"><?= number_format($file['size'] / 1024, 1, ',', '.') ?> KB</td>
+                                    <td class="text-end pe-4">
+                                        <a href="<?= htmlspecialchars($backup_url . $file['name']) ?>" target="_blank" class="text-secondary" title="PDF öffnen oder herunterladen">
+                                            <span class="material-icons">download</span>
+                                        </a>
+                                    </td>
+                                </tr>
+                            <?php endforeach; ?>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    <?php endif; ?>
+
+    <div class="mt-4 p-3 bg-light rounded">
+        <h5 class="mb-3">Hinweis</h5>
+        <p class="mb-0">
+            Diese PDFs werden manuell oder automatisch erstellt (z. B. über <code>export.php</code>).
+            Sie dienen als Archiv und können nicht über diese Oberfläche gelöscht werden.
+        </p>
+    </div>
+</div>
+
+<?php include('inc/footer.php'); ?>

inc/menu.php

@@ -48,6 +48,7 @@
                     <ul class="dropdown-menu">
                         <li><a class="dropdown-item d-flex align-items-center" href="colors.php"><span class="material-icons text-secondary me-2">palette</span>Farben</a></li>
                         <li><a class="dropdown-item d-flex align-items-center" href="users.php"><span class="material-icons text-secondary me-2">group</span>Benutzer</a></li>
+                        <li><a class="dropdown-item d-flex align-items-center" href="backup.php"><span class="material-icons text-secondary me-2">archive</span>PDF-Backup</a></li>
                     </ul>
                 </li>
             </ul>

kasse.php

@@ -265,7 +265,7 @@ $sql_paid = "
     JOIN users u ON mt.user_id = u.id
     WHERE mt.paid = 1 AND m.is_completed = 1
     GROUP BY u.username
-    ORDER BY paid_count DESC
+    ORDER BY paid_count DESC, u.username ASC
 ";
 $result_paid = mysqli_query($conn, $sql_paid);
 while ($row = mysqli_fetch_assoc($result_paid)) {

participant.php

@@ -85,41 +85,49 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") {
         }
         mysqli_stmt_close($stmt_insert);
 
-        // 🔹 GEBURTSTAGS-ZAHLUNG BEHANDELN
+        // 🔹 GEBURTSTAGS-ZAHLUNG BEHANDELN – MIT last_birthday_year
+        $meeting_year = (int)date('Y', strtotime($meeting['meeting_date']));
+        $meeting_month = (int)date('n', strtotime($meeting['meeting_date']));
+        $meeting_day = (int)date('j', strtotime($meeting['meeting_date']));
+
         foreach ($_POST['user_id'] as $user_id) {
             $user_id = (int)$user_id;
             $paid = isset($_POST['paid'][$user_id]) && $_POST['paid'][$user_id] == 1;
 
             if (!$paid) continue;
 
-            // Hole aktuellen Status
+            $user_stmt = mysqli_prepare($conn, "SELECT birthday, last_birthday_year FROM users WHERE id = ?");
-            $user_stmt = mysqli_prepare($conn, "SELECT birthday_payer_pending FROM users WHERE id = ?");
             mysqli_stmt_bind_param($user_stmt, "i", $user_id);
             mysqli_stmt_execute($user_stmt);
             $user_row = mysqli_fetch_assoc(mysqli_stmt_get_result($user_stmt));
             mysqli_stmt_close($user_stmt);
 
-            if (!$user_row) continue;
+            if (!$user_row || !$user_row['birthday'] || $user_row['birthday'] === '0000-00-00') {
-
+                // Kein Geburtstag → normale Zahlung
-            $was_birthday_payer = (bool)$user_row['birthday_payer_pending'];
+                $update = mysqli_prepare($conn, "UPDATE users SET regular_paid_count = regular_paid_count + 1 WHERE id = ?");
-
-            if ($was_birthday_payer) {
-                // 🎂 Geburtstags-Zahlung: NICHT zählen, aber Flag zurücksetzen
-                $update = mysqli_prepare($conn, "
-                    UPDATE users 
-                    SET birthday_payer_pending = 0 
-                    WHERE id = ?
-                ");
                 mysqli_stmt_bind_param($update, "i", $user_id);
                 mysqli_stmt_execute($update);
                 mysqli_stmt_close($update);
+                continue;
+            }
+
+            $last_bday_year = (int)($user_row['last_birthday_year'] ?? 0);
+            $bday_month = (int)date('n', strtotime($user_row['birthday']));
+            $bday_day   = (int)date('j', strtotime($user_row['birthday']));
+
+            $birthday_passed = ($bday_month < $meeting_month ||
+                ($bday_month == $meeting_month && $bday_day <= $meeting_day));
+            $birthday_not_paid_yet = ($last_bday_year < $meeting_year);
+
+            if ($birthday_passed && $birthday_not_paid_yet) {
+                // 🎂 Geburtstags-Zahlung
+                $update = mysqli_prepare($conn, "UPDATE users SET last_birthday_year = ? WHERE id = ?");
+                mysqli_stmt_bind_param($update, "ii", $meeting_year, $user_id);
+                mysqli_stmt_execute($update);
+                mysqli_stmt_close($update);
             } else {
-                // 🔢 Normale Zahlung: reguläre Anzahl erhöhen
+                // 🔢 Normale Zahlung
-                $update = mysqli_prepare($conn, "
+                $update = mysqli_prepare($conn, "UPDATE users SET regular_paid_count = regular_paid_count + 1 WHERE id = ?");
-                    UPDATE users 
-                    SET regular_paid_count = regular_paid_count + 1 
-                    WHERE id = ?
-                ");
                 mysqli_stmt_bind_param($update, "i", $user_id);
                 mysqli_stmt_execute($update);
                 mysqli_stmt_close($update);

stats.php

@@ -2,13 +2,17 @@
 include('inc/check_login.php');
 require_once('inc/db.php');
 
-// Statistik 1: Häufigkeit der gewählten Farben
+// Gesamtanzahl abgeschlossener Treffen (nur zur Info)
+$total_meetings = 0;
+$result_total_meetings = mysqli_query($conn, "SELECT COUNT(*) AS total FROM meetings WHERE is_completed = 1");
+if ($row = mysqli_fetch_assoc($result_total_meetings)) {
+    $total_meetings = (int)$row['total'];
+}
+
+// Statistik: Farbhäufigkeit
 $color_stats = [];
 $sql_colors = "
-    SELECT
+    SELECT c.name, c.hex_code, COUNT(m.id) AS meeting_count
-        c.name,
-        c.hex_code,
-        COUNT(m.id) AS meeting_count
     FROM meetings m
     JOIN colors c ON m.color_id = c.id
     WHERE m.is_completed = 1
@@ -20,25 +24,44 @@ while ($row = mysqli_fetch_assoc($result)) {
     $color_stats[] = $row;
 }
 
-// Statistik 2: Teilnahmequote pro Benutzer
+// TEILNAHME: Sortiert nach Prozent, mit Prozentwert
 $participation_stats = [];
+$participation_percentages = [];
+$participation_registered = [];
+$participation_attended = [];
+
 $sql_participation = "
     SELECT
         u.username,
-        COUNT(mt.user_id) AS total_attendance
+        COUNT(*) AS registered_completed,
+        SUM(CASE WHEN mt.attended = 1 THEN 1 ELSE 0 END) AS total_attendance,
+        ROUND(
+            (SUM(CASE WHEN mt.attended = 1 THEN 1 ELSE 0 END) / COUNT(*)) * 100,
+            1
+        ) AS percentage
     FROM meeting_teilnehmer mt
+    JOIN meetings m ON mt.meeting_id = m.id AND m.is_completed = 1
     JOIN users u ON mt.user_id = u.id
-    JOIN meetings m ON mt.meeting_id = m.id
+    GROUP BY u.id, u.username
-    WHERE mt.attended = 1 AND m.is_completed = 1
+    ORDER BY percentage DESC, u.username ASC
-    GROUP BY u.username
-    ORDER BY total_attendance DESC
 ";
 $result = mysqli_query($conn, $sql_participation);
 while ($row = mysqli_fetch_assoc($result)) {
-    $participation_stats[] = $row;
+    $registered = (int)$row['registered_completed'];
+    $attended = (int)$row['total_attendance'];
+    $percentage = (float)$row['percentage'];
+    $participation_stats[] = [
+        'username' => $row['username'],
+        'total_attendance' => $attended,
+        'registered_meetings' => $registered,
+        'percentage' => $percentage
+    ];
+    $participation_percentages[] = $percentage;
+    $participation_registered[] = $registered;
+    $participation_attended[] = $attended;
 }
 
-// Durchschnittliche Anwesenheit pro Meeting
+// Globale Durchschnitte (unverändert)
 $avg_attendance = 0;
 $sql_avg_attendance = "
     SELECT AVG(attended_count) AS avg_attended
@@ -54,7 +77,6 @@ if ($row = mysqli_fetch_assoc($result_avg)) {
     $avg_attendance = round($row['avg_attended'], 2);
 }
 
-// Durchschnittliche korrekte Farbe
 $avg_wore_color = 0;
 $sql_avg_wore_color = "
     SELECT AVG(wore_color_count) AS avg_wore_color
@@ -70,34 +92,56 @@ if ($row = mysqli_fetch_assoc($result_avg_wore)) {
     $avg_wore_color = round($row['avg_wore_color'], 2);
 }
 
-// Ranking: Farbe getragen
+// FARBE GETRAGEN: Sortiert nach Prozent, mit Prozentwert
 $wore_color_stats = [];
+$wore_color_percentages = [];
+$wore_color_attended = [];
+$wore_color_count = [];
+
 $sql_wore_color = "
     SELECT
         u.username,
-        COUNT(mt.user_id) AS wore_color_count
+        SUM(CASE WHEN mt.attended = 1 THEN 1 ELSE 0 END) AS total_attendance,
+        SUM(CASE WHEN mt.wore_color = 1 THEN 1 ELSE 0 END) AS wore_color_count,
+        CASE
+            WHEN SUM(CASE WHEN mt.attended = 1 THEN 1 ELSE 0 END) > 0 THEN
+                ROUND(
+                    (SUM(CASE WHEN mt.wore_color = 1 THEN 1 ELSE 0 END) /
+                     SUM(CASE WHEN mt.attended = 1 THEN 1 ELSE 0 END)) * 100,
+                    1
+                )
+            ELSE 0.0
+        END AS percentage
     FROM meeting_teilnehmer mt
+    JOIN meetings m ON mt.meeting_id = m.id AND m.is_completed = 1
     JOIN users u ON mt.user_id = u.id
-    JOIN meetings m ON mt.meeting_id = m.id
+    GROUP BY u.id, u.username
-    WHERE mt.wore_color = 1 AND m.is_completed = 1
+    ORDER BY percentage DESC, u.username ASC
-    GROUP BY u.username
-    ORDER BY wore_color_count DESC
 ";
 $result_wore = mysqli_query($conn, $sql_wore_color);
 while ($row = mysqli_fetch_assoc($result_wore)) {
-    $wore_color_stats[] = $row;
+    $attended = (int)$row['total_attendance'];
+    $wore = (int)$row['wore_color_count'];
+    $percentage = (float)$row['percentage'];
+    $wore_color_stats[] = [
+        'username' => $row['username'],
+        'wore_color_count' => $wore,
+        'total_attendance' => $attended,
+        'percentage' => $percentage
+    ];
+    $wore_color_percentages[] = $percentage;
+    $wore_color_attended[] = $attended;
+    $wore_color_count[] = $wore;
 }
 
-// 🔹 NEU: Ranking der Verschiebungsvorschläge
+// Verschiebungsvorschläge (unverändert)
 $reschedule_stats = [];
 $sql_reschedule = "
-    SELECT
+    SELECT u.username, COUNT(p.id) AS reschedule_count
-        u.username,
-        COUNT(p.id) AS reschedule_count
     FROM meeting_reschedule_proposals p
     JOIN users u ON p.proposed_by_user_id = u.id
     GROUP BY u.username
-    ORDER BY reschedule_count DESC
+    ORDER BY reschedule_count DESC, u.username ASC
 ";
 $result_reschedule = mysqli_query($conn, $sql_reschedule);
 while ($row = mysqli_fetch_assoc($result_reschedule)) {
@@ -124,6 +168,7 @@ require_once 'inc/header.php';
                 <div class="col-lg-6">
                     <h5 class="card-title text-center">Teilnahme-Ranking</h5>
                     <p class="text-center text-muted mt-2 mb-3">
+                        Insgesamt <?= $total_meetings ?> abgeschlossene Treffen.<br>
                         Durchschnittliche Anwesenheit je Treffen: <strong><?= htmlspecialchars($avg_attendance) ?></strong>
                     </p>
                     <div style="height: 40vh;">
@@ -146,7 +191,6 @@ require_once 'inc/header.php';
                 </div>
             </div>
 
-            <!-- 🔹 NEUER BLOCK: Verschiebungsvorschläge -->
             <hr class="my-4">
 
             <div class="row justify-content-center">
@@ -160,29 +204,26 @@ require_once 'inc/header.php';
                     </div>
                 </div>
             </div>
-
         </div>
     </div>
 </div>
 
 <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-
 <script>
     document.addEventListener('DOMContentLoaded', function() {
-        // Farbhäufigkeit
+        // Farben (unverändert)
-        const colorData = {
-            labels: <?= json_encode(array_column($color_stats, 'name')); ?>,
-            datasets: [{
-                label: 'Anzahl Treffen',
-                data: <?= json_encode(array_column($color_stats, 'meeting_count')); ?>,
-                backgroundColor: <?= json_encode(array_column($color_stats, 'hex_code')); ?>,
-                borderColor: 'rgba(0, 0, 0, 0.1)',
-                borderWidth: 1
-            }]
-        };
         new Chart(document.getElementById('colorChart'), {
             type: 'pie',
-            data: colorData,
+            data: {
+                labels: <?= json_encode(array_column($color_stats, 'name')) ?>,
+                datasets: [{
+                    label: 'Anzahl Treffen',
+                    data: <?= json_encode(array_column($color_stats, 'meeting_count')) ?>,
+                    backgroundColor: <?= json_encode(array_column($color_stats, 'hex_code')) ?>,
+                    borderColor: 'rgba(0,0,0,0.1)',
+                    borderWidth: 1
+                }]
+            },
             options: {
                 responsive: true,
                 plugins: {
@@ -191,26 +232,25 @@ require_once 'inc/header.php';
                     },
                     title: {
                         display: true,
-                        text: 'Verteilung der Farbwahl über alle Treffen'
+                        text: 'Verteilung der Farbwahl'
                     }
                 }
             }
         });
 
-        // Teilnahme
+        // Teilnahme: Mit Prozentwerten (0–100%), sortiert nach Prozent
-        const participationData = {
-            labels: <?= json_encode(array_column($participation_stats, 'username')); ?>,
-            datasets: [{
-                label: 'Anzahl Teilnahmen',
-                data: <?= json_encode(array_column($participation_stats, 'total_attendance')); ?>,
-                backgroundColor: 'rgba(54, 162, 235, 0.8)',
-                borderColor: 'rgb(54, 162, 235)',
-                borderWidth: 1
-            }]
-        };
         new Chart(document.getElementById('participationChart'), {
             type: 'bar',
-            data: participationData,
+            data: {
+                labels: <?= json_encode(array_column($participation_stats, 'username')) ?>,
+                datasets: [{
+                    label: 'Teilnahmequote (%)',
+                    data: <?= json_encode($participation_percentages) ?>,
+                    backgroundColor: 'rgba(54,162,235,0.8)',
+                    borderColor: 'rgb(54,162,235)',
+                    borderWidth: 1
+                }]
+            },
             options: {
                 indexAxis: 'y',
                 responsive: true,
@@ -221,21 +261,37 @@ require_once 'inc/header.php';
                     },
                     title: {
                         display: true,
-                        text: 'Anzahl der Teilnahmen pro Benutzer'
+                        text: 'Teilnahmequote (nur abgeschlossene Treffen mit Eintrag)'
+                    },
+                    tooltip: {
+                        callbacks: {
+                            label: function(ctx) {
+                                const pct = ctx.raw;
+                                const attended = <?= json_encode($participation_attended) ?>[ctx.dataIndex] || 0;
+                                const reg = <?= json_encode($participation_registered) ?>[ctx.dataIndex] || 0;
+                                return `${attended} von ${reg} (${pct}%)`;
+                            }
+                        }
                     }
                 },
                 scales: {
                     x: {
-                        beginAtZero: true
+                        beginAtZero: true,
+                        max: 100,
+                        ticks: {
+                            callback: function(value) {
+                                return value + '%';
+                            }
+                        }
                     },
                     y: {
                         ticks: {
                             font: {
                                 size: 10
                             },
-                            callback: function(value) {
+                            callback: function(v) {
-                                const username = this.getLabelForValue(value);
+                                const l = this.getLabelForValue(v);
-                                return username.length > 15 ? username.substring(0, 15) + '...' : username;
+                                return l.length > 15 ? l.substring(0, 15) + '...' : l;
                             }
                         }
                     }
@@ -243,20 +299,19 @@ require_once 'inc/header.php';
             }
         });
 
-        // Farbe getragen
+        // Farbe getragen: Mit Prozentwerten (0–100%)
-        const woreColorData = {
-            labels: <?= json_encode(array_column($wore_color_stats, 'username')); ?>,
-            datasets: [{
-                label: 'Farbe getragen',
-                data: <?= json_encode(array_column($wore_color_stats, 'wore_color_count')); ?>,
-                backgroundColor: 'rgba(75, 192, 192, 0.8)',
-                borderColor: 'rgb(75, 192, 192)',
-                borderWidth: 1
-            }]
-        };
         new Chart(document.getElementById('woreColorChart'), {
             type: 'bar',
-            data: woreColorData,
+            data: {
+                labels: <?= json_encode(array_column($wore_color_stats, 'username')) ?>,
+                datasets: [{
+                    label: 'Farbenquote (%)',
+                    data: <?= json_encode($wore_color_percentages) ?>,
+                    backgroundColor: 'rgba(75,192,192,0.8)',
+                    borderColor: 'rgb(75,192,192)',
+                    borderWidth: 1
+                }]
+            },
             options: {
                 indexAxis: 'y',
                 responsive: true,
@@ -267,14 +322,27 @@ require_once 'inc/header.php';
                     },
                     title: {
                         display: true,
-                        text: 'Anzahl der "Farbe getragen"-Einträge pro Benutzer'
+                        text: 'Farbenquote (nur bei Teilnahme)'
+                    },
+                    tooltip: {
+                        callbacks: {
+                            label: function(ctx) {
+                                const pct = ctx.raw;
+                                const wore = <?= json_encode($wore_color_count) ?>[ctx.dataIndex] || 0;
+                                const att = <?= json_encode($wore_color_attended) ?>[ctx.dataIndex] || 0;
+                                return `${wore} von ${att} Teilnahmen (${pct}%)`;
+                            }
+                        }
                     }
                 },
                 scales: {
                     x: {
                         beginAtZero: true,
+                        max: 100,
                         ticks: {
-                            stepSize: 1
+                            callback: function(value) {
+                                return value + '%';
+                            }
                         }
                     },
                     y: {
@@ -282,9 +350,9 @@ require_once 'inc/header.php';
                             font: {
                                 size: 10
                             },
-                            callback: function(value) {
+                            callback: function(v) {
-                                const username = this.getLabelForValue(value);
+                                const l = this.getLabelForValue(v);
-                                return username.length > 15 ? username.substring(0, 15) + '...' : username;
+                                return l.length > 15 ? l.substring(0, 15) + '...' : l;
                             }
                         }
                     }
@@ -292,20 +360,19 @@ require_once 'inc/header.php';
             }
         });
 
-        // 🔹 NEU: Verschiebungsvorschläge
+        // Verschiebungsvorschläge (unverändert – ABER mit korrekter Syntax!)
-        const rescheduleData = {
-            labels: <?= json_encode(array_column($reschedule_stats, 'username')); ?>,
-            datasets: [{
-                label: 'Verschiebungsvorschläge',
-                data: <?= json_encode(array_column($reschedule_stats, 'reschedule_count')); ?>,
-                backgroundColor: 'rgba(255, 159, 64, 0.8)',
-                borderColor: 'rgb(255, 159, 64)',
-                borderWidth: 1
-            }]
-        };
         new Chart(document.getElementById('rescheduleChart'), {
             type: 'bar',
-            data: rescheduleData,
+            data: {
+                labels: <?= json_encode(array_column($reschedule_stats, 'username')) ?>,
+                datasets: [{
+                    label: 'Vorschläge',
+                    data: <?= json_encode(array_column($reschedule_stats, 'reschedule_count')) ?>,
+                    backgroundColor: 'rgba(255,159,64,0.8)',
+                    borderColor: 'rgb(255,159,64)',
+                    borderWidth: 1
+                }]
+            },
             options: {
                 indexAxis: 'y',
                 responsive: true,
@@ -316,7 +383,7 @@ require_once 'inc/header.php';
                     },
                     title: {
                         display: true,
-                        text: 'Anzahl der Verschiebungsvorschläge pro Benutzer'
+                        text: 'Verschiebungsvorschläge'
                     }
                 },
                 scales: {
@@ -331,9 +398,9 @@ require_once 'inc/header.php';
                             font: {
                                 size: 10
                             },
-                            callback: function(value) {
+                            callback: function(v) {
-                                const username = this.getLabelForValue(value);
+                                const l = this.getLabelForValue(v);
-                                return username.length > 15 ? username.substring(0, 15) + '...' : username;
+                                return l.length > 15 ? l.substring(0, 15) + '...' : l;
                             }
                         }
                     }

zahler.php

@@ -18,15 +18,18 @@ function get_next_payer_info($conn, $meeting_id)
     }
 
     $meeting_date = $meeting['meeting_date'];
-    $current_year = (int)date('Y', strtotime($meeting_date));
+    $meeting_ts = strtotime($meeting_date);
+    $meeting_year = (int)date('Y', $meeting_ts);
+    $meeting_month = (int)date('n', $meeting_ts);
+    $meeting_day = (int)date('j', $meeting_ts);
 
-    // Alle ZUSAGENDEN Teilnehmer dieses Meetings
+    // Alle ZUSAGENDEN Teilnehmer – mit last_birthday_year
     $sql = "
         SELECT 
             u.id,
             u.username,
             u.birthday,
-            u.birthday_payer_pending,
+            u.last_birthday_year,
             u.regular_paid_count
         FROM meeting_teilnehmer mt
         JOIN users u ON mt.user_id = u.id
@@ -44,8 +47,25 @@ function get_next_payer_info($conn, $meeting_id)
         return null;
     }
 
-    // 🔹 PRIORITÄT 1: Geburtstags-Zahler (birthday_payer_pending = 1)
+    // 🔹 Geburtstagskandidaten: Geburtstag war + noch nicht in diesem Jahr gezahlt
-    $birthday_candidates = array_filter($candidates, fn($c) => $c['birthday_payer_pending'] == 1);
+    $birthday_candidates = array_filter($candidates, function ($c) use ($meeting_year, $meeting_month, $meeting_day) {
+        if (!$c['birthday'] || $c['birthday'] === '0000-00-00') {
+            return false;
+        }
+
+        $last_bday_year = (int)($c['last_birthday_year'] ?? 0);
+        if ($last_bday_year >= $meeting_year) {
+            return false; // Bereits in diesem Jahr gezahlt
+        }
+
+        $bday_month = (int)date('n', strtotime($c['birthday']));
+        $bday_day   = (int)date('j', strtotime($c['birthday']));
+
+        // War der Geburtstag in diesem Jahr bereits?
+        return ($bday_month < $meeting_month ||
+            ($bday_month == $meeting_month && $bday_day <= $meeting_day));
+    });
+
     if (!empty($birthday_candidates)) {
         usort($birthday_candidates, fn($a, $b) => strcmp($a['username'], $b['username']));
         $first = $birthday_candidates[0];
@@ -55,7 +75,7 @@ function get_next_payer_info($conn, $meeting_id)
         ];
     }
 
-    // 🔹 PRIORITÄT 2: Normale Rotation (nach regular_paid_count)
+    // 🔹 Normale Rotation
     $min_paid = min(array_column($candidates, 'regular_paid_count'));
     $regular_candidates = array_filter($candidates, fn($c) => $c['regular_paid_count'] == $min_paid);
     usort($regular_candidates, fn($a, $b) => strcmp($a['username'], $b['username']));
@@ -65,9 +85,3 @@ function get_next_payer_info($conn, $meeting_id)
         'is_birthday_payer' => false
     ];
 }
-
-function get_next_payer_username($conn, $meeting_id)
-{
-    $info = get_next_payer_info($conn, $meeting_id);
-    return $info ? $info['username'] : null;
-}