v1.3.1 - siehe Release Notes

backup.php

@@ -25,8 +25,31 @@ if ($handle = opendir($backup_dir)) {
         }
     }
     closedir($handle);
-    // Sortieren: neueste zuerst
+
-    usort($files, fn($a, $b) => $b['mtime'] <=> $a['mtime']);
+    // 🔸 Sortieren nach Datum im Dateinamen: DoMiLi_Backup_YYYY-MM[_x].pdf
+    usort($files, function ($a, $b) {
+        // Extrahiere YYYY-MM aus dem Dateinamen (ohne .pdf)
+        $nameA = pathinfo($a['name'], PATHINFO_FILENAME);
+        $nameB = pathinfo($b['name'], PATHINFO_FILENAME);
+
+        // Regex: Suche nach 4 Ziffern, Bindestrich, 2 Ziffern
+        $dateA = null;
+        $dateB = null;
+        if (preg_match('/(\d{4}-\d{2})/', $nameA, $matchesA)) {
+            $dateA = $matchesA[1];
+        }
+        if (preg_match('/(\d{4}-\d{2})/', $nameB, $matchesB)) {
+            $dateB = $matchesB[1];
+        }
+
+        // Wenn kein Datum gefunden: ans Ende schieben
+        if ($dateA === null && $dateB === null) return 0;
+        if ($dateA === null) return 1;  // A hinter B
+        if ($dateB === null) return -1; // B hinter A
+
+        // Absteigend sortieren: neuestes zuerst → "2025-07" > "2025-02"
+        return $dateB <=> $dateA;
+    });
 }
 
 require_once 'inc/header.php';

colors.php

@@ -1,10 +1,5 @@
 <?php
-session_start();
+include('inc/check_login.php');
-if (!isset($_SESSION['user_id'])) {
-    header("Location: login.php");
-    exit();
-}
-
 require_once 'inc/db.php';
 
 $is_admin = ($_SESSION['role'] === 'admin');
@@ -80,6 +75,18 @@ if ($is_admin && $_SERVER["REQUEST_METHOD"] == "POST") {
     }
 }
 
+// --- Sortierung mit Richtung (asc/desc) ---
+$sort = $_GET['sort'] ?? 'name';
+$dir  = $_GET['dir']  ?? 'asc';
+$sort = in_array($sort, ['name', 'usage']) ? $sort : 'name';
+$dir  = in_array($dir,  ['asc', 'desc'])   ? $dir  : 'asc';
+
+if ($sort === 'usage') {
+    $order_by = "usage_count $dir, c.name ASC";
+} else {
+    $order_by = "c.name $dir";
+}
+
 // --- Farben mit Nutzungszähler laden ---
 $colors = [];
 $result = mysqli_query($conn, "
@@ -92,7 +99,7 @@ $result = mysqli_query($conn, "
     FROM colors c
     LEFT JOIN meetings m ON c.id = m.color_id
     GROUP BY c.id, c.name, c.hex_code, c.is_special
-    ORDER BY c.name
+    ORDER BY $order_by
 ");
 while ($row = mysqli_fetch_assoc($result)) {
     $colors[] = $row;
@@ -174,27 +181,49 @@ require_once 'inc/header.php';
                     <table class="table table-striped table-hover">
                         <thead>
                             <tr>
-                                <th>Name</th>
                                 <th>Farbe</th>
-                                <th>Anz</th>
+                                <th>
+                                    <?php
+                                    $name_dir = ($sort === 'name' && $dir === 'asc') ? 'desc' : 'asc';
+                                    $name_arrow = '';
+                                    if ($sort === 'name') {
+                                        $name_arrow = $dir === 'asc' ? 'arrow_upward' : 'arrow_downward';
+                                    }
+                                    ?>
+                                    <a href="?sort=name&dir=<?= $name_dir ?>" class="link-secondary text-decoration-none">
+                                        Name <?php if ($name_arrow): ?><span class="material-symbols-outlined" style="font-size:1em;"><?= $name_arrow ?></span><?php endif; ?>
+                                    </a>
+                                </th>
+                                <th>
+                                    <?php
+                                    $usage_dir = ($sort === 'usage' && $dir === 'asc') ? 'desc' : 'asc';
+                                    $usage_arrow = '';
+                                    if ($sort === 'usage') {
+                                        $usage_arrow = $dir === 'asc' ? 'arrow_upward' : 'arrow_downward';
+                                    }
+                                    ?>
+                                    <a href="?sort=usage&dir=<?= $usage_dir ?>" class="link-secondary text-decoration-none">
+                                        Anzahl <?php if ($usage_arrow): ?><span class="material-symbols-outlined" style="font-size:1em;"><?= $usage_arrow ?></span><?php endif; ?>
+                                    </a>
+                                </th>
                                 <?php if ($is_admin): ?>
-                                    <th>Aktionen</th>
+                                    <th></th>
                                 <?php endif; ?>
                             </tr>
                         </thead>
                         <tbody>
                             <?php foreach ($colors as $color): ?>
                                 <tr>
-                                    <td>
+                                    <td class="align-middle">
+                                        <div style="background-color: <?= htmlspecialchars($color['hex_code']); ?>; width: 40px; height: 20px; border: 1px solid #ccc;"></div>
+                                    </td>
+                                    <td class="align-middle">
                                         <?= htmlspecialchars($color['name']); ?>
                                         <?php if ($color['is_special']): ?>
                                             <span class="badge bg-info ms-1" title="Sonderfarbe – nicht im Zufallsmodus">★</span>
                                         <?php endif; ?>
                                     </td>
-                                    <td>
+                                    <td class="align-middle">
-                                        <div style="background-color: <?= htmlspecialchars($color['hex_code']); ?>; width: 40px; height: 20px; border: 1px solid #ccc;"></div>
-                                    </td>
-                                    <td>
                                         <?= (int)$color['usage_count']; ?>
                                     </td>
                                     <?php if ($is_admin): ?>

export.php

@@ -14,11 +14,17 @@ use Dompdf\Options;
 date_default_timezone_set('Europe/Berlin');
 
 // === 1. Berichtsmonat ===
-$berichtsMonatEnde = new DateTime('last day of last month');
 $berichtsMonatBeginn = new DateTime('first day of last month');
+$berichtsMonatEnde   = new DateTime('last day of last month');
+$berichtsMonatEnde->setTime(23, 59, 59);
+
+// Backup für manuelles erzeugen eines PDF in einem anderen Zeitabschnitt
+//$berichtsMonatBeginn = new DateTime('2025-09-01 00:00:00');
+//$berichtsMonatEnde   = new DateTime('2025-09-30 23:59:59');
+
 
 // === 2. Letzter Jahresabschluss ===
-$last_closing = '2020-01-01';
+$last_closing = '2025-01-01';
 $res = mysqli_query($conn, "SELECT MAX(closing_date) AS last_date FROM penalty_closings");
 if ($res && ($row = mysqli_fetch_assoc($res)) && !is_null($row['last_date'])) {
     $last_closing = $row['last_date'];
@@ -33,7 +39,7 @@ while ($row = mysqli_fetch_assoc($resUsers)) {
 $userIds = array_keys($alleBenutzer);
 
 // === 4. Alle relevanten Daten (nur completed + attended=1) ===
-$bisDatum = $berichtsMonatEnde->format('Y-m-d');
+$bisDatum = $berichtsMonatEnde->format('Y-m-d H:i:s');
 $stmt = mysqli_prepare($conn, "
     SELECT m.id AS meeting_id, m.meeting_date,
            mt.user_id, mt.wore_color, mt.paid, mt.birthday_pay
@@ -59,8 +65,8 @@ $stmtMeta = mysqli_prepare($conn, "
     WHERE meeting_date >= ? AND meeting_date <= ? AND is_completed = 1
     ORDER BY meeting_date
 ");
-$startDate = $berichtsMonatBeginn->format('Y-m-d');
+$startDate = $berichtsMonatBeginn->format('Y-m-d H:i:s');
-$endDate   = $berichtsMonatEnde->format('Y-m-d');
+$endDate   = $berichtsMonatEnde->format('Y-m-d H:i:s');
 mysqli_stmt_bind_param($stmtMeta, 'ss', $startDate, $endDate);
 mysqli_stmt_execute($stmtMeta);
 $resultMeta = mysqli_stmt_get_result($stmtMeta);

kasse.php

@@ -1,5 +1,4 @@
 <?php
-// KEIN LEERZEICHEN ODER ZEILENUMBRUCH VOR DIESEM <?php!
 include('inc/check_login.php');
 require_once('inc/db.php');
 

planning.php

@@ -40,7 +40,7 @@ function get_weighted_random_color($conn)
     $color_pool = [];
 
     foreach ($colors as $color) {
-        $weight = $max_usage - $color['usage'] + 1; // Mindestgewicht = 1
+        $weight = ($max_usage - $color['usage'] + 1) ** 2;
         for ($i = 0; $i < $weight; $i++) {
             $color_pool[] = $color['id'];
         }

profil.php

@@ -8,7 +8,7 @@ $message_type = '';
 $user_id = (int)$_SESSION['user_id'];
 
 // Aktuelle Benutzerdaten laden
-$stmt_fetch = mysqli_prepare($conn, "SELECT username, email, role, birthday, last_birthday_year FROM users WHERE id = ?");
+$stmt_fetch = mysqli_prepare($conn, "SELECT username, email, role, birthday FROM users WHERE id = ?");
 mysqli_stmt_bind_param($stmt_fetch, "i", $user_id);
 mysqli_stmt_execute($stmt_fetch);
 $result = mysqli_stmt_get_result($stmt_fetch);
@@ -23,7 +23,6 @@ $current_username = $user_data['username'];
 $current_email = $user_data['email'] ?? '';
 $current_role = $user_data['role'];
 $current_birthday = $user_data['birthday'] ?? '';
-$current_last_bday_year = $user_data['last_birthday_year'];
 
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
     $new_username = trim($_POST['username'] ?? '');
@@ -76,27 +75,13 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
                 $success = false;
             }
 
-            // 2. Optional: last_birthday_year aktualisieren
-            if ($success && $update_last_bday_year) {
-                $stmt2 = mysqli_prepare($conn, "UPDATE users SET last_birthday_year = ? WHERE id = ?");
-                if ($stmt2) {
-                    mysqli_stmt_bind_param($stmt2, "ii", $new_last_bday_year, $user_id);
-                    if (!mysqli_stmt_execute($stmt2)) {
-                        $success = false;
-                    }
-                    mysqli_stmt_close($stmt2);
-                } else {
-                    $success = false;
-                }
-            }
-
             if ($success) {
                 mysqli_commit($conn);
                 $_SESSION['username'] = $new_username;
                 $_SESSION['email'] = $new_email;
 
                 // Neu laden
-                $stmt_reload = mysqli_prepare($conn, "SELECT username, email, role, birthday, last_birthday_year FROM users WHERE id = ?");
+                $stmt_reload = mysqli_prepare($conn, "SELECT username, email, role, birthday FROM users WHERE id = ?");
                 mysqli_stmt_bind_param($stmt_reload, "i", $user_id);
                 mysqli_stmt_execute($stmt_reload);
                 $user_data = mysqli_fetch_assoc(mysqli_stmt_get_result($stmt_reload));
@@ -106,7 +91,6 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
                 $current_email = $user_data['email'] ?? '';
                 $current_role = $user_data['role'];
                 $current_birthday = $user_data['birthday'] ?? '';
-                $current_last_bday_year = $user_data['last_birthday_year'];
 
                 $message = "Profil erfolgreich aktualisiert!";
                 $message_type = 'success';
@@ -152,15 +136,6 @@ require_once 'inc/header.php';
                         <div class="mb-3">
                             <label for="birthday" class="form-label fw-bold">Geburtstag</label>
                             <input type="date" class="form-control" id="birthday" name="birthday" value="<?= htmlspecialchars($current_birthday ?? '') ?>">
-                            <small class="form-text text-muted">
-                                <?php if (!empty($current_birthday) && $current_last_bday_year == date('Y')): ?>
-                                    <span class="text-success">✓ In diesem Jahr bereits als Geburtstagszahler markiert.</span>
-                                <?php elseif (!empty($current_birthday)): ?>
-                                    Geburtstag steht noch an – du kannst als Sonderzahler vorgeschlagen werden.
-                                <?php else: ?>
-                                    Für automatische Sonderzahlung.
-                                <?php endif; ?>
-                            </small>
                         </div>
                         <div class="mb-3">
                             <label for="role" class="form-label fw-bold">Rolle</label>

version.php

@@ -287,6 +287,7 @@ foreach ($releases as $rel) {
 require_once('inc/header.php');
 ?>
 
+<!-- 🔸 ANGEPASST: Kein row/col-Wrapper – direkter container wie auf anderen Seiten -->
 <div class="container mt-5 mb-4">
     <?php if ($message): ?>
         <div class="alert alert-<?= htmlspecialchars($message_type) ?> alert-dismissible fade show" role="alert">
@@ -295,8 +296,6 @@ require_once('inc/header.php');
         </div>
     <?php endif; ?>
 
-    <div class="row justify-content-center">
-        <div class="col-lg-8">
     <h2 class="mb-4">📋 Versionsübersicht</h2>
 
     <div class="card shadow">
@@ -430,7 +429,5 @@ require_once('inc/header.php');
         </div>
     </div>
 </div>
-    </div>
-</div>
 
 <?php include('inc/footer.php'); ?>