From b465bd9c5443ac1d1593cb039e3daeb53ab41225 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Mon, 29 Sep 2025 17:54:03 +0000
Subject: [PATCH 001/144] Devices is_active + Table

---
 srv/poe_manager/app.py                 |  22 +++++--
 srv/poe_manager/generate_ips.py        |  12 +++-
 srv/poe_manager/sqlite.db              | Bin 40960 -> 40960 bytes
 srv/poe_manager/static/css/style.css   |  49 +++++++++++++++-
 srv/poe_manager/templates/devices.html |  77 +++++++++++++++----------
 5 files changed, 119 insertions(+), 41 deletions(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index d694755..3b867d9 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -47,7 +47,7 @@ def get_devices():
     Liefert eine Liste aller Devices aus der Datenbank als Dictionaries.
     """
     conn = get_db_connection()
-    devices = conn.execute("SELECT mac, rpi_ip, port, name, switch_hostname FROM devices").fetchall()
+    devices = conn.execute("SELECT mac, rpi_ip, port, name, switch_hostname, is_active FROM devices").fetchall()
     conn.close()
     return devices
 
@@ -150,14 +150,19 @@ def devices():
         if not current_user.is_admin:
             flash("Zugriff verweigert!")
             return redirect(url_for('devices'))
+
         mac = request.form['mac']
         rpi_ip = request.form['rpi_ip']
         port = request.form['port']
         name = request.form['name']
         switch_hostname = request.form['switch_hostname']
+        is_active = 1 if 'is_active' in request.form else 0
+
         try:
-            conn.execute("INSERT INTO devices (mac, rpi_ip, port, name, switch_hostname) VALUES (?, ?, ?, ?, ?)",
-                         (mac, rpi_ip, port, name, switch_hostname))
+            conn.execute("""
+                INSERT INTO devices (mac, rpi_ip, port, name, switch_hostname, is_active)
+                VALUES (?, ?, ?, ?, ?, ?)
+            """, (mac, rpi_ip, port, name, switch_hostname, is_active))
             conn.commit()
             flash(f"Gerät {name} hinzugefügt.")
         except sqlite3.IntegrityError:
@@ -168,18 +173,21 @@ def devices():
         if not current_user.is_admin:
             flash("Zugriff verweigert!")
             return redirect(url_for('devices'))
+
         old_mac = request.form['old_mac']
         mac = request.form['mac']
         rpi_ip = request.form['rpi_ip']
         port = request.form['port']
         name = request.form['name']
         switch_hostname = request.form['switch_hostname']
+        is_active = 1 if 'is_active' in request.form else 0
+
         try:
             conn.execute("""
                 UPDATE devices
-                SET mac=?, rpi_ip=?, port=?, name=?, switch_hostname=?
+                SET mac=?, rpi_ip=?, port=?, name=?, switch_hostname=?, is_active=?
                 WHERE mac=?
-            """, (mac, rpi_ip, port, name, switch_hostname, old_mac))
+            """, (mac, rpi_ip, port, name, switch_hostname, is_active, old_mac))
             conn.commit()
             flash(f"Gerät {name} aktualisiert.")
         except sqlite3.IntegrityError:
@@ -196,10 +204,12 @@ def devices():
         flash(f"Gerät {del_mac} gelöscht.")
 
     devices = conn.execute("""
-        SELECT devices.mac, devices.rpi_ip, devices.port, devices.name, switches.hostname AS switch_hostname
+        SELECT devices.mac, devices.rpi_ip, devices.port, devices.name, devices.is_active,
+               switches.hostname AS switch_hostname
         FROM devices
         JOIN switches ON devices.switch_hostname = switches.hostname
     """).fetchall()
+
     conn.close()
     interval_min = get_interval_seconds() // 60
     return render_template('devices.html', devices=devices, switches=switches)
diff --git a/srv/poe_manager/generate_ips.py b/srv/poe_manager/generate_ips.py
index 60ec98f..53409ec 100644
--- a/srv/poe_manager/generate_ips.py
+++ b/srv/poe_manager/generate_ips.py
@@ -11,8 +11,16 @@ def generate_ips_list():
     # Alle Switches laden
     switches = {row['hostname']: row for row in conn.execute("SELECT hostname, ip, username, password FROM switches")}
     
-    # Alle Geräte laden
-    devices = conn.execute("SELECT mac, rpi_ip, port, name, switch_hostname FROM devices").fetchall()
+#    # Alle Geräte laden
+#    devices = conn.execute("SELECT mac, rpi_ip, port, name, switch_hostname FROM devices").fetchall()
+#    conn.close()
+
+    # Nur aktive Geräte laden
+    devices = conn.execute("""
+        SELECT mac, rpi_ip, port, name, switch_hostname 
+        FROM devices 
+        WHERE is_active=1
+    """).fetchall()
     conn.close()
 
     tmp = tempfile.NamedTemporaryFile(delete=False, mode='w', prefix='ips_', suffix='.list')
diff --git a/srv/poe_manager/sqlite.db b/srv/poe_manager/sqlite.db
index 39a3341712ea868ef9b03e216448350840277fe5..5b2147921f4a5b977d07c48cd053abbff80d9e29 100644
GIT binary patch
delta 277
zcmZoTz|?SnX@az%J_7>-7ZAe$>qH%6d3^@GvQA#!Zw#E=q73{>{KvUP`9AXs^Pc88
z$fM6QVPoTTF0LkVW_EFDX~q`TNqie+6f%qB6O&6a%Tg6Q{X$&bU4s-{T-_W)eL@rr
zCU4+#-mK4aoRNk92gBcqjX&9RS=huKr6*tHmDnuE|3N{N?<@m5-(m*7#r)U!SMXQy
z`|!*0eb_9h(96fE!N|_9ttcqYIr+Z5A`8%!$`c#qId#~9qN<`m(W`c<oH}eU9+N$g
h#|q==gLo`3UJQuG4C8eIc^XVW9@y+{_KJ%f5&)NpKBoWx

delta 231
zcmZoTz|?SnX@az%8Uq6Z7ZAe$%S0Vxc{K*TvQA$99}Jv4`V9O^{Kt8}@qOkM<~_}G
zkVl_q!e&8%joh2{d5$x3HC8dRi%Uy0HhWK&=iWGZ0XOU9Pu#X_x-4wsj?$Aa@=9zL
z<o}=`3N)Ra?<@oVb^dkyjr<|}>U_WW&TbY|*v`kH&CbTJttu)$`KO&Khc+9Oqizr6
rutGVZAPx(Z(+uJ;Lpd9P9CaojM^R9G@_l<n4s}K-XN{fWB8LP3<$N=}

diff --git a/srv/poe_manager/static/css/style.css b/srv/poe_manager/static/css/style.css
index 3ef38c5..2ad9bdf 100644
--- a/srv/poe_manager/static/css/style.css
+++ b/srv/poe_manager/static/css/style.css
@@ -53,7 +53,7 @@ pre {
 }
 
 .content-wrapper {
-    max-width: 1024px;
+    max-width: 1080px;
     margin-left: auto;
     margin-right: auto;
 }
@@ -102,3 +102,50 @@ pre {
     font-size: 0.9em;
     color: gray;
 }
+
+/* Tabelle anpassen */
+.custom-table input,
+.custom-table select {
+    height: 28px;
+    padding: 0.25rem 0.5rem;
+    font-size: 0.9rem;
+}
+
+/* Spaltenbreiten */
+.custom-table .col-small {
+    width: 100px; /* Hostname, Port */
+}
+
+.custom-table .col-ip {
+    width: 120px; /* IP-Adresse schmaler */
+}
+
+.custom-table .col-mac {
+    width: 120px; /* MAC-Adresse schmaler */
+}
+
+/* Checkbox sichtbar auch bei disabled */
+.checkbox-visible:disabled {
+    opacity: 1;  /* nicht ausgegraut */
+    cursor: not-allowed;
+}
+
+/* Aktiv-Label für Neues Gerät */
+label.text-white {
+    color: white !important;
+}
+
+
+.checkbox-visible:not(:checked) {
+    accent-color: #dc3545; /* rot wenn unchecked */
+}
+.checkbox-visible:disabled {
+    cursor: not-allowed;
+    opacity: 1; /* verhindert Ausgrauen */
+}
+
+.custom-actions {
+    gap: 0.5rem; /* horizontaler Abstand zwischen Buttons */
+    margin: auto 0;
+    background: #fff;
+}
diff --git a/srv/poe_manager/templates/devices.html b/srv/poe_manager/templates/devices.html
index 71f7539..f5d8d7d 100644
--- a/srv/poe_manager/templates/devices.html
+++ b/srv/poe_manager/templates/devices.html
@@ -3,22 +3,14 @@
 
 <h2>Devices</h2>
 
-{% with messages = get_flashed_messages() %}
-  {% if messages %}
-    <div class="mt-2 alert alert-info">
-        {% for message in messages %}{{ message }}<br>{% endfor %}
-    </div>
-  {% endif %}
-{% endwith %}
-
 {% if current_user.is_admin %}
 <h4>Neues Gerät hinzufügen</h4>
 <form method="post" class="row g-2 mb-4">
     <input type="hidden" name="add_device" value="1">
-    <div class="col"><input type="text" name="name" placeholder="Hostname" class="form-control" required></div>
-    <div class="col"><input type="text" name="rpi_ip" placeholder="IP-Adresse" class="form-control" required></div>
-    <div class="col"><input type="text" name="mac" placeholder="MAC-Adresse" class="form-control" required></div>
-    <div class="col"><input type="text" name="port" placeholder="Port" class="form-control" required></div>
+    <div class="col col-small"><input type="text" name="name" placeholder="Hostname" class="form-control" required></div>
+    <div class="col col-ip"><input type="text" name="rpi_ip" placeholder="IP-Adresse" class="form-control" required></div>
+    <div class="col col-mac"><input type="text" name="mac" placeholder="MAC-Adresse" class="form-control" required></div>
+    <div class="col col-small"><input type="text" name="port" placeholder="Port" class="form-control" required></div>
     <div class="col">
         <select name="switch_hostname" class="form-control" required>
             <option value="">Switch wählen</option>
@@ -27,33 +19,44 @@
             {% endfor %}
         </select>
     </div>
+    <div class="col d-flex align-items-center">
+        <input type="checkbox" name="is_active" value="1" checked id="new_is_active">
+        <label for="new_is_active" class="ms-2 mb-0 text-white">Aktiv</label>
+    </div>
     <div class="col"><button class="btn btn-success w-100">Hinzufügen</button></div>
 </form>
 {% endif %}
 
-<table class="table table-bordered">
+<table class="table table-bordered custom-table">
     <thead>
         <tr>
-            <th>Hostname</th>
-            <th>IP-Adresse</th>
-            <th>MAC-Adresse</th>
+            <th class="col-small">Hostname</th>
+            <th class="col-ip">IP-Adresse</th>
+            <th class="col-mac">MAC-Adresse</th>
             <th>Switch</th>
-            <th>Port</th>
+            <th class="col-small">Port</th>
+            <th>Aktiv</th>
             {% if current_user.is_admin %}<th>Aktionen</th>{% endif %}
         </tr>
     </thead>
     <tbody>
         {% for d in devices %}
         <tr>
-            {% if current_user.is_admin %}
             <form method="post">
                 <input type="hidden" name="edit_device" value="1">
                 <input type="hidden" name="old_mac" value="{{ d['mac'] }}">
-                <td><input name="name" value="{{ d['name'] }}" class="form-control" required></td>
-                <td><input name="rpi_ip" value="{{ d['rpi_ip'] }}" class="form-control" required></td>
-                <td><input name="mac" value="{{ d['mac'] }}" class="form-control" required></td>
+
+                <td class="col-small">
+                    <input name="name" value="{{ d['name'] }}" class="form-control" required disabled>
+                </td>
+                <td class="col-ip">
+                    <input name="rpi_ip" value="{{ d['rpi_ip'] }}" class="form-control" required disabled>
+                </td>
+                <td class="col-mac">
+                    <input name="mac" value="{{ d['mac'] }}" class="form-control" required disabled>
+                </td>
                 <td>
-                    <select name="switch_hostname" class="form-control" required>
+                    <select name="switch_hostname" class="form-control" disabled required>
                         {% for sw in switches %}
                             <option value="{{ sw['hostname'] }}" {% if sw['hostname']==d['switch_hostname'] %}selected{% endif %}>
                                 {{ sw['hostname'] }}
@@ -61,23 +64,33 @@
                         {% endfor %}
                     </select>
                 </td>
-                <td><input name="port" value="{{ d['port'] }}" class="form-control" required></td>
-                <td class="d-flex gap-1">
-                    <button class="btn btn-primary btn-sm">Speichern</button>
+                <td class="col-small">
+                    <input name="port" value="{{ d['port'] }}" class="form-control" required disabled>
+                </td>
+                <td class="custom-checkbox">
+                    <input type="checkbox" name="is_active" value="1" {% if d['is_active'] %}checked{% endif %} disabled class="checkbox-visible">
+                </td>
+                {% if current_user.is_admin %}
+                <td class="custom-actions">
+                    <button type="button" class="btn btn-warning btn-sm" onclick="enableEdit(this)">Bearbeiten</button>
+                    <button type="submit" class="btn btn-primary btn-sm d-none">Speichern</button>
                     <button name="delete_device" value="{{ d['mac'] }}" class="btn btn-danger btn-sm"
                         onclick="return confirm('Willst du das Gerät wirklich löschen?');">Löschen</button>
                 </td>
+                {% endif %}
             </form>
-            {% else %}
-            <td>{{ d['name'] }}</td>
-            <td>{{ d['rpi_ip'] }}</td>
-            <td>{{ d['mac'] }}</td>
-            <td>{{ d['switch_hostname'] }}</td>
-            <td>{{ d['port'] }}</td>
-            {% endif %}
         </tr>
         {% endfor %}
     </tbody>
 </table>
 
+<script>
+function enableEdit(btn) {
+    const row = btn.closest('tr');
+    row.querySelectorAll('input, select').forEach(el => el.disabled = false); // Inputs aktivieren
+    btn.classList.add('d-none'); // Bearbeiten ausblenden
+    row.querySelector('button.btn-primary').classList.remove('d-none'); // Speichern sichtbar
+}
+</script>
+
 {% endblock %}
-- 
2.49.1


From a10343d37e58196a9f446ede6ad4ec847b9d3ff9 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Mon, 29 Sep 2025 18:17:58 +0000
Subject: [PATCH 002/144] Devices is_active + Table

---
 srv/poe_manager/app.py                 |   3 +-
 srv/poe_manager/sqlite.db              | Bin 40960 -> 40960 bytes
 srv/poe_manager/static/css/style.css   |   9 ++--
 srv/poe_manager/templates/index.html   |  12 +++++-
 srv/poe_manager/templates/switche.html |  55 +++++++++++++++++--------
 srv/poe_manager/templates/users.html   |  14 +++----
 6 files changed, 62 insertions(+), 31 deletions(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 3b867d9..689a13d 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -86,7 +86,8 @@ def logout():
 def index():
     conn = sqlite3.connect("sqlite.db")
     c = conn.cursor()
-    c.execute("SELECT mac, name FROM devices")
+    # is_active mit abfragen
+    c.execute("SELECT mac, name, is_active FROM devices")
     devices = c.fetchall()
     conn.close()
 
diff --git a/srv/poe_manager/sqlite.db b/srv/poe_manager/sqlite.db
index 5b2147921f4a5b977d07c48cd053abbff80d9e29..e52fe2841b153a39d7eb7385837d6b321d5b5613 100644
GIT binary patch
delta 26
icmZoTz|?SnX@WGP!9*EnMuUwBGwc{SHvhC^PXqvX$Oyy$

delta 26
icmZoTz|?SnX@WGP{zMsPM*WQmGwc{SH~+L_PXqvXu?WKe

diff --git a/srv/poe_manager/static/css/style.css b/srv/poe_manager/static/css/style.css
index 2ad9bdf..997de8a 100644
--- a/srv/poe_manager/static/css/style.css
+++ b/srv/poe_manager/static/css/style.css
@@ -117,13 +117,14 @@ pre {
 }
 
 .custom-table .col-ip {
-    width: 120px; /* IP-Adresse schmaler */
+    width: 140px; /* IP-Adresse schmaler */
 }
 
 .custom-table .col-mac {
-    width: 120px; /* MAC-Adresse schmaler */
+    width: 140px; /* MAC-Adresse schmaler */
 }
 
+
 /* Checkbox sichtbar auch bei disabled */
 .checkbox-visible:disabled {
     opacity: 1;  /* nicht ausgegraut */
@@ -145,7 +146,7 @@ label.text-white {
 }
 
 .custom-actions {
-    gap: 0.5rem; /* horizontaler Abstand zwischen Buttons */
-    margin: auto 0;
+    margin: auto 0; 
     background: #fff;
 }
+
diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index 2e8f299..0ef9f3d 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -8,8 +8,16 @@
         <div class="card text-center p-2">
             <div class="card-header">{{ d[1] }}</div>
             <div class="card-body">
-                <span class="fw-bold" style="color: {% if status[d[0]]=='online' %}green{% else %}red{% endif %};">
-                    {% if status[d[0]] %}{{ status[d[0]]|capitalize }}{% else %}unbekannt{% endif %}
+                <span class="fw-bold" style="color: 
+                    {% if d[2] == 0 %}gray
+                    {% elif status[d[0]]=='online' %}green
+                    {% else %}red
+                    {% endif %};">
+                    {% if d[2] == 0 %}
+                        Deaktiviert
+                    {% else %}
+                        {% if status[d[0]] %}{{ status[d[0]]|capitalize }}{% else %}Unbekannt{% endif %}
+                    {% endif %}
                 </span>
             </div>
         </div>
diff --git a/srv/poe_manager/templates/switche.html b/srv/poe_manager/templates/switche.html
index 6f106e9..a98ed81 100644
--- a/srv/poe_manager/templates/switche.html
+++ b/srv/poe_manager/templates/switche.html
@@ -7,20 +7,21 @@
 <h4>Neuen Switch hinzufügen</h4>
 <form method="post" class="row g-2 mb-4">
     <input type="hidden" name="add_switch" value="1">
-    <div class="col"><input type="text" name="hostname" placeholder="Hostname" class="form-control" required></div>
-    <div class="col"><input type="text" name="ip" placeholder="IP-Adresse" class="form-control" required></div>
-    <div class="col"><input type="text" name="username" placeholder="Username" class="form-control" required></div>
+    <div class="col col-small"><input type="text" name="hostname" placeholder="Hostname" class="form-control" required></div>
+    <div class="col col-ip"><input type="text" name="ip" placeholder="IP-Adresse" class="form-control" required></div>
+    <div class="col col-small"><input type="text" name="username" placeholder="Username" class="form-control" required></div>
     <div class="col"><input type="password" name="password" placeholder="Password" class="form-control" required></div>
     <div class="col"><button class="btn btn-success w-100">Hinzufügen</button></div>
 </form>
 {% endif %}
 
-<table class="table table-bordered">
+<table class="table table-bordered custom-table">
     <thead>
         <tr>
-            <th>Hostname</th>
-            <th>IP-Adresse</th>
-            <th>Username</th>
+            <th class="col-small">Hostname</th>
+            <th class="col-ip">IP-Adresse</th>
+            <th class="col-small">Username</th>
+            <th>Password</th>
             {% if current_user.is_admin %}<th>Aktionen</th>{% endif %}
         </tr>
     </thead>
@@ -28,26 +29,46 @@
         {% for s in switches %}
         <tr>
             {% if current_user.is_admin %}
-            <form method="post">
-                <input type="hidden" name="edit_switch" value="1">
-                <input type="hidden" name="old_hostname" value="{{ s['hostname'] }}">
-                <td><input name="hostname" value="{{ s['hostname'] }}" class="form-control" required></td>
-                <td><input name="ip" value="{{ s['ip'] }}" class="form-control" required></td>
-                <td><input name="username" value="{{ s['username'] }}" class="form-control" required></td>
-                <td class="d-flex gap-1">
-                    <button class="btn btn-primary btn-sm">Speichern</button>
+            <td class="col-small"><input name="hostname" value="{{ s['hostname'] }}" class="form-control" required disabled></td>
+            <td class="col-ip"><input name="ip" value="{{ s['ip'] }}" class="form-control" required disabled></td>
+            <td class="col-small"><input name="username" value="{{ s['username'] }}" class="form-control" required disabled></td>
+            <td><input name="password" value="{{ s['password'] }}" type="password" class="form-control" disabled></td>
+            <td class="custom-actions d-flex gap-1 align-items-center">
+                <!-- Bearbeiten Button -->
+                <button type="button" class="btn btn-warning btn-sm" onclick="enableSwitchEdit(this)">Bearbeiten</button>
+
+                <!-- Speichern Button -->
+                <form method="post" style="display:inline;">
+                    <input type="hidden" name="edit_switch" value="1">
+                    <input type="hidden" name="old_hostname" value="{{ s['hostname'] }}">
+                    <button class="btn btn-primary btn-sm d-none" type="submit">Speichern</button>
+                </form>
+
+                <!-- Löschen Button -->
+                <form method="post" style="display:inline;">
                     <button name="delete_switch" value="{{ s['hostname'] }}" class="btn btn-danger btn-sm"
                         onclick="return confirm('Willst du den Switch wirklich löschen?');">Löschen</button>
-                </td>
-            </form>
+                </form>
+            </td>
             {% else %}
             <td>{{ s['hostname'] }}</td>
             <td>{{ s['ip'] }}</td>
             <td>{{ s['username'] }}</td>
+            <td>******</td>
             {% endif %}
         </tr>
         {% endfor %}
     </tbody>
 </table>
 
+<script>
+function enableSwitchEdit(btn) {
+    const row = btn.closest('tr');
+    // Inputs aktivieren
+    row.querySelectorAll('input').forEach(el => el.disabled = false);
+    row.querySelector('.btn-primary').classList.remove('d-none'); // Speichern sichtbar
+    btn.classList.add('d-none'); // Bearbeiten ausblenden
+}
+</script>
+
 {% endblock %}
diff --git a/srv/poe_manager/templates/users.html b/srv/poe_manager/templates/users.html
index 339e0e2..12188cf 100644
--- a/srv/poe_manager/templates/users.html
+++ b/srv/poe_manager/templates/users.html
@@ -8,21 +8,21 @@
 <button class="btn btn-success mb-3" data-bs-toggle="modal" data-bs-target="#userModal" onclick="openUserModal()">Neuen Benutzer</button>
 {% endif %}
 
-<table class="table table-bordered">
+<table class="table table-bordered custom-table">
     <thead>
         <tr>
-            <th>Username</th>
-            <th>Rolle</th>
+            <th class="col-small">Username</th>
+            <th class="col-small">Rolle</th>
             {% if current_user.is_admin %}<th>Aktionen</th>{% endif %}
         </tr>
     </thead>
     <tbody>
         {% for u in users %}
         <tr>
-            <td>{{ u['username'] }}</td>
-            <td>{% if u['is_admin'] %}Admin{% else %}User{% endif %}</td>
+            <td class="col-small">{{ u['username'] }}</td>
+            <td class="col-small">{% if u['is_admin'] %}Admin{% else %}User{% endif %}</td>
             {% if current_user.is_admin %}
-            <td>
+            <td class="custom-actions d-flex gap-1 align-items-center">
                 <!-- Rolle ändern -->
                 <button class="btn btn-primary btn-sm" data-bs-toggle="modal"
                         data-bs-target="#roleModal"
@@ -49,6 +49,7 @@
     </tbody>
 </table>
 
+<!-- Modals bleiben unverändert -->
 <!-- Modal für neuen Benutzer -->
 <div class="modal fade" id="userModal" tabindex="-1" aria-hidden="true">
   <div class="modal-dialog">
@@ -159,7 +160,6 @@ function openRoleModal(user_id, username, is_admin) {
 function openPasswordModal(user_id, username) {
     document.getElementById('password_user_id').value = user_id;
     document.getElementById('password_username').value = username;
-    // Nur das Passwort-Feld zurücksetzen
     document.querySelector("#passwordForm input[name='new_password']").value = "";
 }
 </script>
-- 
2.49.1


From 28a436df162c8572273052159182a28e047af4f7 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 30 Sep 2025 15:14:26 +0000
Subject: [PATCH 003/144] images

---
 .gitignore                             |   3 +-
 srv/poe_manager/app.py                 | 137 +++++++++++++++----------
 srv/poe_manager/sqlite.db              | Bin 40960 -> 40960 bytes
 srv/poe_manager/static/images/logo.png | Bin 0 -> 2623 bytes
 srv/poe_manager/templates/devices.html |  71 +++++++------
 srv/poe_manager/templates/users.html   |   4 +-
 6 files changed, 121 insertions(+), 94 deletions(-)
 create mode 100644 srv/poe_manager/static/images/logo.png

diff --git a/.gitignore b/.gitignore
index c520d23..cb3a40e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,7 +39,8 @@ __pycache__/
 !/srv/poe_manager/static/css/*
 !/srv/poe_manager/static/js/
 !/srv/poe_manager/static/js/*
-
+!/srv/poe_manager/static/images/
+!/srv/poe_manager/static/images/*
 
 # Optional: SQLite DB ignorieren (falls du nicht willst, dass Passwörter im Repo landen)
 # /srv/poe_manager/sqlite.db
diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 689a13d..8b4b179 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -47,7 +47,7 @@ def get_devices():
     Liefert eine Liste aller Devices aus der Datenbank als Dictionaries.
     """
     conn = get_db_connection()
-    devices = conn.execute("SELECT mac, rpi_ip, port, name, switch_hostname, is_active FROM devices").fetchall()
+    devices = conn.execute("SELECT mac, rpi_ip, port, name, switch_hostname, is_active FROM devices ORDER BY name ASC").fetchall()
     conn.close()
     return devices
 
@@ -87,7 +87,7 @@ def index():
     conn = sqlite3.connect("sqlite.db")
     c = conn.cursor()
     # is_active mit abfragen
-    c.execute("SELECT mac, name, is_active FROM devices")
+    c.execute("SELECT mac, name, is_active FROM devices ORDER BY name ASC")
     devices = c.fetchall()
     conn.close()
 
@@ -146,73 +146,99 @@ def devices():
     conn = get_db_connection()
     switches = conn.execute("SELECT hostname FROM switches").fetchall()
 
-    # Inline-Add
-    if request.method == 'POST' and 'add_device' in request.form:
-        if not current_user.is_admin:
-            flash("Zugriff verweigert!")
-            return redirect(url_for('devices'))
+    if request.method == 'POST':
+        # -----------------------
+        # Inline-Add
+        # -----------------------
+        if 'add_device' in request.form:
+            if not current_user.is_admin:
+                flash("Zugriff verweigert!")
+                return redirect(url_for('devices'))
 
-        mac = request.form['mac']
-        rpi_ip = request.form['rpi_ip']
-        port = request.form['port']
-        name = request.form['name']
-        switch_hostname = request.form['switch_hostname']
-        is_active = 1 if 'is_active' in request.form else 0
+            mac = request.form.get('mac')
+            rpi_ip = request.form.get('rpi_ip')
+            port = request.form.get('port')
+            name = request.form.get('name')
+            switch_hostname = request.form.get('switch_hostname')
+            is_active = 1 if 'is_active' in request.form else 0
 
-        try:
-            conn.execute("""
-                INSERT INTO devices (mac, rpi_ip, port, name, switch_hostname, is_active)
-                VALUES (?, ?, ?, ?, ?, ?)
-            """, (mac, rpi_ip, port, name, switch_hostname, is_active))
-            conn.commit()
-            flash(f"Gerät {name} hinzugefügt.")
-        except sqlite3.IntegrityError:
-            flash("MAC existiert bereits oder Eingabefehler!")
+            if not all([mac, rpi_ip, port, name, switch_hostname]):
+                flash("Alle Felder müssen ausgefüllt sein!")
+                return redirect(url_for('devices'))
 
-    # Inline-Edit
-    if request.method == 'POST' and 'edit_device' in request.form:
-        if not current_user.is_admin:
-            flash("Zugriff verweigert!")
-            return redirect(url_for('devices'))
+            try:
+                conn.execute("""
+                    INSERT INTO devices (mac, rpi_ip, port, name, switch_hostname, is_active)
+                    VALUES (?, ?, ?, ?, ?, ?)
+                """, (mac, rpi_ip, port, name, switch_hostname, is_active))
+                conn.commit()
+                flash(f"Gerät {name} hinzugefügt.")
+            except sqlite3.IntegrityError:
+                flash("MAC existiert bereits oder Eingabefehler!")
 
-        old_mac = request.form['old_mac']
-        mac = request.form['mac']
-        rpi_ip = request.form['rpi_ip']
-        port = request.form['port']
-        name = request.form['name']
-        switch_hostname = request.form['switch_hostname']
-        is_active = 1 if 'is_active' in request.form else 0
+        # -----------------------
+        # Inline-Edit
+        # -----------------------
+        elif 'edit_device' in request.form:
+            if not current_user.is_admin:
+                flash("Zugriff verweigert!")
+                return redirect(url_for('devices'))
 
-        try:
-            conn.execute("""
-                UPDATE devices
-                SET mac=?, rpi_ip=?, port=?, name=?, switch_hostname=?, is_active=?
-                WHERE mac=?
-            """, (mac, rpi_ip, port, name, switch_hostname, is_active, old_mac))
-            conn.commit()
-            flash(f"Gerät {name} aktualisiert.")
-        except sqlite3.IntegrityError:
-            flash("MAC existiert bereits oder Eingabefehler!")
+            old_mac = request.form.get('old_mac')
+            mac = request.form.get('mac')
+            rpi_ip = request.form.get('rpi_ip')
+            port = request.form.get('port')
+            name = request.form.get('name')
+            switch_hostname = request.form.get('switch_hostname')
+            is_active = 1 if 'is_active' in request.form else 0
 
-    # Inline-Delete
-    if request.method == 'POST' and 'delete_device' in request.form:
-        if not current_user.is_admin:
-            flash("Zugriff verweigert!")
-            return redirect(url_for('devices'))
-        del_mac = request.form['delete_device']
-        conn.execute("DELETE FROM devices WHERE mac=?", (del_mac,))
-        conn.commit()
-        flash(f"Gerät {del_mac} gelöscht.")
+            if not all([old_mac, mac, rpi_ip, port, name, switch_hostname]):
+                flash("Alle Felder müssen ausgefüllt sein!")
+                return redirect(url_for('devices'))
 
+            try:
+                conn.execute("""
+                    UPDATE devices
+                    SET mac=?, rpi_ip=?, port=?, name=?, switch_hostname=?, is_active=?
+                    WHERE mac=?
+                """, (mac, rpi_ip, port, name, switch_hostname, is_active, old_mac))
+                conn.commit()
+                flash(f"Gerät {name} aktualisiert.")
+            except sqlite3.IntegrityError:
+                flash("MAC existiert bereits oder Eingabefehler!")
+
+        # -----------------------
+        # Inline-Delete
+        # -----------------------
+        elif 'delete_device' in request.form:
+            if not current_user.is_admin:
+                flash("Zugriff verweigert!")
+                return redirect(url_for('devices'))
+
+            del_mac = request.form.get('delete_device')
+            if del_mac:
+                device = conn.execute("SELECT name FROM devices WHERE mac=?", (del_mac,)).fetchone()
+                hostname = device['name'] if device else del_mac
+                conn.execute("DELETE FROM devices WHERE mac=?", (del_mac,))
+                conn.commit()
+                flash(f"Gerät {hostname} gelöscht.")
+            else:
+                flash("Keine MAC-Adresse übermittelt!")
+
+        return redirect(url_for('devices'))
+
+    # -----------------------
+    # Devices für Anzeige
+    # -----------------------
     devices = conn.execute("""
         SELECT devices.mac, devices.rpi_ip, devices.port, devices.name, devices.is_active,
                switches.hostname AS switch_hostname
         FROM devices
-        JOIN switches ON devices.switch_hostname = switches.hostname
+        LEFT JOIN switches ON devices.switch_hostname = switches.hostname
+        ORDER BY switches.hostname ASC
     """).fetchall()
 
     conn.close()
-    interval_min = get_interval_seconds() // 60
     return render_template('devices.html', devices=devices, switches=switches)
 
 @app.route('/switches', methods=['GET', 'POST'])
@@ -264,6 +290,7 @@ def switches():
             flash("Zugriff verweigert!")
             return redirect(url_for('switches'))
         del_hostname = request.form['delete_switch']
+        conn.execute("UPDATE devices SET switch_hostname=NULL WHERE switch_hostname=?", (del_hostname,))
         conn.execute("DELETE FROM switches WHERE hostname=?", (del_hostname,))
         conn.commit()
         flash(f"Switch {del_hostname} gelöscht.")
diff --git a/srv/poe_manager/sqlite.db b/srv/poe_manager/sqlite.db
index e52fe2841b153a39d7eb7385837d6b321d5b5613..37542c6ae7d1b8428fbf1890ecb60c5a4eaaf1e6 100644
GIT binary patch
delta 302
zcmZoTz|?SnX@WGP%|sbzMw^WZOZa(Mcpo$H7xO*ii{^d2Sy13IZ+#gHo2aO0V`xcg
zaS05kJA!~yzEO##X<9{TxtnK+u5P(&W|*6!PmW`xqi$wcil0wFc1lrRX_%X{xp%Uo
zX}CqcuV<ldk#kZ(Qesx2WmSobu9;7HSW${gRz|+7L850-Nvf}LNm90JnUSNdZ6gOW
zo1(V(<|MgAj65v-#~JuP@ZaaZz<+$Rpu%?k$sh7L7+EG?&^Hm`;9Jbdx0wGL{|f#p
zejk20z7KqtfNHw=CNH+rm1kv;=3obUKva|i=6Ym$^Lsl{MiCDFa}4~y`M>hN=YPrn
XnEx*Sb^dceBep@T;n;lLUo!vzG81HB

delta 127
zcmV-_0D%91zyg540+1U4Fp(TX0Wh&(qz?)M4qE^Za}MSXTeA@$O%AhL9;pEe0}s#u
z5AYA)574s_V8RcR&@VI+2M(hE4x<m&52z1%4@?gp4)C)PAdL=_qdqMGBawk0v+zC?
h0TKrf*8mUu5A_f459tr%58V&fvk_py53|=#DNys&D!~8%

diff --git a/srv/poe_manager/static/images/logo.png b/srv/poe_manager/static/images/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..fed246369230157c923ea1df8158fc7428e267f7
GIT binary patch
literal 2623
zcmV-F3c&S=P)<h;3K|Lk000e1NJLTq00I{P005=}0{{R36uw0w00009P)t-s00030
z|NsAS0Q-9XD*ylh0d!JMQvg8b*k%9#3FJvcK~#9!?VCN0>$nny4~<ueq6t)+@G9uQ
zc?sazkK?xrV<JPVd;v*`qDXh&8C&iLG=Y1&ZBgQ<V%1^sr!mj-JkLnwJkRqy-#4Fb
z05HF^-176k!Z;m^F>f&DpM-(KF-|><;e#0Q)8lxIp@(t)AjYtMI2PmF!<avaag=&}
z8{>2=#=OCpe-g&~<F&>(Z7@zh3FC1*#?Zq!e-Ps^^{O$>J&gH-7>B7>jWPEy-e39{
z+l1&ijMGoVsMYK7NsLuC4#OBW7(<0||0Kr!c#LxoWBwpUtzLzIoL<jWV9Xti(-z~r
zt@mb(ddjxFVScg1wkC-8R_?X4#Y=;@hfyazk8Nf&zgS~inclsxUgzD|_+E^*detfV
z{TPf|Hiq|OoacF-|C=9vt}t$`K6#ywKF6rkYd39r1I9eh^E~V^3iTQe$7lxR`TZED
zZ(z&^VLUR%soBZ_7{k{Xr=u|L8DnV4!f*h_xrgy=4*4dGTgGUr*QYQl*_aQ&h(9w%
zz2MYYu|5W4n|n1DTV6i2McHUz3_FbbZk6m^7|q=4yqi9}9%JZXthv{`pJ?9Rf^pyc
zsHbcjuY426xrb3@r~5_I*JIo=Ml0#r^uy^*7;^_>Rj*;cg!*_7#^NG<*?5$r+;JGg
zHdozZ++U56WFuiT7o5)fO^!n_D)s7Z`MeTilV{wAhI(}cORpqp@xz$D^XVe%+Rm2W
zLb|U0DaKa4`WRd=92sKk3B$2bIsGajUFV8%?qSSdVvr<byGtW1-?+2|3k)kPQexaP
zMoYbhZ(!s`T=~Xjk)<l2R#+rq%pHuKdhLS4MU2h6E=CY*bf91TXR%0$vE=71^*VP}
zRtgN+Vu(G(pkFPLFit&;VTVz3NLXH8Y09-P)EXTKT`&rZlo*fP?B7q4o}Gw`tr(U7
zq7jy;EiAXXulo~>UDC4yS=t8ZH+JA2BdqQlgCuoKdit<k<Y_H9^>T9c*#jJx?(j|N
zS_30@T(-y)jB3i(OUl(}CvYKm2YVQ{Mv+*dUg_!QDl8jQw%z0aOHU*xZ~;)me*mfn
zNlpO{Q2!SI%TmE0z+Vs>SM_>=ar*+}wm5up0x>|nGC0!5I1WOBq&d=(M^0o=dL_f!
zN!4>JjAt{)`{EERwTh$*OmbpM`h*h_uPj%%c2Z^KVf*paSW(|PsSAtKsU<ZNGB?JA
zp%DWs21zdJ^##W8B}S=UmKu>Mq{c4kUm%%zwZK@$=IXIS<KyEg#wr_11}I5kfSUT4
zid;xe5hJV^6La|n#`y`xyr`G0L#<~}Dh=xC!7GJV8YdbvuTmK}MeoQ%OyzPzV{hmF
z6vI~--chdx^#rH}UI}H01DzuS&C%<XaN)Zc^OqQ0)C<uW-~wsjg>a+?H9%=lgPM?m
z-Vu7u?o(sjdKm5H@{F+#VM_86Ac5*Z7vMs&NHh=B$5cQ9NXr;_ic#;f^)XmrTmxhx
zy`u{dW{WUsypmIZ7^nu}I>b~@ZDI6QBUkl`8VQnDgG_;NK>}o2EW#+;N-{vrksiu*
zi0NX~n|<xwgQ#ATCkRxFd9ehs=$RxOm9&I$HK=zXV@QSZXkhd=`|=G@y(BrBqk8Cd
z3J^;!5iO#NdXWZt2}I1pQkeBHcAI@Wb39h{64Hanj*!%gq(KXe03g<siSgGQW=}D;
zM-_$!MpQ4&7|{`;Y+M*^6CiP9i{ojG*C_zxnkiNT=Fn5GJ;;4cdX$VwPjUnUJzWgk
zt3hZvO?R=TUIQGtW{OWS8Z(n>(|DWoq|l&&j>4#323;{EBn*RNSW~nriy1mePXpw>
zRWAvEPD#BSU5J58_0TA_G50Fe>zf#-_H^;Q)^OY0i`M|1NH3J2B;f)*7;UCLff^!Q
zksw#8<<L{F{kF<2^~9QcIbH)e1$qq<^g0m|oz{aM^a*sYUR{ixZ1gae+>0^q;x(kK
zj}yr$=Ywg^y{Z=r^+Gl8*kkOM*@`8p&CD@1E>lW1^^%hFP++KmafG9;>ea(|Ji#bd
zCbzj)#L$evOB(B93W(e`Arr|^s8@CJZHrMaIAOOKS>#?y(u53pA?cNYE+*e%G1ViN
zY$IY6^V|+bbHS;Bu_irnL?ewpVoY>o$QV9iSdxvHA+1TmGmO?LitPgFs$P&ddJ#kf
zx&)A34Qd*7o1}}faV6<ObAs7fCA@Vo-g^M6S<a0=)c7>Ut9Nw%bPe~1VBB`Haa>nC
zb{MZd^7So@duLzia~OBj+n~pJM1iqchdCJI*4`CAE>KQSG2Rl3{emBj@i-Qv_je)p
zpMh~Z7UTZ2F>ox#yH7a%JB<6!z_=ZZ@nqTS^BDJoF&=G<+ea`?Z|@U)LpI)by8O>D
z@OES18}V94?Cnz+r#E-WR~U_z$oC|n-@{nz;kW#j-|}02%WwHVC`#rdmYX6FD-V&`
zdI8JX(DM5cfb;o@_2ZZ~J#57G0qJ^i@U$#rJpYi3^JQ~u<Lmd95m_AmTdIY8K+M~g
zzO;yMVRXuu7zRLm=k8p;f#Di`(!^aZtc}a&`Af&R9){HP#U=X@7^OeCd^Gr}RV91(
z+IO<)7+H=GEP=3esUuC?&V9r%0x$z$N(K=I=N*}M;7N>7QZ^Wlq#uEJT%g7vX`|A>
zc%X!SR1%{=$soE5PxUas`2e^}0K!OySli{jJTsT#dW}~F#0=tNlV!(X6oa!VZo$zM
z5SvJP8=V1RwAv$Gz=EOTfl)nF5CDn?f&$J=e7teR2!QkE0-V8x3PS-H^W6b(o`858
zV-xZItudSj1OW&FU<|-Gx?I}=;4XelHech_0C(}~A-PMJj&U{um@M7x4RDuO-*OY%
zAaKNj5$_HLjPaeuH8iZoa2{}%OBTmUy$o=ZPv6I?@jqK0V0E-cj1l6Mq!}=djtrwF
z<EIyDV9*0X+7=_kgJ3>d<2x8kw~rX1@xZAE5M4{+wkj#kr>?g$T14{h=4B%rac};b
z$E;WtfJij!^0dVmp}+`hBQ~bDk4<(l!~+IMjo}Mvldmx}-)>N6E}J%al?U7vfQ+(S
zD5GT@U5H(}m5n&2j2U*!em0KcJRsLnf0yATzPSpVr6)EqbcbOh*u@w(7*=9Pg%Nkz
zHSV~Na0ciIK%6BNQ3VhhvY~)@gL?5mB^wYQBMyqF9TGz=t5-FI#}k4|P9AD-Btyi=
zCqqIE9w|js^Y<`Fyi{YPh>M3AQq_o&C3oBmWJ#_izJaFtBS?;5Iw$Qs(qqRAZ;mwQ
z;esQ>R=og_Ar7@^NU;>Owlrb?FkM__<M|-|#^Nk_|Fd@(55Z7;9wT{ZHygsg=<Pq7
hNBAFr@mr25{{!X?g0}<&mjwU-002ovPDHLkV1ly8)-3=4

literal 0
HcmV?d00001

diff --git a/srv/poe_manager/templates/devices.html b/srv/poe_manager/templates/devices.html
index f5d8d7d..0ae9e49 100644
--- a/srv/poe_manager/templates/devices.html
+++ b/srv/poe_manager/templates/devices.html
@@ -20,7 +20,7 @@
         </select>
     </div>
     <div class="col d-flex align-items-center">
-        <input type="checkbox" name="is_active" value="1" checked id="new_is_active">
+        <input type="checkbox" name="is_active" value="0" unchecked id="new_is_active">
         <label for="new_is_active" class="ms-2 mb-0 text-white">Aktiv</label>
     </div>
     <div class="col"><button class="btn btn-success w-100">Hinzufügen</button></div>
@@ -42,43 +42,42 @@
     <tbody>
         {% for d in devices %}
         <tr>
-            <form method="post">
-                <input type="hidden" name="edit_device" value="1">
-                <input type="hidden" name="old_mac" value="{{ d['mac'] }}">
+            <td class="col-small"><input name="name" value="{{ d['name'] }}" class="form-control" required disabled></td>
+            <td class="col-ip"><input name="rpi_ip" value="{{ d['rpi_ip'] }}" class="form-control" required disabled></td>
+            <td class="col-mac"><input name="mac" value="{{ d['mac'] }}" class="form-control" required disabled></td>
+            <td>
+                <select name="switch_hostname" class="form-control" disabled required>
+                    {% for sw in switches %}
+                        <option value="{{ sw['hostname'] }}" {% if sw['hostname']==d['switch_hostname'] %}selected{% endif %}>
+                            {{ sw['hostname'] }}
+                        </option>
+                    {% endfor %}
+                </select>
+            </td>
+            <td class="col-small"><input name="port" value="{{ d['port'] }}" class="form-control" required disabled></td>
+            <td class="custom-checkbox">
+                <input type="checkbox" name="is_active" value="1" {% if d['is_active'] %}checked{% endif %} disabled class="checkbox-visible">
+            </td>
+            {% if current_user.is_admin %}
+            <td class="custom-actions">
+                <!-- Bearbeiten Button -->
+                <button type="button" class="btn btn-warning btn-sm" onclick="enableEdit(this)">Bearbeiten</button>
 
-                <td class="col-small">
-                    <input name="name" value="{{ d['name'] }}" class="form-control" required disabled>
-                </td>
-                <td class="col-ip">
-                    <input name="rpi_ip" value="{{ d['rpi_ip'] }}" class="form-control" required disabled>
-                </td>
-                <td class="col-mac">
-                    <input name="mac" value="{{ d['mac'] }}" class="form-control" required disabled>
-                </td>
-                <td>
-                    <select name="switch_hostname" class="form-control" disabled required>
-                        {% for sw in switches %}
-                            <option value="{{ sw['hostname'] }}" {% if sw['hostname']==d['switch_hostname'] %}selected{% endif %}>
-                                {{ sw['hostname'] }}
-                            </option>
-                        {% endfor %}
-                    </select>
-                </td>
-                <td class="col-small">
-                    <input name="port" value="{{ d['port'] }}" class="form-control" required disabled>
-                </td>
-                <td class="custom-checkbox">
-                    <input type="checkbox" name="is_active" value="1" {% if d['is_active'] %}checked{% endif %} disabled class="checkbox-visible">
-                </td>
-                {% if current_user.is_admin %}
-                <td class="custom-actions">
-                    <button type="button" class="btn btn-warning btn-sm" onclick="enableEdit(this)">Bearbeiten</button>
-                    <button type="submit" class="btn btn-primary btn-sm d-none">Speichern</button>
-                    <button name="delete_device" value="{{ d['mac'] }}" class="btn btn-danger btn-sm"
+                <!-- Speichern Button -->
+                <form method="post" style="display:inline;">
+                    <input type="hidden" name="edit_device" value="1">
+                    <input type="hidden" name="old_mac" value="{{ d['mac'] }}">
+                    <button class="btn btn-primary btn-sm d-none" type="submit">Speichern</button>
+                </form>
+
+                <!-- Löschen Button in eigenem Formular -->
+                <form method="post" style="display:inline;">
+                    <input type="hidden" name="delete_device" value="{{ d['mac'] }}">
+                    <button class="btn btn-danger btn-sm"
                         onclick="return confirm('Willst du das Gerät wirklich löschen?');">Löschen</button>
-                </td>
-                {% endif %}
-            </form>
+                </form>
+            </td>
+            {% endif %}
         </tr>
         {% endfor %}
     </tbody>
diff --git a/srv/poe_manager/templates/users.html b/srv/poe_manager/templates/users.html
index 12188cf..a5f66eb 100644
--- a/srv/poe_manager/templates/users.html
+++ b/srv/poe_manager/templates/users.html
@@ -11,8 +11,8 @@
 <table class="table table-bordered custom-table">
     <thead>
         <tr>
-            <th class="col-small">Username</th>
-            <th class="col-small">Rolle</th>
+            <th class="col-ip">Username</th>
+            <th class="col-ip">Rolle</th>
             {% if current_user.is_admin %}<th>Aktionen</th>{% endif %}
         </tr>
     </thead>
-- 
2.49.1


From 1136c97ce2169c1d4946ad18931cba471b4f88cb Mon Sep 17 00:00:00 2001
From: Master <tim@eertmoed.de>
Date: Tue, 30 Sep 2025 17:28:12 +0200
Subject: [PATCH 004/144] Login textfarbe

---
 srv/poe_manager/create_user.py       |  33 ++++++++++
 srv/poe_manager/sqlite.db            | Bin 40960 -> 40960 bytes
 srv/poe_manager/templates/login.html |   4 +-
 usr/local/bin/custom/poe.sh.bak      |  87 +++++++++++++++++++++++++++
 4 files changed, 122 insertions(+), 2 deletions(-)
 create mode 100755 srv/poe_manager/create_user.py
 create mode 100755 usr/local/bin/custom/poe.sh.bak

diff --git a/srv/poe_manager/create_user.py b/srv/poe_manager/create_user.py
new file mode 100755
index 0000000..ccba740
--- /dev/null
+++ b/srv/poe_manager/create_user.py
@@ -0,0 +1,33 @@
+#!/usr/bin/env python3
+import sqlite3
+from getpass import getpass
+from flask_bcrypt import Bcrypt
+
+DB_PATH = "/srv/poe_manager/sqlite.db"
+bcrypt = Bcrypt()
+
+def main():
+    username = input("Benutzername: ")
+    password = getpass("Passwort: ")
+    password_confirm = getpass("Passwort bestätigen: ")
+
+    if password != password_confirm:
+        print("Passwörter stimmen nicht überein!")
+        return
+
+    pw_hash = bcrypt.generate_password_hash(password).decode('utf-8')
+
+    conn = sqlite3.connect(DB_PATH)
+    cur = conn.cursor()
+    try:
+        cur.execute("INSERT INTO users (username, password, is_admin) VALUES (?, ?, ?)",
+                    (username, pw_hash, 0))
+        conn.commit()
+        print(f"Benutzer '{username}' erfolgreich angelegt.")
+    except sqlite3.IntegrityError:
+        print("Benutzername existiert bereits!")
+    finally:
+        conn.close()
+
+if __name__ == "__main__":
+    main()
diff --git a/srv/poe_manager/sqlite.db b/srv/poe_manager/sqlite.db
index 37542c6ae7d1b8428fbf1890ecb60c5a4eaaf1e6..5530fe32bba16034124bfbfb0b19d319866eb125 100644
GIT binary patch
delta 78
zcmZoTz|?SnX@WGP?L--8M%#@ED)FY?l^!k`ZY5QT2A*zu`T6GMrJ0^pdI6znc|kda
i`ex;oc{zHe$$pV#mPN+t87^LirUnttn|H>$I{*L>vKq1g

delta 78
zcmZoTz|?SnX@WGP%|sbzMw^WZD)FX?`nhQa-Vttv#)*yrUZF)9l_qI=sX?K|t}Z#I
i0f9NWW@aWnMOpequ30W&LB;-VA<p@Fn|H>$I{*OdlNsay

diff --git a/srv/poe_manager/templates/login.html b/srv/poe_manager/templates/login.html
index 5ec164c..427c7ff 100644
--- a/srv/poe_manager/templates/login.html
+++ b/srv/poe_manager/templates/login.html
@@ -19,11 +19,11 @@
 
 <form method="post" class="w-25">
     <div class="mb-3">
-        <label class="form-label">Username</label>
+        <label class="form-label label text-white">Username</label>
         <input type="text" name="username" class="form-control" required>
     </div>
     <div class="mb-3">
-        <label class="form-label">Password</label>
+        <label class="form-label label text-white">Password</label>
         <input type="password" name="password" class="form-control" required>
     </div>
     <button class="btn btn-primary">Login</button>
diff --git a/usr/local/bin/custom/poe.sh.bak b/usr/local/bin/custom/poe.sh.bak
new file mode 100755
index 0000000..fa0624e
--- /dev/null
+++ b/usr/local/bin/custom/poe.sh.bak
@@ -0,0 +1,87 @@
+#!/bin/bash
+
+USER="admin"
+PASS="Expl0rer#2022"
+IP_FILE="/usr/local/bin/custom/ips.list"
+LOGFILE="/var/log/rpi.log"
+
+function disable_poe() {
+    local switch_ip=$1
+    local port=$2
+    expect <<EOF
+set timeout 5
+spawn ssh $USER@$switch_ip
+
+expect {
+    "assword:" { send "$PASS\r"; exp_continue }
+    "Press any key" { send "\r"; exp_continue }
+    -re ".*> $" { }
+}
+send "configure terminal\r"
+expect "(config)#"
+send "interface $port\r"
+expect "(eth-$port)#"
+send "no power-over-ethernet\r"
+expect "(eth-$port)#"
+send "exit\r"
+expect "(config)#"
+send "exit\r"
+expect "#"
+send "exit\r"
+expect ">"
+send "exit\r"
+expect "Do you want to log out (y/n)?" { send "y\r" }
+expect eof
+EOF
+}
+
+function enable_poe() {
+    local switch_ip=$1
+    local port=$2
+    expect <<EOF
+set timeout 5
+spawn ssh $USER@$switch_ip
+
+expect {
+    "assword:" { send "$PASS\r"; exp_continue }
+    "Press any key" { send "\r"; exp_continue }
+    -re ".*> $" { }
+}
+send "configure terminal\r"
+expect "(config)#"
+send "interface $port\r"
+expect "(eth-$port)#"
+send "power-over-ethernet\r"
+expect "(eth-$port)#"
+send "exit\r"
+expect "(config)#"
+send "exit\r"
+expect "#"
+send "exit\r"
+expect ">"
+send "exit\r"
+expect "Do you want to log out (y/n)?" { send "y\r" }
+expect eof
+EOF
+}
+
+echo "" > $LOGFILE
+while true; do
+   echo "--------------------------------------------------------------------" >> $LOGFILE
+#   echo "$(date '+%Y-%m-%d %H:%M:%S') Check Start" >> $LOGFILE
+   while IFS=: read -r ip switch port hap; do
+       ping -c 1 -W 2 $ip &> /dev/null
+       if [ $? -ne 0 ]; then
+           echo "$(date '+%Y-%m-%d %H:%M:%S') $ip nicht erreichbar, PoE auf Port $port am Switch $switch wird deaktiviert." >> $LOGFILE
+           disable_poe $switch $port
+           sleep 5
+           enable_poe $switch $port
+           echo "$(date '+%Y-%m-%d %H:%M:%S') PoE auf Port $port für IP $ip am Switch $switch aktiviert." >> $LOGFILE
+       fi
+#       if [ $? -ne 1 ]; then
+#           echo "$(date '+%Y-%m-%d %H:%M:%S') $hap ist erreichbar!" >> $LOGFILE
+#       fi
+   done < "$IP_FILE"
+#   echo "$(date '+%Y-%m-%d %H:%M:%S') Check beendet" >> $LOGFILE
+   sleep 300
+done
-- 
2.49.1


From 55513c7fae87a3bbab95d4372611141e1889b491 Mon Sep 17 00:00:00 2001
From: Master <tim@eertmoed.de>
Date: Tue, 30 Sep 2025 17:34:25 +0200
Subject: [PATCH 005/144] poe_web.service

---
 .gitignore                         |  1 +
 etc/systemd/system/poe_web.service | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 etc/systemd/system/poe_web.service

diff --git a/.gitignore b/.gitignore
index cb3a40e..1a3b01a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ __pycache__/
 !etc/systemd/system/
 !etc/systemd/system/rpi*.service
 !etc/systemd/system/rpi*.timer
+!etc/systemd/system/poe*.service
 !etc/nginx/
 !etc/nginx/sites-enabled/
 !etc/nginx/sites-enabled/default
diff --git a/etc/systemd/system/poe_web.service b/etc/systemd/system/poe_web.service
new file mode 100644
index 0000000..b8a4352
--- /dev/null
+++ b/etc/systemd/system/poe_web.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=PoE Manager Web App
+After=network.target
+
+[Service]
+Type=simple
+User=root
+WorkingDirectory=/srv/poe_manager
+# Nutze die virtuelle Umgebung
+ExecStart=/srv/poe_manager/venv/bin/python3 /srv/poe_manager/app.py
+Restart=always
+RestartSec=5
+
+[Install]
+WantedBy=multi-user.target
+
-- 
2.49.1


From c5f6e1c7083efe563d734f4879a945ec8548449c Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 30 Sep 2025 17:07:27 +0000
Subject: [PATCH 006/144] DB-Out

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 1a3b01a..e99b790 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,4 +44,4 @@ __pycache__/
 !/srv/poe_manager/static/images/*
 
 # Optional: SQLite DB ignorieren (falls du nicht willst, dass Passwörter im Repo landen)
-# /srv/poe_manager/sqlite.db
+/srv/poe_manager/sqlite.db
-- 
2.49.1


From 96a93188f77009927b8f5596618e968886b1ae5b Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 30 Sep 2025 19:10:55 +0200
Subject: [PATCH 007/144] srv/poe_manager/create_db.py aktualisiert

---
 srv/poe_manager/create_db.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srv/poe_manager/create_db.py b/srv/poe_manager/create_db.py
index 2224ccc..3ee92d7 100644
--- a/srv/poe_manager/create_db.py
+++ b/srv/poe_manager/create_db.py
@@ -21,6 +21,7 @@ CREATE TABLE IF NOT EXISTS devices (
     switch_hostname TEXT NOT NULL,
     port TEXT NOT NULL,
     name TEXT NOT NULL,
+    is_active INTEGER DEFAULT 0,
     FOREIGN KEY (switch_hostname) REFERENCES switches(hostname)
 );
 """)
-- 
2.49.1


From c367531860413b380f4e16e3e993907eef031aea Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 5 Oct 2025 08:20:15 +0000
Subject: [PATCH 008/144] DB

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index e99b790..1a3b01a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,4 +44,4 @@ __pycache__/
 !/srv/poe_manager/static/images/*
 
 # Optional: SQLite DB ignorieren (falls du nicht willst, dass Passwörter im Repo landen)
-/srv/poe_manager/sqlite.db
+# /srv/poe_manager/sqlite.db
-- 
2.49.1


From 1e37b9551bf93828d82a7eb5985aba200e53aa79 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Mon, 6 Oct 2025 19:04:39 +0000
Subject: [PATCH 009/144] CSS

---
 srv/poe_manager/static/css/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/static/css/style.css b/srv/poe_manager/static/css/style.css
index 997de8a..b3deae3 100644
--- a/srv/poe_manager/static/css/style.css
+++ b/srv/poe_manager/static/css/style.css
@@ -113,7 +113,7 @@ pre {
 
 /* Spaltenbreiten */
 .custom-table .col-small {
-    width: 100px; /* Hostname, Port */
+    width: 140px; /* Hostname, Port */
 }
 
 .custom-table .col-ip {
-- 
2.49.1


From 862577632aeb9cc2f299bfa9016a5b0ec23e92c0 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Mon, 6 Oct 2025 19:07:04 +0000
Subject: [PATCH 010/144] DB

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 1a3b01a..1644153 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,4 +44,4 @@ __pycache__/
 !/srv/poe_manager/static/images/*
 
 # Optional: SQLite DB ignorieren (falls du nicht willst, dass Passwörter im Repo landen)
-# /srv/poe_manager/sqlite.db
+!/srv/poe_manager/sqlite.db
-- 
2.49.1


From 9be5fdbeb457979720db6dd48a26dd16e7310d4b Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Mon, 6 Oct 2025 21:09:52 +0200
Subject: [PATCH 011/144] srv/poe_manager/static/css/style.css aktualisiert

---
 srv/poe_manager/static/css/style.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srv/poe_manager/static/css/style.css b/srv/poe_manager/static/css/style.css
index b3deae3..41dcdd0 100644
--- a/srv/poe_manager/static/css/style.css
+++ b/srv/poe_manager/static/css/style.css
@@ -150,3 +150,7 @@ label.text-white {
     background: #fff;
 }
 
+.modal-title {
+    color: #fff;
+}
+
-- 
2.49.1


From 7af700119ef90580a37597f3caf74f116983a5ec Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Mon, 6 Oct 2025 21:11:06 +0200
Subject: [PATCH 012/144] srv/poe_manager/static/css/style.css aktualisiert

---
 srv/poe_manager/static/css/style.css | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/srv/poe_manager/static/css/style.css b/srv/poe_manager/static/css/style.css
index 41dcdd0..b298589 100644
--- a/srv/poe_manager/static/css/style.css
+++ b/srv/poe_manager/static/css/style.css
@@ -149,8 +149,3 @@ label.text-white {
     margin: auto 0; 
     background: #fff;
 }
-
-.modal-title {
-    color: #fff;
-}
-
-- 
2.49.1


From 9c895514e4321ad6d5a8c919a0a1813621b5cf5e Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Mon, 6 Oct 2025 21:13:45 +0200
Subject: [PATCH 013/144] srv/poe_manager/static/css/style.css aktualisiert

---
 srv/poe_manager/static/css/style.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srv/poe_manager/static/css/style.css b/srv/poe_manager/static/css/style.css
index b298589..429ecdb 100644
--- a/srv/poe_manager/static/css/style.css
+++ b/srv/poe_manager/static/css/style.css
@@ -149,3 +149,7 @@ label.text-white {
     margin: auto 0; 
     background: #fff;
 }
+
+.popup {
+    color: #fff;
+}
\ No newline at end of file
-- 
2.49.1


From 8b130a072ef9135400b2133ebed471e1be41621d Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Mon, 6 Oct 2025 21:14:45 +0200
Subject: [PATCH 014/144] srv/poe_manager/templates/users.html aktualisiert

---
 srv/poe_manager/templates/users.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srv/poe_manager/templates/users.html b/srv/poe_manager/templates/users.html
index a5f66eb..7d33085 100644
--- a/srv/poe_manager/templates/users.html
+++ b/srv/poe_manager/templates/users.html
@@ -56,7 +56,7 @@
     <div class="modal-content">
       <form method="post" id="userForm">
         <div class="modal-header">
-          <h5 class="modal-title">Neuen Benutzer anlegen</h5>
+          <h5 class="modal-title popup">Neuen Benutzer anlegen</h5>
           <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
         </div>
         <div class="modal-body">
@@ -91,7 +91,7 @@
     <div class="modal-content">
       <form method="post" id="roleForm">
         <div class="modal-header">
-          <h5 class="modal-title">Rolle ändern</h5>
+          <h5 class="modal-title popup">Rolle ändern</h5>
           <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
         </div>
         <div class="modal-body">
@@ -123,7 +123,7 @@
     <div class="modal-content">
       <form method="post" id="passwordForm">
         <div class="modal-header">
-          <h5 class="modal-title">Passwort ändern</h5>
+          <h5 class="modal-title popup">Passwort ändern</h5>
           <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
         </div>
         <div class="modal-body">
-- 
2.49.1


From ffcde260c41cbb9eed54321b359a41887283610e Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Mon, 6 Oct 2025 21:16:46 +0200
Subject: [PATCH 015/144] srv/poe_manager/static/css/style.css aktualisiert

---
 srv/poe_manager/static/css/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/static/css/style.css b/srv/poe_manager/static/css/style.css
index 429ecdb..e6bfcb2 100644
--- a/srv/poe_manager/static/css/style.css
+++ b/srv/poe_manager/static/css/style.css
@@ -151,5 +151,5 @@ label.text-white {
 }
 
 .popup {
-    color: #fff;
+    color: #000000;
 }
\ No newline at end of file
-- 
2.49.1


From be43c85961bae83ccbf17b4b47e12b937f50f1af Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Mon, 6 Oct 2025 21:38:23 +0200
Subject: [PATCH 016/144] srv/poe_manager/static/css/style.css aktualisiert

---
 srv/poe_manager/static/css/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/static/css/style.css b/srv/poe_manager/static/css/style.css
index e6bfcb2..4d28785 100644
--- a/srv/poe_manager/static/css/style.css
+++ b/srv/poe_manager/static/css/style.css
@@ -150,6 +150,6 @@ label.text-white {
     background: #fff;
 }
 
-.popup {
+.white {
     color: #000000;
 }
\ No newline at end of file
-- 
2.49.1


From bcd2c30c70faf10ae57a868c568fe4b7520eef66 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Mon, 6 Oct 2025 21:38:47 +0200
Subject: [PATCH 017/144] srv/poe_manager/static/css/style.css aktualisiert

---
 srv/poe_manager/static/css/style.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srv/poe_manager/static/css/style.css b/srv/poe_manager/static/css/style.css
index 4d28785..b9f0dba 100644
--- a/srv/poe_manager/static/css/style.css
+++ b/srv/poe_manager/static/css/style.css
@@ -150,6 +150,10 @@ label.text-white {
     background: #fff;
 }
 
-.white {
+.black {
     color: #000000;
+}
+
+.white {
+    color: #ffffff;
 }
\ No newline at end of file
-- 
2.49.1


From 99395089f91d2877ac88b049762ff0322f6d49d4 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Mon, 6 Oct 2025 21:39:35 +0200
Subject: [PATCH 018/144] srv/poe_manager/templates/users.html aktualisiert

---
 srv/poe_manager/templates/users.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srv/poe_manager/templates/users.html b/srv/poe_manager/templates/users.html
index 7d33085..d0b81e7 100644
--- a/srv/poe_manager/templates/users.html
+++ b/srv/poe_manager/templates/users.html
@@ -56,7 +56,7 @@
     <div class="modal-content">
       <form method="post" id="userForm">
         <div class="modal-header">
-          <h5 class="modal-title popup">Neuen Benutzer anlegen</h5>
+          <h5 class="modal-title black">Neuen Benutzer anlegen</h5>
           <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
         </div>
         <div class="modal-body">
@@ -91,7 +91,7 @@
     <div class="modal-content">
       <form method="post" id="roleForm">
         <div class="modal-header">
-          <h5 class="modal-title popup">Rolle ändern</h5>
+          <h5 class="modal-title black">Rolle ändern</h5>
           <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
         </div>
         <div class="modal-body">
@@ -123,7 +123,7 @@
     <div class="modal-content">
       <form method="post" id="passwordForm">
         <div class="modal-header">
-          <h5 class="modal-title popup">Passwort ändern</h5>
+          <h5 class="modal-title black">Passwort ändern</h5>
           <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
         </div>
         <div class="modal-body">
-- 
2.49.1


From 1fcdd27f6ab2f904ebd1639928037dbc21e1ffda Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Mon, 6 Oct 2025 21:39:57 +0200
Subject: [PATCH 019/144] srv/poe_manager/templates/settings.html aktualisiert

---
 srv/poe_manager/templates/settings.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/settings.html b/srv/poe_manager/templates/settings.html
index 5e80300..dd25ed6 100644
--- a/srv/poe_manager/templates/settings.html
+++ b/srv/poe_manager/templates/settings.html
@@ -5,7 +5,7 @@
 
 <form method="post" class="row g-2">
     <div class="col-auto">
-        <label for="interval" class="form-label">Prüfintervall (Minuten):</label>
+        <label for="interval" class="form-label white">Prüfintervall (Minuten):</label>
         <input type="number" name="interval" id="interval" class="form-control" value="{{ interval }}" min="1" required>
     </div>
     <div class="col-auto align-self-end">
-- 
2.49.1


From 183725b03f17135021a0db277c60fd01fd6b7a77 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Mon, 6 Oct 2025 21:42:52 +0200
Subject: [PATCH 020/144] .gitignore aktualisiert

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 1644153..1a3b01a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,4 +44,4 @@ __pycache__/
 !/srv/poe_manager/static/images/*
 
 # Optional: SQLite DB ignorieren (falls du nicht willst, dass Passwörter im Repo landen)
-!/srv/poe_manager/sqlite.db
+# /srv/poe_manager/sqlite.db
-- 
2.49.1


From d248087326c4c9639c32ce18216a608b2e96fc82 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Mon, 6 Oct 2025 22:02:55 +0200
Subject: [PATCH 021/144] srv/poe_manager/static/css/style.css aktualisiert

---
 srv/poe_manager/static/css/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/static/css/style.css b/srv/poe_manager/static/css/style.css
index b9f0dba..0c3020a 100644
--- a/srv/poe_manager/static/css/style.css
+++ b/srv/poe_manager/static/css/style.css
@@ -4,7 +4,7 @@ body {
 }
 
 h1, h2, h3, h4, h5, h6 {
-    color: #fff;
+    color: #ff7100;
 }
 
 .table-dark {
-- 
2.49.1


From 022050400e8f693bc93fe76c423393426ccf0445 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Mon, 6 Oct 2025 22:09:54 +0200
Subject: [PATCH 022/144] srv/poe_manager/static/css/style.css aktualisiert

---
 srv/poe_manager/static/css/style.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srv/poe_manager/static/css/style.css b/srv/poe_manager/static/css/style.css
index 0c3020a..cddbe95 100644
--- a/srv/poe_manager/static/css/style.css
+++ b/srv/poe_manager/static/css/style.css
@@ -156,4 +156,8 @@ label.text-white {
 
 .white {
     color: #ffffff;
+}
+
+button.login {
+    background-color: #ff7100;
 }
\ No newline at end of file
-- 
2.49.1


From ecad3cda88506e3f5045095e02da626c79978c78 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Mon, 6 Oct 2025 22:10:25 +0200
Subject: [PATCH 023/144] srv/poe_manager/templates/login.html aktualisiert

---
 srv/poe_manager/templates/login.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/login.html b/srv/poe_manager/templates/login.html
index 427c7ff..fdf104d 100644
--- a/srv/poe_manager/templates/login.html
+++ b/srv/poe_manager/templates/login.html
@@ -26,7 +26,7 @@
         <label class="form-label label text-white">Password</label>
         <input type="password" name="password" class="form-control" required>
     </div>
-    <button class="btn btn-primary">Login</button>
+    <button class="btn btn-primary button login">Login</button>
 </form>
 
 </body>
-- 
2.49.1


From 9af5740ed3bef6632f93d2b371eb9081241e43e9 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Mon, 6 Oct 2025 22:18:53 +0200
Subject: [PATCH 024/144] srv/poe_manager/static/css/style.css aktualisiert

---
 srv/poe_manager/static/css/style.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srv/poe_manager/static/css/style.css b/srv/poe_manager/static/css/style.css
index cddbe95..0ea0b3c 100644
--- a/srv/poe_manager/static/css/style.css
+++ b/srv/poe_manager/static/css/style.css
@@ -160,4 +160,5 @@ label.text-white {
 
 button.login {
     background-color: #ff7100;
+    border-color: #ff7300a9;;
 }
\ No newline at end of file
-- 
2.49.1


From c3186813d4f28f910cd68402ff21097f30b43d07 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 07:48:10 +0200
Subject: [PATCH 025/144] srv/poe_manager/templates/devices.html aktualisiert

---
 srv/poe_manager/templates/devices.html | 215 ++++++++++++++++++-------
 1 file changed, 159 insertions(+), 56 deletions(-)

diff --git a/srv/poe_manager/templates/devices.html b/srv/poe_manager/templates/devices.html
index 0ae9e49..4b87b84 100644
--- a/srv/poe_manager/templates/devices.html
+++ b/srv/poe_manager/templates/devices.html
@@ -4,37 +4,18 @@
 <h2>Devices</h2>
 
 {% if current_user.is_admin %}
-<h4>Neues Gerät hinzufügen</h4>
-<form method="post" class="row g-2 mb-4">
-    <input type="hidden" name="add_device" value="1">
-    <div class="col col-small"><input type="text" name="name" placeholder="Hostname" class="form-control" required></div>
-    <div class="col col-ip"><input type="text" name="rpi_ip" placeholder="IP-Adresse" class="form-control" required></div>
-    <div class="col col-mac"><input type="text" name="mac" placeholder="MAC-Adresse" class="form-control" required></div>
-    <div class="col col-small"><input type="text" name="port" placeholder="Port" class="form-control" required></div>
-    <div class="col">
-        <select name="switch_hostname" class="form-control" required>
-            <option value="">Switch wählen</option>
-            {% for sw in switches %}
-                <option value="{{ sw['hostname'] }}">{{ sw['hostname'] }}</option>
-            {% endfor %}
-        </select>
-    </div>
-    <div class="col d-flex align-items-center">
-        <input type="checkbox" name="is_active" value="0" unchecked id="new_is_active">
-        <label for="new_is_active" class="ms-2 mb-0 text-white">Aktiv</label>
-    </div>
-    <div class="col"><button class="btn btn-success w-100">Hinzufügen</button></div>
-</form>
+<!-- Neues Gerät hinzufügen -->
+<button class="btn btn-success mb-3" data-bs-toggle="modal" data-bs-target="#deviceModal" onclick="openDeviceModal()">Neues Gerät</button>
 {% endif %}
 
-<table class="table table-bordered custom-table">
+<table class="table table-bordered">
     <thead>
         <tr>
-            <th class="col-small">Hostname</th>
-            <th class="col-ip">IP-Adresse</th>
-            <th class="col-mac">MAC-Adresse</th>
+            <th>Hostname</th>
+            <th>IP-Adresse</th>
+            <th>MAC-Adresse</th>
+            <th>Port</th>
             <th>Switch</th>
-            <th class="col-small">Port</th>
             <th>Aktiv</th>
             {% if current_user.is_admin %}<th>Aktionen</th>{% endif %}
         </tr>
@@ -42,39 +23,41 @@
     <tbody>
         {% for d in devices %}
         <tr>
-            <td class="col-small"><input name="name" value="{{ d['name'] }}" class="form-control" required disabled></td>
-            <td class="col-ip"><input name="rpi_ip" value="{{ d['rpi_ip'] }}" class="form-control" required disabled></td>
-            <td class="col-mac"><input name="mac" value="{{ d['mac'] }}" class="form-control" required disabled></td>
+            <td>{{ d['name'] }}</td>
+            <td>{{ d['rpi_ip'] }}</td>
+            <td>{{ d['mac'] }}</td>
+            <td>{{ d['port'] }}</td>
+            <td>{{ d['switch_hostname'] or '-' }}</td>
             <td>
-                <select name="switch_hostname" class="form-control" disabled required>
-                    {% for sw in switches %}
-                        <option value="{{ sw['hostname'] }}" {% if sw['hostname']==d['switch_hostname'] %}selected{% endif %}>
-                            {{ sw['hostname'] }}
-                        </option>
-                    {% endfor %}
-                </select>
-            </td>
-            <td class="col-small"><input name="port" value="{{ d['port'] }}" class="form-control" required disabled></td>
-            <td class="custom-checkbox">
-                <input type="checkbox" name="is_active" value="1" {% if d['is_active'] %}checked{% endif %} disabled class="checkbox-visible">
-            </td>
-            {% if current_user.is_admin %}
-            <td class="custom-actions">
-                <!-- Bearbeiten Button -->
-                <button type="button" class="btn btn-warning btn-sm" onclick="enableEdit(this)">Bearbeiten</button>
-
-                <!-- Speichern Button -->
                 <form method="post" style="display:inline;">
                     <input type="hidden" name="edit_device" value="1">
                     <input type="hidden" name="old_mac" value="{{ d['mac'] }}">
-                    <button class="btn btn-primary btn-sm d-none" type="submit">Speichern</button>
+                    <input type="hidden" name="is_active" value="{{ 1 if not d['is_active'] else 0 }}">
+                    <button class="btn btn-sm {% if d['is_active'] %}btn-success{% else %}btn-secondary{% endif %}" type="submit">
+                        {% if d['is_active'] %}Aktiv{% else %}Inaktiv{% endif %}
+                    </button>
                 </form>
+            </td>
+            {% if current_user.is_admin %}
+            <td>
+                <!-- Bearbeiten Modal -->
+                <button class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#editDeviceModal"
+                        onclick="openEditDeviceModal('{{ d['mac'] }}','{{ d['name'] }}','{{ d['rpi_ip'] }}','{{ d['port'] }}')">
+                    Bearbeiten
+                </button>
 
-                <!-- Löschen Button in eigenem Formular -->
+                <!-- Switch ändern Modal -->
+                <button class="btn btn-info btn-sm" data-bs-toggle="modal" data-bs-target="#switchModal"
+                        onclick="openSwitchModal('{{ d['mac'] }}','{{ d['switch_hostname'] }}')">
+                    Switch ändern
+                </button>
+
+                <!-- Löschen -->
                 <form method="post" style="display:inline;">
                     <input type="hidden" name="delete_device" value="{{ d['mac'] }}">
-                    <button class="btn btn-danger btn-sm"
-                        onclick="return confirm('Willst du das Gerät wirklich löschen?');">Löschen</button>
+                    <button class="btn btn-danger btn-sm" onclick="return confirm('Willst du das Gerät wirklich löschen?');">
+                        Löschen
+                    </button>
                 </form>
             </td>
             {% endif %}
@@ -83,12 +66,132 @@
     </tbody>
 </table>
 
+<!-- Modal: Neues Gerät -->
+<div class="modal fade" id="deviceModal" tabindex="-1" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <form method="post">
+        <div class="modal-header">
+          <h5 class="modal-title black">Neues Gerät hinzufügen</h5>
+          <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+        </div>
+        <div class="modal-body">
+            <input type="hidden" name="add_device" value="1">
+            <div class="mb-3">
+                <label>Hostname</label>
+                <input type="text" name="name" class="form-control" required>
+            </div>
+            <div class="mb-3">
+                <label>IP-Adresse</label>
+                <input type="text" name="rpi_ip" class="form-control" required>
+            </div>
+            <div class="mb-3">
+                <label>MAC-Adresse</label>
+                <input type="text" name="mac" class="form-control" required>
+            </div>
+            <div class="mb-3">
+                <label>Port</label>
+                <input type="text" name="port" class="form-control" required>
+            </div>
+            <div class="mb-3">
+                <label>Switch</label>
+                <select name="switch_hostname" class="form-control" required>
+                    {% for sw in switches %}
+                        <option value="{{ sw['hostname'] }}">{{ sw['hostname'] }}</option>
+                    {% endfor %}
+                </select>
+            </div>
+        </div>
+        <div class="modal-footer">
+          <button class="btn btn-success" type="submit">Hinzufügen</button>
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
+
+<!-- Modal: Bearbeiten -->
+<div class="modal fade" id="editDeviceModal" tabindex="-1" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <form method="post">
+        <input type="hidden" name="edit_device" value="1">
+        <input type="hidden" name="old_mac" id="edit_old_mac">
+        <div class="modal-header">
+          <h5 class="modal-title black">Gerät bearbeiten</h5>
+          <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+        </div>
+        <div class="modal-body">
+            <div class="mb-3">
+                <label>Hostname</label>
+                <input type="text" name="name" id="edit_name" class="form-control" required>
+            </div>
+            <div class="mb-3">
+                <label>IP-Adresse</label>
+                <input type="text" name="rpi_ip" id="edit_ip" class="form-control" required>
+            </div>
+            <div class="mb-3">
+                <label>MAC-Adresse</label>
+                <input type="text" name="mac" id="edit_mac" class="form-control" required>
+            </div>
+            <div class="mb-3">
+                <label>Port</label>
+                <input type="text" name="port" id="edit_port" class="form-control" required>
+            </div>
+        </div>
+        <div class="modal-footer">
+          <button class="btn btn-primary" type="submit">Speichern</button>
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
+
+<!-- Modal: Switch ändern -->
+<div class="modal fade" id="switchModal" tabindex="-1" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <form method="post">
+        <input type="hidden" name="edit_device" value="1">
+        <input type="hidden" name="old_mac" id="switch_mac">
+        <div class="modal-header">
+          <h5 class="modal-title black">Switch ändern</h5>
+          <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+        </div>
+        <div class="modal-body">
+            <select name="switch_hostname" id="switch_select" class="form-control" required>
+                {% for sw in switches %}
+                    <option value="{{ sw['hostname'] }}">{{ sw['hostname'] }}</option>
+                {% endfor %}
+            </select>
+        </div>
+        <div class="modal-footer">
+          <button class="btn btn-primary" type="submit">Speichern</button>
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
+
 <script>
-function enableEdit(btn) {
-    const row = btn.closest('tr');
-    row.querySelectorAll('input, select').forEach(el => el.disabled = false); // Inputs aktivieren
-    btn.classList.add('d-none'); // Bearbeiten ausblenden
-    row.querySelector('button.btn-primary').classList.remove('d-none'); // Speichern sichtbar
+function openDeviceModal() {
+    document.querySelector("#deviceModal form").reset();
+}
+
+function openEditDeviceModal(mac, name, ip, port) {
+    document.getElementById("edit_old_mac").value = mac;
+    document.getElementById("edit_name").value = name;
+    document.getElementById("edit_ip").value = ip;
+    document.getElementById("edit_mac").value = mac;
+    document.getElementById("edit_port").value = port;
+}
+
+function openSwitchModal(mac, switch_hostname) {
+    document.getElementById("switch_mac").value = mac;
+    document.getElementById("switch_select").value = switch_hostname;
 }
 </script>
 
-- 
2.49.1


From b526f9d0a07f66b09f2afecadf11781227e1b351 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 07:50:07 +0200
Subject: [PATCH 026/144] srv/poe_manager/templates/devices.html aktualisiert

---
 srv/poe_manager/templates/devices.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srv/poe_manager/templates/devices.html b/srv/poe_manager/templates/devices.html
index 4b87b84..c60af95 100644
--- a/srv/poe_manager/templates/devices.html
+++ b/srv/poe_manager/templates/devices.html
@@ -103,7 +103,7 @@
             </div>
         </div>
         <div class="modal-footer">
-          <button class="btn btn-success" type="submit">Hinzufügen</button>
+          <button class="btn btn-success button login" type="submit">Hinzufügen</button>
           <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
         </div>
       </form>
@@ -141,7 +141,7 @@
             </div>
         </div>
         <div class="modal-footer">
-          <button class="btn btn-primary" type="submit">Speichern</button>
+          <button class="btn btn-primary button login" type="submit">Speichern</button>
           <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
         </div>
       </form>
@@ -168,7 +168,7 @@
             </select>
         </div>
         <div class="modal-footer">
-          <button class="btn btn-primary" type="submit">Speichern</button>
+          <button class="btn btn-primarybutton login" type="submit">Speichern</button>
           <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
         </div>
       </form>
-- 
2.49.1


From a24b09e18d4268370523069aad5c36c40f62c35b Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 07:53:09 +0200
Subject: [PATCH 027/144] srv/poe_manager/templates/devices.html aktualisiert

---
 srv/poe_manager/templates/devices.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srv/poe_manager/templates/devices.html b/srv/poe_manager/templates/devices.html
index c60af95..bc474d1 100644
--- a/srv/poe_manager/templates/devices.html
+++ b/srv/poe_manager/templates/devices.html
@@ -95,7 +95,7 @@
             </div>
             <div class="mb-3">
                 <label>Switch</label>
-                <select name="switch_hostname" class="form-control" required>
+                <select name="switch_hostname" class="form-select" required>
                     {% for sw in switches %}
                         <option value="{{ sw['hostname'] }}">{{ sw['hostname'] }}</option>
                     {% endfor %}
@@ -161,7 +161,7 @@
           <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
         </div>
         <div class="modal-body">
-            <select name="switch_hostname" id="switch_select" class="form-control" required>
+            <select name="switch_hostname" id="switch_select" class="form-select" required>
                 {% for sw in switches %}
                     <option value="{{ sw['hostname'] }}">{{ sw['hostname'] }}</option>
                 {% endfor %}
-- 
2.49.1


From 02122f966acc47ed02a079d19e943d9371f14d81 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 07:57:15 +0200
Subject: [PATCH 028/144] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 8b4b179..611746a 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -148,7 +148,7 @@ def devices():
 
     if request.method == 'POST':
         # -----------------------
-        # Inline-Add
+        # Gerät hinzufügen
         # -----------------------
         if 'add_device' in request.form:
             if not current_user.is_admin:
@@ -166,6 +166,18 @@ def devices():
                 flash("Alle Felder müssen ausgefüllt sein!")
                 return redirect(url_for('devices'))
 
+            # Prüfen auf doppelte MAC
+            mac_device = conn.execute("SELECT name FROM devices WHERE mac=?", (mac,)).fetchone()
+            if mac_device:
+                flash(f"MAC-Adresse existiert bereits für Gerät '{mac_device['name']}'!")
+                return redirect(url_for('devices'))
+
+            # Prüfen auf doppelte IP
+            ip_device = conn.execute("SELECT name FROM devices WHERE rpi_ip=?", (rpi_ip,)).fetchone()
+            if ip_device:
+                flash(f"IP-Adresse existiert bereits für Gerät '{ip_device['name']}'!")
+                return redirect(url_for('devices'))
+
             try:
                 conn.execute("""
                     INSERT INTO devices (mac, rpi_ip, port, name, switch_hostname, is_active)
@@ -174,10 +186,10 @@ def devices():
                 conn.commit()
                 flash(f"Gerät {name} hinzugefügt.")
             except sqlite3.IntegrityError:
-                flash("MAC existiert bereits oder Eingabefehler!")
+                flash("Fehler beim Hinzufügen des Geräts!")
 
         # -----------------------
-        # Inline-Edit
+        # Gerät bearbeiten
         # -----------------------
         elif 'edit_device' in request.form:
             if not current_user.is_admin:
@@ -196,6 +208,18 @@ def devices():
                 flash("Alle Felder müssen ausgefüllt sein!")
                 return redirect(url_for('devices'))
 
+            # Prüfen auf doppelte MAC außer das aktuelle Gerät
+            mac_device = conn.execute("SELECT name FROM devices WHERE mac=? AND mac<>?", (mac, old_mac)).fetchone()
+            if mac_device:
+                flash(f"MAC-Adresse existiert bereits für Gerät '{mac_device['name']}'!")
+                return redirect(url_for('devices'))
+
+            # Prüfen auf doppelte IP außer das aktuelle Gerät
+            ip_device = conn.execute("SELECT name FROM devices WHERE rpi_ip=? AND mac<>?", (rpi_ip, old_mac)).fetchone()
+            if ip_device:
+                flash(f"IP-Adresse existiert bereits für Gerät '{ip_device['name']}'!")
+                return redirect(url_for('devices'))
+
             try:
                 conn.execute("""
                     UPDATE devices
@@ -205,10 +229,10 @@ def devices():
                 conn.commit()
                 flash(f"Gerät {name} aktualisiert.")
             except sqlite3.IntegrityError:
-                flash("MAC existiert bereits oder Eingabefehler!")
+                flash("Fehler beim Aktualisieren des Geräts!")
 
         # -----------------------
-        # Inline-Delete
+        # Gerät löschen
         # -----------------------
         elif 'delete_device' in request.form:
             if not current_user.is_admin:
-- 
2.49.1


From c9449dc7562cb7b1a2458f02b36c8a09833558af Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 17:24:28 +0200
Subject: [PATCH 029/144] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 611746a..8d5a61f 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -166,18 +166,18 @@ def devices():
                 flash("Alle Felder müssen ausgefüllt sein!")
                 return redirect(url_for('devices'))
 
-            # Prüfen auf doppelte MAC
-            mac_device = conn.execute("SELECT name FROM devices WHERE mac=?", (mac,)).fetchone()
-            if mac_device:
-                flash(f"MAC-Adresse existiert bereits für Gerät '{mac_device['name']}'!")
-                return redirect(url_for('devices'))
-
             # Prüfen auf doppelte IP
             ip_device = conn.execute("SELECT name FROM devices WHERE rpi_ip=?", (rpi_ip,)).fetchone()
             if ip_device:
                 flash(f"IP-Adresse existiert bereits für Gerät '{ip_device['name']}'!")
                 return redirect(url_for('devices'))
 
+            # Prüfen auf doppelte MAC
+            mac_device = conn.execute("SELECT name FROM devices WHERE mac=?", (mac,)).fetchone()
+            if mac_device:
+                flash(f"MAC-Adresse existiert bereits für Gerät '{mac_device['name']}'!")
+                return redirect(url_for('devices'))
+
             try:
                 conn.execute("""
                     INSERT INTO devices (mac, rpi_ip, port, name, switch_hostname, is_active)
@@ -208,18 +208,18 @@ def devices():
                 flash("Alle Felder müssen ausgefüllt sein!")
                 return redirect(url_for('devices'))
 
-            # Prüfen auf doppelte MAC außer das aktuelle Gerät
-            mac_device = conn.execute("SELECT name FROM devices WHERE mac=? AND mac<>?", (mac, old_mac)).fetchone()
-            if mac_device:
-                flash(f"MAC-Adresse existiert bereits für Gerät '{mac_device['name']}'!")
-                return redirect(url_for('devices'))
-
             # Prüfen auf doppelte IP außer das aktuelle Gerät
             ip_device = conn.execute("SELECT name FROM devices WHERE rpi_ip=? AND mac<>?", (rpi_ip, old_mac)).fetchone()
             if ip_device:
                 flash(f"IP-Adresse existiert bereits für Gerät '{ip_device['name']}'!")
                 return redirect(url_for('devices'))
 
+            # Prüfen auf doppelte MAC außer das aktuelle Gerät
+            mac_device = conn.execute("SELECT name FROM devices WHERE mac=? AND mac<>?", (mac, old_mac)).fetchone()
+            if mac_device:
+                flash(f"MAC-Adresse existiert bereits für Gerät '{mac_device['name']}'!")
+                return redirect(url_for('devices'))
+
             try:
                 conn.execute("""
                     UPDATE devices
-- 
2.49.1


From e9cfbe467882994b3bf65df138234563762626ed Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 17:25:51 +0200
Subject: [PATCH 030/144] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 8d5a61f..4fb13b7 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -231,6 +231,22 @@ def devices():
             except sqlite3.IntegrityError:
                 flash("Fehler beim Aktualisieren des Geräts!")
 
+        # -----------------------
+        # Gerät aktivieren/deaktivieren
+        # -----------------------
+        elif 'toggle_device' in request.form:
+            mac = request.form.get('toggle_device')
+            device = conn.execute("SELECT is_active, name FROM devices WHERE mac=?", (mac,)).fetchone()
+            if device:
+                new_status = 0 if device['is_active'] else 1
+                conn.execute("UPDATE devices SET is_active=? WHERE mac=?", (new_status, mac))
+                conn.commit()
+                status_text = "deaktiviert" if new_status == 0 else "aktiviert"
+                flash(f"Gerät '{device['name']}' wurde {status_text}.")
+            else:
+                flash("Gerät nicht gefunden!")
+            return redirect(url_for('devices'))
+
         # -----------------------
         # Gerät löschen
         # -----------------------
-- 
2.49.1


From 83b4b5a32cc17f1ef161650fa28b2b9e74b82e4c Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 17:30:24 +0200
Subject: [PATCH 031/144] srv/poe_manager/templates/devices.html aktualisiert

---
 srv/poe_manager/templates/devices.html | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/srv/poe_manager/templates/devices.html b/srv/poe_manager/templates/devices.html
index bc474d1..25c94a3 100644
--- a/srv/poe_manager/templates/devices.html
+++ b/srv/poe_manager/templates/devices.html
@@ -29,10 +29,7 @@
             <td>{{ d['port'] }}</td>
             <td>{{ d['switch_hostname'] or '-' }}</td>
             <td>
-                <form method="post" style="display:inline;">
-                    <input type="hidden" name="edit_device" value="1">
-                    <input type="hidden" name="old_mac" value="{{ d['mac'] }}">
-                    <input type="hidden" name="is_active" value="{{ 1 if not d['is_active'] else 0 }}">
+                <form method="post" action="{{ url_for('toggle_device', mac=d['mac']) }}" style="display:inline;">
                     <button class="btn btn-sm {% if d['is_active'] %}btn-success{% else %}btn-secondary{% endif %}" type="submit">
                         {% if d['is_active'] %}Aktiv{% else %}Inaktiv{% endif %}
                     </button>
-- 
2.49.1


From ffd2a03e6d879de66e3f8f31d8c06fa3d0b69a7a Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 17:30:51 +0200
Subject: [PATCH 032/144] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 4fb13b7..cf76918 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -281,6 +281,31 @@ def devices():
     conn.close()
     return render_template('devices.html', devices=devices, switches=switches)
 
+@app.route('/devices/toggle/<mac>', methods=['POST'])
+@login_required
+def toggle_device(mac):
+    if not current_user.is_admin:
+        flash("Zugriff verweigert!")
+        return redirect(url_for('devices'))
+
+    conn = get_db_connection()
+    device = conn.execute("SELECT is_active, name FROM devices WHERE mac=?", (mac,)).fetchone()
+
+    if not device:
+        flash("Gerät nicht gefunden!")
+        conn.close()
+        return redirect(url_for('devices'))
+
+    new_status = 0 if device['is_active'] else 1
+    conn.execute("UPDATE devices SET is_active=? WHERE mac=?", (new_status, mac))
+    conn.commit()
+    conn.close()
+
+    status_text = "deaktiviert" if new_status == 0 else "aktiviert"
+    flash(f"Gerät '{device['name']}' wurde {status_text}.")
+    return redirect(url_for('devices'))
+
+
 @app.route('/switches', methods=['GET', 'POST'])
 @login_required
 def switches():
-- 
2.49.1


From ecbba0807438f81b3e35f531d2216b8a29e48402 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 17:32:18 +0200
Subject: [PATCH 033/144] srv/poe_manager/templates/devices.html aktualisiert

---
 srv/poe_manager/templates/devices.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srv/poe_manager/templates/devices.html b/srv/poe_manager/templates/devices.html
index 25c94a3..dd48090 100644
--- a/srv/poe_manager/templates/devices.html
+++ b/srv/poe_manager/templates/devices.html
@@ -16,7 +16,7 @@
             <th>MAC-Adresse</th>
             <th>Port</th>
             <th>Switch</th>
-            <th>Aktiv</th>
+            <th>Status</th>
             {% if current_user.is_admin %}<th>Aktionen</th>{% endif %}
         </tr>
     </thead>
@@ -31,7 +31,7 @@
             <td>
                 <form method="post" action="{{ url_for('toggle_device', mac=d['mac']) }}" style="display:inline;">
                     <button class="btn btn-sm {% if d['is_active'] %}btn-success{% else %}btn-secondary{% endif %}" type="submit">
-                        {% if d['is_active'] %}Aktiv{% else %}Inaktiv{% endif %}
+                        {% if d['is_active'] %}Deaktivieren{% else %}Aktivieren{% endif %}
                     </button>
                 </form>
             </td>
-- 
2.49.1


From 202d13e5521254c220902b36653b97a6ca938526 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 17:33:06 +0200
Subject: [PATCH 034/144] srv/poe_manager/templates/devices.html aktualisiert

---
 srv/poe_manager/templates/devices.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/devices.html b/srv/poe_manager/templates/devices.html
index dd48090..724635f 100644
--- a/srv/poe_manager/templates/devices.html
+++ b/srv/poe_manager/templates/devices.html
@@ -44,7 +44,7 @@
                 </button>
 
                 <!-- Switch ändern Modal -->
-                <button class="btn btn-info btn-sm" data-bs-toggle="modal" data-bs-target="#switchModal"
+                <button class="btn btn-info btn-sm button login" data-bs-toggle="modal" data-bs-target="#switchModal"
                         onclick="openSwitchModal('{{ d['mac'] }}','{{ d['switch_hostname'] }}')">
                     Switch ändern
                 </button>
-- 
2.49.1


From dd4f4106a58bff914d49d717b3e89eee1e3a6f83 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 17:34:04 +0200
Subject: [PATCH 035/144] srv/poe_manager/templates/devices.html aktualisiert

---
 srv/poe_manager/templates/devices.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/devices.html b/srv/poe_manager/templates/devices.html
index 724635f..8d5766e 100644
--- a/srv/poe_manager/templates/devices.html
+++ b/srv/poe_manager/templates/devices.html
@@ -44,7 +44,7 @@
                 </button>
 
                 <!-- Switch ändern Modal -->
-                <button class="btn btn-info btn-sm button login" data-bs-toggle="modal" data-bs-target="#switchModal"
+                <button class="btn btn-info btn-sm button login white" data-bs-toggle="modal" data-bs-target="#switchModal"
                         onclick="openSwitchModal('{{ d['mac'] }}','{{ d['switch_hostname'] }}')">
                     Switch ändern
                 </button>
-- 
2.49.1


From 43a77700dbdfdca342c2335b8c983f11bbe2781d Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 17:35:46 +0200
Subject: [PATCH 036/144] srv/poe_manager/templates/devices.html aktualisiert

---
 srv/poe_manager/templates/devices.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srv/poe_manager/templates/devices.html b/srv/poe_manager/templates/devices.html
index 8d5766e..66f53aa 100644
--- a/srv/poe_manager/templates/devices.html
+++ b/srv/poe_manager/templates/devices.html
@@ -38,13 +38,13 @@
             {% if current_user.is_admin %}
             <td>
                 <!-- Bearbeiten Modal -->
-                <button class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#editDeviceModal"
+                <button class="btn btn-secondary btn-sm white" data-bs-toggle="modal" data-bs-target="#editDeviceModal"
                         onclick="openEditDeviceModal('{{ d['mac'] }}','{{ d['name'] }}','{{ d['rpi_ip'] }}','{{ d['port'] }}')">
                     Bearbeiten
                 </button>
 
                 <!-- Switch ändern Modal -->
-                <button class="btn btn-info btn-sm button login white" data-bs-toggle="modal" data-bs-target="#switchModal"
+                <button class="btn btn-secondary btn-sm white" data-bs-toggle="modal" data-bs-target="#switchModal"
                         onclick="openSwitchModal('{{ d['mac'] }}','{{ d['switch_hostname'] }}')">
                     Switch ändern
                 </button>
-- 
2.49.1


From a5ec09297f34110ab5bdac682ed30a400351e074 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 17:36:38 +0200
Subject: [PATCH 037/144] srv/poe_manager/templates/devices.html aktualisiert

---
 srv/poe_manager/templates/devices.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srv/poe_manager/templates/devices.html b/srv/poe_manager/templates/devices.html
index 66f53aa..14cd2ab 100644
--- a/srv/poe_manager/templates/devices.html
+++ b/srv/poe_manager/templates/devices.html
@@ -38,13 +38,13 @@
             {% if current_user.is_admin %}
             <td>
                 <!-- Bearbeiten Modal -->
-                <button class="btn btn-secondary btn-sm white" data-bs-toggle="modal" data-bs-target="#editDeviceModal"
+                <button class="btn btn-secondary btn-sm button login white" data-bs-toggle="modal" data-bs-target="#editDeviceModal"
                         onclick="openEditDeviceModal('{{ d['mac'] }}','{{ d['name'] }}','{{ d['rpi_ip'] }}','{{ d['port'] }}')">
                     Bearbeiten
                 </button>
 
                 <!-- Switch ändern Modal -->
-                <button class="btn btn-secondary btn-sm white" data-bs-toggle="modal" data-bs-target="#switchModal"
+                <button class="btn btn-secondary btn-sm button login white" data-bs-toggle="modal" data-bs-target="#switchModal"
                         onclick="openSwitchModal('{{ d['mac'] }}','{{ d['switch_hostname'] }}')">
                     Switch ändern
                 </button>
-- 
2.49.1


From 119dbccf5d66273475bdea8834f3963fe54088e8 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 17:38:20 +0200
Subject: [PATCH 038/144] srv/poe_manager/static/css/style.css aktualisiert

---
 srv/poe_manager/static/css/style.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srv/poe_manager/static/css/style.css b/srv/poe_manager/static/css/style.css
index 0ea0b3c..404ab61 100644
--- a/srv/poe_manager/static/css/style.css
+++ b/srv/poe_manager/static/css/style.css
@@ -4,7 +4,7 @@ body {
 }
 
 h1, h2, h3, h4, h5, h6 {
-    color: #ff7100;
+    color: #fff;
 }
 
 .table-dark {
@@ -17,7 +17,7 @@ h1, h2, h3, h4, h5, h6 {
 }
 
 pre {
-    background-color: #f8f9fa;
+    background-color: #f8f9fa7c;
     padding: 10px;
     border-radius: 5px;
     max-height: 600px;
-- 
2.49.1


From 178ea8ff58485c40003d6c47e484adc8687c2161 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 17:40:49 +0200
Subject: [PATCH 039/144] srv/poe_manager/static/css/style.css aktualisiert

---
 srv/poe_manager/static/css/style.css | 31 ----------------------------
 1 file changed, 31 deletions(-)

diff --git a/srv/poe_manager/static/css/style.css b/srv/poe_manager/static/css/style.css
index 404ab61..6d3c235 100644
--- a/srv/poe_manager/static/css/style.css
+++ b/srv/poe_manager/static/css/style.css
@@ -80,37 +80,6 @@ pre {
     height: 60px; /* Logo Höhe, kann angepasst werden */
 }
 
-#log-container {
-    position: relative;
-    height: calc(100vh - 150px); /* Füllt die Seite minus Header */
-}
-
-#log-box {
-    height: 97%;
-    overflow: auto;
-    white-space: pre-wrap;
-    font-family: monospace;
-    border: 1px solid #dee2e6; /* Bootstrap-like border */
-    padding: 1rem;
-    background-color: #f8f9fa;
-}
-
-#refresh-timer {
-    position: absolute;
-    bottom: 10px;
-    right: 10px;
-    font-size: 0.9em;
-    color: gray;
-}
-
-/* Tabelle anpassen */
-.custom-table input,
-.custom-table select {
-    height: 28px;
-    padding: 0.25rem 0.5rem;
-    font-size: 0.9rem;
-}
-
 /* Spaltenbreiten */
 .custom-table .col-small {
     width: 140px; /* Hostname, Port */
-- 
2.49.1


From 4b5f6abe99b35d0893cc3e0c2cf65e4fbd2d5fcd Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 17:42:33 +0200
Subject: [PATCH 040/144] srv/poe_manager/templates/users.html aktualisiert

---
 srv/poe_manager/templates/users.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/users.html b/srv/poe_manager/templates/users.html
index d0b81e7..fb66ae3 100644
--- a/srv/poe_manager/templates/users.html
+++ b/srv/poe_manager/templates/users.html
@@ -8,7 +8,7 @@
 <button class="btn btn-success mb-3" data-bs-toggle="modal" data-bs-target="#userModal" onclick="openUserModal()">Neuen Benutzer</button>
 {% endif %}
 
-<table class="table table-bordered custom-table">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th class="col-ip">Username</th>
-- 
2.49.1


From d3bdc463145900284eebf00d41a8e30073d14099 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 17:43:35 +0200
Subject: [PATCH 041/144] srv/poe_manager/templates/switche.html aktualisiert

---
 srv/poe_manager/templates/switche.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/switche.html b/srv/poe_manager/templates/switche.html
index a98ed81..9de166b 100644
--- a/srv/poe_manager/templates/switche.html
+++ b/srv/poe_manager/templates/switche.html
@@ -15,7 +15,7 @@
 </form>
 {% endif %}
 
-<table class="table table-bordered custom-table">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th class="col-small">Hostname</th>
-- 
2.49.1


From add19eeb4dbb7155f1ccfedf8d5f6f1e0f73fd52 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 17:47:05 +0200
Subject: [PATCH 042/144] srv/poe_manager/templates/switche.html aktualisiert

---
 srv/poe_manager/templates/switche.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srv/poe_manager/templates/switche.html b/srv/poe_manager/templates/switche.html
index 9de166b..3215d2e 100644
--- a/srv/poe_manager/templates/switche.html
+++ b/srv/poe_manager/templates/switche.html
@@ -18,9 +18,9 @@
 <table class="table table-bordered">
     <thead>
         <tr>
-            <th class="col-small">Hostname</th>
-            <th class="col-ip">IP-Adresse</th>
-            <th class="col-small">Username</th>
+            <th>Hostname</th>
+            <th>IP-Adresse</th>
+            <th>Username</th>
             <th>Password</th>
             {% if current_user.is_admin %}<th>Aktionen</th>{% endif %}
         </tr>
-- 
2.49.1


From 7a5de70fc1b8ba8d80e7f506b9916d36ec6af464 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 17:51:02 +0200
Subject: [PATCH 043/144] srv/poe_manager/templates/switche.html aktualisiert

---
 srv/poe_manager/templates/switche.html | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srv/poe_manager/templates/switche.html b/srv/poe_manager/templates/switche.html
index 3215d2e..d568759 100644
--- a/srv/poe_manager/templates/switche.html
+++ b/srv/poe_manager/templates/switche.html
@@ -7,11 +7,11 @@
 <h4>Neuen Switch hinzufügen</h4>
 <form method="post" class="row g-2 mb-4">
     <input type="hidden" name="add_switch" value="1">
-    <div class="col col-small"><input type="text" name="hostname" placeholder="Hostname" class="form-control" required></div>
-    <div class="col col-ip"><input type="text" name="ip" placeholder="IP-Adresse" class="form-control" required></div>
-    <div class="col col-small"><input type="text" name="username" placeholder="Username" class="form-control" required></div>
-    <div class="col"><input type="password" name="password" placeholder="Password" class="form-control" required></div>
-    <div class="col"><button class="btn btn-success w-100">Hinzufügen</button></div>
+    <input type="text" name="hostname" placeholder="Hostname" class="form-control" required>
+    <input type="text" name="ip" placeholder="IP-Adresse" class="form-control" required>
+    <input type="text" name="username" placeholder="Username" class="form-control" required>
+    <input type="password" name="password" placeholder="Password" class="form-control" required>
+    <button class="btn btn-success w-100">Hinzufügen</button>
 </form>
 {% endif %}
 
@@ -29,9 +29,9 @@
         {% for s in switches %}
         <tr>
             {% if current_user.is_admin %}
-            <td class="col-small"><input name="hostname" value="{{ s['hostname'] }}" class="form-control" required disabled></td>
-            <td class="col-ip"><input name="ip" value="{{ s['ip'] }}" class="form-control" required disabled></td>
-            <td class="col-small"><input name="username" value="{{ s['username'] }}" class="form-control" required disabled></td>
+            <td><input name="hostname" value="{{ s['hostname'] }}" class="form-control" required disabled></td>
+            <td><input name="ip" value="{{ s['ip'] }}" class="form-control" required disabled></td>
+            <td><input name="username" value="{{ s['username'] }}" class="form-control" required disabled></td>
             <td><input name="password" value="{{ s['password'] }}" type="password" class="form-control" disabled></td>
             <td class="custom-actions d-flex gap-1 align-items-center">
                 <!-- Bearbeiten Button -->
-- 
2.49.1


From 72392c97b1d50befa43e59dbd9a14505447a822a Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 17:52:11 +0200
Subject: [PATCH 044/144] revert d3bdc463145900284eebf00d41a8e30073d14099

revert srv/poe_manager/templates/switche.html aktualisiert
---
 srv/poe_manager/templates/switche.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/switche.html b/srv/poe_manager/templates/switche.html
index d568759..79291e1 100644
--- a/srv/poe_manager/templates/switche.html
+++ b/srv/poe_manager/templates/switche.html
@@ -15,7 +15,7 @@
 </form>
 {% endif %}
 
-<table class="table table-bordered">
+<table class="table table-bordered custom-table">
     <thead>
         <tr>
             <th>Hostname</th>
-- 
2.49.1


From 9b3d78ad79ef89dcef0101d64fe521738018e815 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 17:54:12 +0200
Subject: [PATCH 045/144] revert 178ea8ff58485c40003d6c47e484adc8687c2161

revert srv/poe_manager/static/css/style.css aktualisiert
---
 srv/poe_manager/static/css/style.css | 31 ++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/srv/poe_manager/static/css/style.css b/srv/poe_manager/static/css/style.css
index 6d3c235..404ab61 100644
--- a/srv/poe_manager/static/css/style.css
+++ b/srv/poe_manager/static/css/style.css
@@ -80,6 +80,37 @@ pre {
     height: 60px; /* Logo Höhe, kann angepasst werden */
 }
 
+#log-container {
+    position: relative;
+    height: calc(100vh - 150px); /* Füllt die Seite minus Header */
+}
+
+#log-box {
+    height: 97%;
+    overflow: auto;
+    white-space: pre-wrap;
+    font-family: monospace;
+    border: 1px solid #dee2e6; /* Bootstrap-like border */
+    padding: 1rem;
+    background-color: #f8f9fa;
+}
+
+#refresh-timer {
+    position: absolute;
+    bottom: 10px;
+    right: 10px;
+    font-size: 0.9em;
+    color: gray;
+}
+
+/* Tabelle anpassen */
+.custom-table input,
+.custom-table select {
+    height: 28px;
+    padding: 0.25rem 0.5rem;
+    font-size: 0.9rem;
+}
+
 /* Spaltenbreiten */
 .custom-table .col-small {
     width: 140px; /* Hostname, Port */
-- 
2.49.1


From 53b966307a42ff374865e5149865b456769fcdcb Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 17:57:39 +0200
Subject: [PATCH 046/144] srv/poe_manager/templates/base.html aktualisiert

---
 srv/poe_manager/templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/base.html b/srv/poe_manager/templates/base.html
index 586749e..64ea45d 100644
--- a/srv/poe_manager/templates/base.html
+++ b/srv/poe_manager/templates/base.html
@@ -19,7 +19,7 @@
                 <a href="{{ url_for('index') }}" class="btn btn-secondary">Dashboard</a>
                 <a href="{{ url_for('devices') }}" class="btn btn-secondary">Devices</a>
                 {% if current_user.is_admin %}
-                    <a href="{{ url_for('switches') }}" class="btn btn-secondary">Switches</a>
+                    <a href="{{ url_for('switches') }}" class="btn btn-secondary">Switche</a>
                     <a href="{{ url_for('users') }}" class="btn btn-secondary">Users</a>
                     <a href="{{ url_for('logs') }}" class="btn btn-secondary">Live-Log</a>
                     <a href="{{ url_for('settings') }}" class="btn btn-secondary">Settings</a>
-- 
2.49.1


From 79b980b06967b72bc648ebac4c55257371e8a3ce Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 17:59:37 +0200
Subject: [PATCH 047/144] srv/poe_manager/static/css/style.css aktualisiert

---
 srv/poe_manager/static/css/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/static/css/style.css b/srv/poe_manager/static/css/style.css
index 404ab61..89db997 100644
--- a/srv/poe_manager/static/css/style.css
+++ b/srv/poe_manager/static/css/style.css
@@ -77,7 +77,7 @@ pre {
 .navbar-logo img {
     display: flex;
     justify-content: flex-start;
-    height: 60px; /* Logo Höhe, kann angepasst werden */
+    height: 80px; /* Logo Höhe, kann angepasst werden */
 }
 
 #log-container {
-- 
2.49.1


From 51594cbd2f7f85d7dca3ff7c45e4bab91d86bc93 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 18:01:06 +0200
Subject: [PATCH 048/144] srv/poe_manager/static/css/style.css aktualisiert

---
 srv/poe_manager/static/css/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/static/css/style.css b/srv/poe_manager/static/css/style.css
index 89db997..47d08c1 100644
--- a/srv/poe_manager/static/css/style.css
+++ b/srv/poe_manager/static/css/style.css
@@ -77,7 +77,7 @@ pre {
 .navbar-logo img {
     display: flex;
     justify-content: flex-start;
-    height: 80px; /* Logo Höhe, kann angepasst werden */
+    height: 83px; /* Logo Höhe, kann angepasst werden */
 }
 
 #log-container {
-- 
2.49.1


From 290584e0d92d3e4f2bbc907f5f7f8778d6662252 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 18:05:01 +0200
Subject: [PATCH 049/144] srv/poe_manager/templates/settings.html aktualisiert

---
 srv/poe_manager/templates/settings.html | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/srv/poe_manager/templates/settings.html b/srv/poe_manager/templates/settings.html
index dd25ed6..69703f6 100644
--- a/srv/poe_manager/templates/settings.html
+++ b/srv/poe_manager/templates/settings.html
@@ -12,13 +12,4 @@
         <button type="submit" class="btn btn-success">Speichern & Service neustarten</button>
     </div>
 </form>
-
-{% with messages = get_flashed_messages() %}
-  {% if messages %}
-    <div class="mt-2 alert alert-info">
-        {% for message in messages %}{{ message }}<br>{% endfor %}
-    </div>
-  {% endif %}
-{% endwith %}
-
 {% endblock %}
-- 
2.49.1


From bbbe53f0dbcdf069f930751ffb17da440354fd60 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 18:11:44 +0200
Subject: [PATCH 050/144] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 125 ++++++++++++++++++++++++++++-------------
 1 file changed, 85 insertions(+), 40 deletions(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index cf76918..f9e9ea0 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -311,58 +311,103 @@ def toggle_device(mac):
 def switches():
     conn = get_db_connection()
 
-    # Inline-Add
+    # 🔒 Admin-Prüfung
+    if request.method == 'POST' and not current_user.is_admin:
+        flash("Zugriff verweigert!")
+        conn.close()
+        return redirect(url_for('switches'))
+
+    # -------------------------
+    # 🔹 SWITCH HINZUFÜGEN
+    # -------------------------
     if request.method == 'POST' and 'add_switch' in request.form:
-        if not current_user.is_admin:
-            flash("Zugriff verweigert!")
-            return redirect(url_for('switches'))
-        hostname = request.form['hostname']
-        ip = request.form['ip']
-        username = request.form['username']
-        password = encrypt_password(request.form['password'])
-        try:
-            conn.execute("INSERT INTO switches (hostname, ip, username, password) VALUES (?, ?, ?, ?)",
-                         (hostname, ip, username, password))
-            conn.commit()
-            flash(f"Switch {hostname} hinzugefügt.")
-        except sqlite3.IntegrityError:
-            flash("Hostname existiert bereits oder Eingabefehler!")
+        hostname = request.form['hostname'].strip()
+        ip = request.form['ip'].strip()
+        username = request.form['username'].strip()
+        password = encrypt_password(request.form['password'].strip())
 
-    # Inline-Edit
-    if request.method == 'POST' and 'edit_switch' in request.form:
-        if not current_user.is_admin:
-            flash("Zugriff verweigert!")
+        # Prüfung auf doppelte Hostnamen
+        existing_host = conn.execute(
+            "SELECT hostname FROM switches WHERE hostname = ?", (hostname,)
+        ).fetchone()
+        if existing_host:
+            flash(f"Hostname '{hostname}' existiert bereits!")
+            conn.close()
             return redirect(url_for('switches'))
+
+        # Prüfung auf doppelte IP
+        existing_ip = conn.execute(
+            "SELECT hostname FROM switches WHERE ip = ?", (ip,)
+        ).fetchone()
+        if existing_ip:
+            flash(f"IP-Adresse {ip} wird bereits vom Switch '{existing_ip['hostname']}' verwendet!")
+            conn.close()
+            return redirect(url_for('switches'))
+
+        # Einfügen
+        conn.execute(
+            "INSERT INTO switches (hostname, ip, username, password) VALUES (?, ?, ?, ?)",
+            (hostname, ip, username, password)
+        )
+        conn.commit()
+        flash(f"Switch '{hostname}' erfolgreich hinzugefügt.")
+
+    # -------------------------
+    # 🔹 SWITCH BEARBEITEN
+    # -------------------------
+    elif request.method == 'POST' and 'edit_switch' in request.form:
         old_hostname = request.form['old_hostname']
-        hostname = request.form['hostname']
-        ip = request.form['ip']
-        username = request.form['username']
-        password = encrypt_password(request.form['password'])
-        try:
-            conn.execute("""
-                UPDATE switches
-                SET hostname=?, ip=?, username=?, password=?
-                WHERE hostname=?
-            """, (hostname, ip, username, password, old_hostname))
-            conn.commit()
-            flash(f"Switch {hostname} aktualisiert.")
-        except sqlite3.IntegrityError:
-            flash("Hostname existiert bereits oder Eingabefehler!")
+        hostname = request.form['hostname'].strip()
+        ip = request.form['ip'].strip()
+        username = request.form['username'].strip()
+        password = encrypt_password(request.form['password'].strip())
 
-    # Inline-Delete
-    if request.method == 'POST' and 'delete_switch' in request.form:
-        if not current_user.is_admin:
-            flash("Zugriff verweigert!")
+        # Hostname prüfen
+        existing_host = conn.execute(
+            "SELECT hostname FROM switches WHERE hostname = ? AND hostname != ?",
+            (hostname, old_hostname)
+        ).fetchone()
+        if existing_host:
+            flash(f"Hostname '{hostname}' existiert bereits für einen anderen Switch!")
+            conn.close()
             return redirect(url_for('switches'))
+
+        # IP prüfen
+        existing_ip = conn.execute(
+            "SELECT hostname FROM switches WHERE ip = ? AND hostname != ?",
+            (ip, old_hostname)
+        ).fetchone()
+        if existing_ip:
+            flash(f"IP-Adresse {ip} wird bereits vom Switch '{existing_ip['hostname']}' verwendet!")
+            conn.close()
+            return redirect(url_for('switches'))
+
+        # Update durchführen
+        conn.execute("""
+            UPDATE switches
+            SET hostname=?, ip=?, username=?, password=?
+            WHERE hostname=?
+        """, (hostname, ip, username, password, old_hostname))
+        conn.commit()
+        flash(f"Switch '{hostname}' erfolgreich aktualisiert.")
+
+    # -------------------------
+    # 🔹 SWITCH LÖSCHEN
+    # -------------------------
+    elif request.method == 'POST' and 'delete_switch' in request.form:
         del_hostname = request.form['delete_switch']
         conn.execute("UPDATE devices SET switch_hostname=NULL WHERE switch_hostname=?", (del_hostname,))
         conn.execute("DELETE FROM switches WHERE hostname=?", (del_hostname,))
         conn.commit()
-        flash(f"Switch {del_hostname} gelöscht.")
+        flash(f"Switch '{del_hostname}' gelöscht.")
 
-    switches = conn.execute("SELECT hostname, ip, username FROM switches").fetchall()
+    # -------------------------
+    # 🔹 SWITCHES LADEN
+    # -------------------------
+    switches = conn.execute("SELECT hostname, ip, username FROM switches ORDER BY hostname ASC").fetchall()
     conn.close()
-    return render_template('switche.html', switches=switches)
+    return render_template('switches.html', switches=switches)
+
 
 @app.route("/get_log")
 @login_required
-- 
2.49.1


From 0f6b87ba1f087bc11abac6e0ca54d5587580f906 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 18:11:57 +0200
Subject: [PATCH 051/144] srv/poe_manager/templates/devices.html aktualisiert

---
 srv/poe_manager/templates/devices.html | 234 +++++--------------------
 1 file changed, 47 insertions(+), 187 deletions(-)

diff --git a/srv/poe_manager/templates/devices.html b/srv/poe_manager/templates/devices.html
index 14cd2ab..c084fc1 100644
--- a/srv/poe_manager/templates/devices.html
+++ b/srv/poe_manager/templates/devices.html
@@ -1,195 +1,55 @@
 {% extends "base.html" %}
 {% block content %}
 
-<h2>Devices</h2>
+<h2>Switch-Verwaltung</h2>
 
-{% if current_user.is_admin %}
-<!-- Neues Gerät hinzufügen -->
-<button class="btn btn-success mb-3" data-bs-toggle="modal" data-bs-target="#deviceModal" onclick="openDeviceModal()">Neues Gerät</button>
-{% endif %}
+<!-- Hinzufügen -->
+<form method="post" class="mb-3">
+  <input type="hidden" name="add_switch" value="1">
+  <div class="row g-2">
+    <div class="col"><input class="form-control" name="hostname" placeholder="Hostname" required></div>
+    <div class="col"><input class="form-control" name="ip" placeholder="IP-Adresse" required></div>
+    <div class="col"><input class="form-control" name="username" placeholder="Benutzername" required></div>
+    <div class="col"><input class="form-control" name="password" type="password" placeholder="Passwort" required></div>
+    <div class="col-auto">
+      <button class="btn btn-primary">Hinzufügen</button>
+    </div>
+  </div>
+</form>
 
-<table class="table table-bordered">
-    <thead>
-        <tr>
-            <th>Hostname</th>
-            <th>IP-Adresse</th>
-            <th>MAC-Adresse</th>
-            <th>Port</th>
-            <th>Switch</th>
-            <th>Status</th>
-            {% if current_user.is_admin %}<th>Aktionen</th>{% endif %}
-        </tr>
-    </thead>
-    <tbody>
-        {% for d in devices %}
-        <tr>
-            <td>{{ d['name'] }}</td>
-            <td>{{ d['rpi_ip'] }}</td>
-            <td>{{ d['mac'] }}</td>
-            <td>{{ d['port'] }}</td>
-            <td>{{ d['switch_hostname'] or '-' }}</td>
-            <td>
-                <form method="post" action="{{ url_for('toggle_device', mac=d['mac']) }}" style="display:inline;">
-                    <button class="btn btn-sm {% if d['is_active'] %}btn-success{% else %}btn-secondary{% endif %}" type="submit">
-                        {% if d['is_active'] %}Deaktivieren{% else %}Aktivieren{% endif %}
-                    </button>
-                </form>
-            </td>
-            {% if current_user.is_admin %}
-            <td>
-                <!-- Bearbeiten Modal -->
-                <button class="btn btn-secondary btn-sm button login white" data-bs-toggle="modal" data-bs-target="#editDeviceModal"
-                        onclick="openEditDeviceModal('{{ d['mac'] }}','{{ d['name'] }}','{{ d['rpi_ip'] }}','{{ d['port'] }}')">
-                    Bearbeiten
-                </button>
-
-                <!-- Switch ändern Modal -->
-                <button class="btn btn-secondary btn-sm button login white" data-bs-toggle="modal" data-bs-target="#switchModal"
-                        onclick="openSwitchModal('{{ d['mac'] }}','{{ d['switch_hostname'] }}')">
-                    Switch ändern
-                </button>
-
-                <!-- Löschen -->
-                <form method="post" style="display:inline;">
-                    <input type="hidden" name="delete_device" value="{{ d['mac'] }}">
-                    <button class="btn btn-danger btn-sm" onclick="return confirm('Willst du das Gerät wirklich löschen?');">
-                        Löschen
-                    </button>
-                </form>
-            </td>
-            {% endif %}
-        </tr>
-        {% endfor %}
-    </tbody>
+<!-- Switch-Liste -->
+<table class="table table-striped table-hover align-middle">
+  <thead>
+    <tr>
+      <th>Hostname</th>
+      <th>IP-Adresse</th>
+      <th>Benutzername</th>
+      <th>Aktionen</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for s in switches %}
+    <tr>
+      <form method="post">
+        <input type="hidden" name="edit_switch" value="1">
+        <input type="hidden" name="old_hostname" value="{{ s['hostname'] }}">
+        <td><input class="form-control form-control-sm" name="hostname" value="{{ s['hostname'] }}"></td>
+        <td><input class="form-control form-control-sm" name="ip" value="{{ s['ip'] }}"></td>
+        <td><input class="form-control form-control-sm" name="username" value="{{ s['username'] }}"></td>
+        <td>
+          <div class="d-flex gap-1">
+            <input type="password" class="form-control form-control-sm" name="password" placeholder="Neues Passwort">
+            <button class="btn btn-sm btn-success">Speichern</button>
+          </div>
+      </form>
+      <form method="post" style="display:inline;">
+        <input type="hidden" name="delete_switch" value="{{ s['hostname'] }}">
+        <button class="btn btn-sm btn-danger ms-1">Löschen</button>
+      </form>
+      </td>
+    </tr>
+    {% endfor %}
+  </tbody>
 </table>
 
-<!-- Modal: Neues Gerät -->
-<div class="modal fade" id="deviceModal" tabindex="-1" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <form method="post">
-        <div class="modal-header">
-          <h5 class="modal-title black">Neues Gerät hinzufügen</h5>
-          <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-        </div>
-        <div class="modal-body">
-            <input type="hidden" name="add_device" value="1">
-            <div class="mb-3">
-                <label>Hostname</label>
-                <input type="text" name="name" class="form-control" required>
-            </div>
-            <div class="mb-3">
-                <label>IP-Adresse</label>
-                <input type="text" name="rpi_ip" class="form-control" required>
-            </div>
-            <div class="mb-3">
-                <label>MAC-Adresse</label>
-                <input type="text" name="mac" class="form-control" required>
-            </div>
-            <div class="mb-3">
-                <label>Port</label>
-                <input type="text" name="port" class="form-control" required>
-            </div>
-            <div class="mb-3">
-                <label>Switch</label>
-                <select name="switch_hostname" class="form-select" required>
-                    {% for sw in switches %}
-                        <option value="{{ sw['hostname'] }}">{{ sw['hostname'] }}</option>
-                    {% endfor %}
-                </select>
-            </div>
-        </div>
-        <div class="modal-footer">
-          <button class="btn btn-success button login" type="submit">Hinzufügen</button>
-          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
-        </div>
-      </form>
-    </div>
-  </div>
-</div>
-
-<!-- Modal: Bearbeiten -->
-<div class="modal fade" id="editDeviceModal" tabindex="-1" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <form method="post">
-        <input type="hidden" name="edit_device" value="1">
-        <input type="hidden" name="old_mac" id="edit_old_mac">
-        <div class="modal-header">
-          <h5 class="modal-title black">Gerät bearbeiten</h5>
-          <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-        </div>
-        <div class="modal-body">
-            <div class="mb-3">
-                <label>Hostname</label>
-                <input type="text" name="name" id="edit_name" class="form-control" required>
-            </div>
-            <div class="mb-3">
-                <label>IP-Adresse</label>
-                <input type="text" name="rpi_ip" id="edit_ip" class="form-control" required>
-            </div>
-            <div class="mb-3">
-                <label>MAC-Adresse</label>
-                <input type="text" name="mac" id="edit_mac" class="form-control" required>
-            </div>
-            <div class="mb-3">
-                <label>Port</label>
-                <input type="text" name="port" id="edit_port" class="form-control" required>
-            </div>
-        </div>
-        <div class="modal-footer">
-          <button class="btn btn-primary button login" type="submit">Speichern</button>
-          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
-        </div>
-      </form>
-    </div>
-  </div>
-</div>
-
-<!-- Modal: Switch ändern -->
-<div class="modal fade" id="switchModal" tabindex="-1" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <form method="post">
-        <input type="hidden" name="edit_device" value="1">
-        <input type="hidden" name="old_mac" id="switch_mac">
-        <div class="modal-header">
-          <h5 class="modal-title black">Switch ändern</h5>
-          <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-        </div>
-        <div class="modal-body">
-            <select name="switch_hostname" id="switch_select" class="form-select" required>
-                {% for sw in switches %}
-                    <option value="{{ sw['hostname'] }}">{{ sw['hostname'] }}</option>
-                {% endfor %}
-            </select>
-        </div>
-        <div class="modal-footer">
-          <button class="btn btn-primarybutton login" type="submit">Speichern</button>
-          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
-        </div>
-      </form>
-    </div>
-  </div>
-</div>
-
-<script>
-function openDeviceModal() {
-    document.querySelector("#deviceModal form").reset();
-}
-
-function openEditDeviceModal(mac, name, ip, port) {
-    document.getElementById("edit_old_mac").value = mac;
-    document.getElementById("edit_name").value = name;
-    document.getElementById("edit_ip").value = ip;
-    document.getElementById("edit_mac").value = mac;
-    document.getElementById("edit_port").value = port;
-}
-
-function openSwitchModal(mac, switch_hostname) {
-    document.getElementById("switch_mac").value = mac;
-    document.getElementById("switch_select").value = switch_hostname;
-}
-</script>
-
 {% endblock %}
-- 
2.49.1


From ae3caefd1820040cd308b36df27c872f44df61ee Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 18:13:06 +0200
Subject: [PATCH 052/144] revert bbbe53f0dbcdf069f930751ffb17da440354fd60

revert srv/poe_manager/app.py aktualisiert
---
 srv/poe_manager/app.py | 123 +++++++++++++----------------------------
 1 file changed, 39 insertions(+), 84 deletions(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index f9e9ea0..cf76918 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -311,103 +311,58 @@ def toggle_device(mac):
 def switches():
     conn = get_db_connection()
 
-    # 🔒 Admin-Prüfung
-    if request.method == 'POST' and not current_user.is_admin:
-        flash("Zugriff verweigert!")
-        conn.close()
-        return redirect(url_for('switches'))
-
-    # -------------------------
-    # 🔹 SWITCH HINZUFÜGEN
-    # -------------------------
+    # Inline-Add
     if request.method == 'POST' and 'add_switch' in request.form:
-        hostname = request.form['hostname'].strip()
-        ip = request.form['ip'].strip()
-        username = request.form['username'].strip()
-        password = encrypt_password(request.form['password'].strip())
-
-        # Prüfung auf doppelte Hostnamen
-        existing_host = conn.execute(
-            "SELECT hostname FROM switches WHERE hostname = ?", (hostname,)
-        ).fetchone()
-        if existing_host:
-            flash(f"Hostname '{hostname}' existiert bereits!")
-            conn.close()
+        if not current_user.is_admin:
+            flash("Zugriff verweigert!")
             return redirect(url_for('switches'))
+        hostname = request.form['hostname']
+        ip = request.form['ip']
+        username = request.form['username']
+        password = encrypt_password(request.form['password'])
+        try:
+            conn.execute("INSERT INTO switches (hostname, ip, username, password) VALUES (?, ?, ?, ?)",
+                         (hostname, ip, username, password))
+            conn.commit()
+            flash(f"Switch {hostname} hinzugefügt.")
+        except sqlite3.IntegrityError:
+            flash("Hostname existiert bereits oder Eingabefehler!")
 
-        # Prüfung auf doppelte IP
-        existing_ip = conn.execute(
-            "SELECT hostname FROM switches WHERE ip = ?", (ip,)
-        ).fetchone()
-        if existing_ip:
-            flash(f"IP-Adresse {ip} wird bereits vom Switch '{existing_ip['hostname']}' verwendet!")
-            conn.close()
+    # Inline-Edit
+    if request.method == 'POST' and 'edit_switch' in request.form:
+        if not current_user.is_admin:
+            flash("Zugriff verweigert!")
             return redirect(url_for('switches'))
-
-        # Einfügen
-        conn.execute(
-            "INSERT INTO switches (hostname, ip, username, password) VALUES (?, ?, ?, ?)",
-            (hostname, ip, username, password)
-        )
-        conn.commit()
-        flash(f"Switch '{hostname}' erfolgreich hinzugefügt.")
-
-    # -------------------------
-    # 🔹 SWITCH BEARBEITEN
-    # -------------------------
-    elif request.method == 'POST' and 'edit_switch' in request.form:
         old_hostname = request.form['old_hostname']
-        hostname = request.form['hostname'].strip()
-        ip = request.form['ip'].strip()
-        username = request.form['username'].strip()
-        password = encrypt_password(request.form['password'].strip())
+        hostname = request.form['hostname']
+        ip = request.form['ip']
+        username = request.form['username']
+        password = encrypt_password(request.form['password'])
+        try:
+            conn.execute("""
+                UPDATE switches
+                SET hostname=?, ip=?, username=?, password=?
+                WHERE hostname=?
+            """, (hostname, ip, username, password, old_hostname))
+            conn.commit()
+            flash(f"Switch {hostname} aktualisiert.")
+        except sqlite3.IntegrityError:
+            flash("Hostname existiert bereits oder Eingabefehler!")
 
-        # Hostname prüfen
-        existing_host = conn.execute(
-            "SELECT hostname FROM switches WHERE hostname = ? AND hostname != ?",
-            (hostname, old_hostname)
-        ).fetchone()
-        if existing_host:
-            flash(f"Hostname '{hostname}' existiert bereits für einen anderen Switch!")
-            conn.close()
+    # Inline-Delete
+    if request.method == 'POST' and 'delete_switch' in request.form:
+        if not current_user.is_admin:
+            flash("Zugriff verweigert!")
             return redirect(url_for('switches'))
-
-        # IP prüfen
-        existing_ip = conn.execute(
-            "SELECT hostname FROM switches WHERE ip = ? AND hostname != ?",
-            (ip, old_hostname)
-        ).fetchone()
-        if existing_ip:
-            flash(f"IP-Adresse {ip} wird bereits vom Switch '{existing_ip['hostname']}' verwendet!")
-            conn.close()
-            return redirect(url_for('switches'))
-
-        # Update durchführen
-        conn.execute("""
-            UPDATE switches
-            SET hostname=?, ip=?, username=?, password=?
-            WHERE hostname=?
-        """, (hostname, ip, username, password, old_hostname))
-        conn.commit()
-        flash(f"Switch '{hostname}' erfolgreich aktualisiert.")
-
-    # -------------------------
-    # 🔹 SWITCH LÖSCHEN
-    # -------------------------
-    elif request.method == 'POST' and 'delete_switch' in request.form:
         del_hostname = request.form['delete_switch']
         conn.execute("UPDATE devices SET switch_hostname=NULL WHERE switch_hostname=?", (del_hostname,))
         conn.execute("DELETE FROM switches WHERE hostname=?", (del_hostname,))
         conn.commit()
-        flash(f"Switch '{del_hostname}' gelöscht.")
+        flash(f"Switch {del_hostname} gelöscht.")
 
-    # -------------------------
-    # 🔹 SWITCHES LADEN
-    # -------------------------
-    switches = conn.execute("SELECT hostname, ip, username FROM switches ORDER BY hostname ASC").fetchall()
+    switches = conn.execute("SELECT hostname, ip, username FROM switches").fetchall()
     conn.close()
-    return render_template('switches.html', switches=switches)
-
+    return render_template('switche.html', switches=switches)
 
 @app.route("/get_log")
 @login_required
-- 
2.49.1


From 98950d706c2ba9d5a40e4f29c97781cfc9eacdcd Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 18:17:08 +0200
Subject: [PATCH 053/144] revert 0f6b87ba1f087bc11abac6e0ca54d5587580f906

revert srv/poe_manager/templates/devices.html aktualisiert
---
 srv/poe_manager/templates/devices.html | 234 ++++++++++++++++++++-----
 1 file changed, 187 insertions(+), 47 deletions(-)

diff --git a/srv/poe_manager/templates/devices.html b/srv/poe_manager/templates/devices.html
index c084fc1..14cd2ab 100644
--- a/srv/poe_manager/templates/devices.html
+++ b/srv/poe_manager/templates/devices.html
@@ -1,55 +1,195 @@
 {% extends "base.html" %}
 {% block content %}
 
-<h2>Switch-Verwaltung</h2>
+<h2>Devices</h2>
 
-<!-- Hinzufügen -->
-<form method="post" class="mb-3">
-  <input type="hidden" name="add_switch" value="1">
-  <div class="row g-2">
-    <div class="col"><input class="form-control" name="hostname" placeholder="Hostname" required></div>
-    <div class="col"><input class="form-control" name="ip" placeholder="IP-Adresse" required></div>
-    <div class="col"><input class="form-control" name="username" placeholder="Benutzername" required></div>
-    <div class="col"><input class="form-control" name="password" type="password" placeholder="Passwort" required></div>
-    <div class="col-auto">
-      <button class="btn btn-primary">Hinzufügen</button>
-    </div>
-  </div>
-</form>
+{% if current_user.is_admin %}
+<!-- Neues Gerät hinzufügen -->
+<button class="btn btn-success mb-3" data-bs-toggle="modal" data-bs-target="#deviceModal" onclick="openDeviceModal()">Neues Gerät</button>
+{% endif %}
 
-<!-- Switch-Liste -->
-<table class="table table-striped table-hover align-middle">
-  <thead>
-    <tr>
-      <th>Hostname</th>
-      <th>IP-Adresse</th>
-      <th>Benutzername</th>
-      <th>Aktionen</th>
-    </tr>
-  </thead>
-  <tbody>
-    {% for s in switches %}
-    <tr>
-      <form method="post">
-        <input type="hidden" name="edit_switch" value="1">
-        <input type="hidden" name="old_hostname" value="{{ s['hostname'] }}">
-        <td><input class="form-control form-control-sm" name="hostname" value="{{ s['hostname'] }}"></td>
-        <td><input class="form-control form-control-sm" name="ip" value="{{ s['ip'] }}"></td>
-        <td><input class="form-control form-control-sm" name="username" value="{{ s['username'] }}"></td>
-        <td>
-          <div class="d-flex gap-1">
-            <input type="password" class="form-control form-control-sm" name="password" placeholder="Neues Passwort">
-            <button class="btn btn-sm btn-success">Speichern</button>
-          </div>
-      </form>
-      <form method="post" style="display:inline;">
-        <input type="hidden" name="delete_switch" value="{{ s['hostname'] }}">
-        <button class="btn btn-sm btn-danger ms-1">Löschen</button>
-      </form>
-      </td>
-    </tr>
-    {% endfor %}
-  </tbody>
+<table class="table table-bordered">
+    <thead>
+        <tr>
+            <th>Hostname</th>
+            <th>IP-Adresse</th>
+            <th>MAC-Adresse</th>
+            <th>Port</th>
+            <th>Switch</th>
+            <th>Status</th>
+            {% if current_user.is_admin %}<th>Aktionen</th>{% endif %}
+        </tr>
+    </thead>
+    <tbody>
+        {% for d in devices %}
+        <tr>
+            <td>{{ d['name'] }}</td>
+            <td>{{ d['rpi_ip'] }}</td>
+            <td>{{ d['mac'] }}</td>
+            <td>{{ d['port'] }}</td>
+            <td>{{ d['switch_hostname'] or '-' }}</td>
+            <td>
+                <form method="post" action="{{ url_for('toggle_device', mac=d['mac']) }}" style="display:inline;">
+                    <button class="btn btn-sm {% if d['is_active'] %}btn-success{% else %}btn-secondary{% endif %}" type="submit">
+                        {% if d['is_active'] %}Deaktivieren{% else %}Aktivieren{% endif %}
+                    </button>
+                </form>
+            </td>
+            {% if current_user.is_admin %}
+            <td>
+                <!-- Bearbeiten Modal -->
+                <button class="btn btn-secondary btn-sm button login white" data-bs-toggle="modal" data-bs-target="#editDeviceModal"
+                        onclick="openEditDeviceModal('{{ d['mac'] }}','{{ d['name'] }}','{{ d['rpi_ip'] }}','{{ d['port'] }}')">
+                    Bearbeiten
+                </button>
+
+                <!-- Switch ändern Modal -->
+                <button class="btn btn-secondary btn-sm button login white" data-bs-toggle="modal" data-bs-target="#switchModal"
+                        onclick="openSwitchModal('{{ d['mac'] }}','{{ d['switch_hostname'] }}')">
+                    Switch ändern
+                </button>
+
+                <!-- Löschen -->
+                <form method="post" style="display:inline;">
+                    <input type="hidden" name="delete_device" value="{{ d['mac'] }}">
+                    <button class="btn btn-danger btn-sm" onclick="return confirm('Willst du das Gerät wirklich löschen?');">
+                        Löschen
+                    </button>
+                </form>
+            </td>
+            {% endif %}
+        </tr>
+        {% endfor %}
+    </tbody>
 </table>
 
+<!-- Modal: Neues Gerät -->
+<div class="modal fade" id="deviceModal" tabindex="-1" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <form method="post">
+        <div class="modal-header">
+          <h5 class="modal-title black">Neues Gerät hinzufügen</h5>
+          <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+        </div>
+        <div class="modal-body">
+            <input type="hidden" name="add_device" value="1">
+            <div class="mb-3">
+                <label>Hostname</label>
+                <input type="text" name="name" class="form-control" required>
+            </div>
+            <div class="mb-3">
+                <label>IP-Adresse</label>
+                <input type="text" name="rpi_ip" class="form-control" required>
+            </div>
+            <div class="mb-3">
+                <label>MAC-Adresse</label>
+                <input type="text" name="mac" class="form-control" required>
+            </div>
+            <div class="mb-3">
+                <label>Port</label>
+                <input type="text" name="port" class="form-control" required>
+            </div>
+            <div class="mb-3">
+                <label>Switch</label>
+                <select name="switch_hostname" class="form-select" required>
+                    {% for sw in switches %}
+                        <option value="{{ sw['hostname'] }}">{{ sw['hostname'] }}</option>
+                    {% endfor %}
+                </select>
+            </div>
+        </div>
+        <div class="modal-footer">
+          <button class="btn btn-success button login" type="submit">Hinzufügen</button>
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
+
+<!-- Modal: Bearbeiten -->
+<div class="modal fade" id="editDeviceModal" tabindex="-1" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <form method="post">
+        <input type="hidden" name="edit_device" value="1">
+        <input type="hidden" name="old_mac" id="edit_old_mac">
+        <div class="modal-header">
+          <h5 class="modal-title black">Gerät bearbeiten</h5>
+          <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+        </div>
+        <div class="modal-body">
+            <div class="mb-3">
+                <label>Hostname</label>
+                <input type="text" name="name" id="edit_name" class="form-control" required>
+            </div>
+            <div class="mb-3">
+                <label>IP-Adresse</label>
+                <input type="text" name="rpi_ip" id="edit_ip" class="form-control" required>
+            </div>
+            <div class="mb-3">
+                <label>MAC-Adresse</label>
+                <input type="text" name="mac" id="edit_mac" class="form-control" required>
+            </div>
+            <div class="mb-3">
+                <label>Port</label>
+                <input type="text" name="port" id="edit_port" class="form-control" required>
+            </div>
+        </div>
+        <div class="modal-footer">
+          <button class="btn btn-primary button login" type="submit">Speichern</button>
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
+
+<!-- Modal: Switch ändern -->
+<div class="modal fade" id="switchModal" tabindex="-1" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <form method="post">
+        <input type="hidden" name="edit_device" value="1">
+        <input type="hidden" name="old_mac" id="switch_mac">
+        <div class="modal-header">
+          <h5 class="modal-title black">Switch ändern</h5>
+          <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+        </div>
+        <div class="modal-body">
+            <select name="switch_hostname" id="switch_select" class="form-select" required>
+                {% for sw in switches %}
+                    <option value="{{ sw['hostname'] }}">{{ sw['hostname'] }}</option>
+                {% endfor %}
+            </select>
+        </div>
+        <div class="modal-footer">
+          <button class="btn btn-primarybutton login" type="submit">Speichern</button>
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
+
+<script>
+function openDeviceModal() {
+    document.querySelector("#deviceModal form").reset();
+}
+
+function openEditDeviceModal(mac, name, ip, port) {
+    document.getElementById("edit_old_mac").value = mac;
+    document.getElementById("edit_name").value = name;
+    document.getElementById("edit_ip").value = ip;
+    document.getElementById("edit_mac").value = mac;
+    document.getElementById("edit_port").value = port;
+}
+
+function openSwitchModal(mac, switch_hostname) {
+    document.getElementById("switch_mac").value = mac;
+    document.getElementById("switch_select").value = switch_hostname;
+}
+</script>
+
 {% endblock %}
-- 
2.49.1


From 43d30dd8226be7e4cfbd1f7c7856938d7836c28c Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 18:19:58 +0200
Subject: [PATCH 054/144] srv/poe_manager/templates/switche.html aktualisiert

---
 srv/poe_manager/templates/switche.html | 111 ++++++++++---------------
 1 file changed, 46 insertions(+), 65 deletions(-)

diff --git a/srv/poe_manager/templates/switche.html b/srv/poe_manager/templates/switche.html
index 79291e1..c084fc1 100644
--- a/srv/poe_manager/templates/switche.html
+++ b/srv/poe_manager/templates/switche.html
@@ -1,74 +1,55 @@
 {% extends "base.html" %}
 {% block content %}
 
-<h2>Switche</h2>
+<h2>Switch-Verwaltung</h2>
 
-{% if current_user.is_admin %}
-<h4>Neuen Switch hinzufügen</h4>
-<form method="post" class="row g-2 mb-4">
-    <input type="hidden" name="add_switch" value="1">
-    <input type="text" name="hostname" placeholder="Hostname" class="form-control" required>
-    <input type="text" name="ip" placeholder="IP-Adresse" class="form-control" required>
-    <input type="text" name="username" placeholder="Username" class="form-control" required>
-    <input type="password" name="password" placeholder="Password" class="form-control" required>
-    <button class="btn btn-success w-100">Hinzufügen</button>
+<!-- Hinzufügen -->
+<form method="post" class="mb-3">
+  <input type="hidden" name="add_switch" value="1">
+  <div class="row g-2">
+    <div class="col"><input class="form-control" name="hostname" placeholder="Hostname" required></div>
+    <div class="col"><input class="form-control" name="ip" placeholder="IP-Adresse" required></div>
+    <div class="col"><input class="form-control" name="username" placeholder="Benutzername" required></div>
+    <div class="col"><input class="form-control" name="password" type="password" placeholder="Passwort" required></div>
+    <div class="col-auto">
+      <button class="btn btn-primary">Hinzufügen</button>
+    </div>
+  </div>
 </form>
-{% endif %}
 
-<table class="table table-bordered custom-table">
-    <thead>
-        <tr>
-            <th>Hostname</th>
-            <th>IP-Adresse</th>
-            <th>Username</th>
-            <th>Password</th>
-            {% if current_user.is_admin %}<th>Aktionen</th>{% endif %}
-        </tr>
-    </thead>
-    <tbody>
-        {% for s in switches %}
-        <tr>
-            {% if current_user.is_admin %}
-            <td><input name="hostname" value="{{ s['hostname'] }}" class="form-control" required disabled></td>
-            <td><input name="ip" value="{{ s['ip'] }}" class="form-control" required disabled></td>
-            <td><input name="username" value="{{ s['username'] }}" class="form-control" required disabled></td>
-            <td><input name="password" value="{{ s['password'] }}" type="password" class="form-control" disabled></td>
-            <td class="custom-actions d-flex gap-1 align-items-center">
-                <!-- Bearbeiten Button -->
-                <button type="button" class="btn btn-warning btn-sm" onclick="enableSwitchEdit(this)">Bearbeiten</button>
-
-                <!-- Speichern Button -->
-                <form method="post" style="display:inline;">
-                    <input type="hidden" name="edit_switch" value="1">
-                    <input type="hidden" name="old_hostname" value="{{ s['hostname'] }}">
-                    <button class="btn btn-primary btn-sm d-none" type="submit">Speichern</button>
-                </form>
-
-                <!-- Löschen Button -->
-                <form method="post" style="display:inline;">
-                    <button name="delete_switch" value="{{ s['hostname'] }}" class="btn btn-danger btn-sm"
-                        onclick="return confirm('Willst du den Switch wirklich löschen?');">Löschen</button>
-                </form>
-            </td>
-            {% else %}
-            <td>{{ s['hostname'] }}</td>
-            <td>{{ s['ip'] }}</td>
-            <td>{{ s['username'] }}</td>
-            <td>******</td>
-            {% endif %}
-        </tr>
-        {% endfor %}
-    </tbody>
+<!-- Switch-Liste -->
+<table class="table table-striped table-hover align-middle">
+  <thead>
+    <tr>
+      <th>Hostname</th>
+      <th>IP-Adresse</th>
+      <th>Benutzername</th>
+      <th>Aktionen</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for s in switches %}
+    <tr>
+      <form method="post">
+        <input type="hidden" name="edit_switch" value="1">
+        <input type="hidden" name="old_hostname" value="{{ s['hostname'] }}">
+        <td><input class="form-control form-control-sm" name="hostname" value="{{ s['hostname'] }}"></td>
+        <td><input class="form-control form-control-sm" name="ip" value="{{ s['ip'] }}"></td>
+        <td><input class="form-control form-control-sm" name="username" value="{{ s['username'] }}"></td>
+        <td>
+          <div class="d-flex gap-1">
+            <input type="password" class="form-control form-control-sm" name="password" placeholder="Neues Passwort">
+            <button class="btn btn-sm btn-success">Speichern</button>
+          </div>
+      </form>
+      <form method="post" style="display:inline;">
+        <input type="hidden" name="delete_switch" value="{{ s['hostname'] }}">
+        <button class="btn btn-sm btn-danger ms-1">Löschen</button>
+      </form>
+      </td>
+    </tr>
+    {% endfor %}
+  </tbody>
 </table>
 
-<script>
-function enableSwitchEdit(btn) {
-    const row = btn.closest('tr');
-    // Inputs aktivieren
-    row.querySelectorAll('input').forEach(el => el.disabled = false);
-    row.querySelector('.btn-primary').classList.remove('d-none'); // Speichern sichtbar
-    btn.classList.add('d-none'); // Bearbeiten ausblenden
-}
-</script>
-
 {% endblock %}
-- 
2.49.1


From 81afc821900220cc36b9ad74098d1c409df07015 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 18:22:04 +0200
Subject: [PATCH 055/144] srv/poe_manager/templates/switche.html aktualisiert

---
 srv/poe_manager/templates/switche.html | 151 +++++++++++++++++--------
 1 file changed, 104 insertions(+), 47 deletions(-)

diff --git a/srv/poe_manager/templates/switche.html b/srv/poe_manager/templates/switche.html
index c084fc1..b3c2096 100644
--- a/srv/poe_manager/templates/switche.html
+++ b/srv/poe_manager/templates/switche.html
@@ -1,55 +1,112 @@
 {% extends "base.html" %}
 {% block content %}
+<h2>Switch Verwaltung</h2>
 
-<h2>Switch-Verwaltung</h2>
+<!-- Button zum Hinzufügen -->
+<button class="btn btn-primary mb-3" data-bs-toggle="modal" data-bs-target="#addSwitchModal">Neuen Switch hinzufügen</button>
 
-<!-- Hinzufügen -->
-<form method="post" class="mb-3">
-  <input type="hidden" name="add_switch" value="1">
-  <div class="row g-2">
-    <div class="col"><input class="form-control" name="hostname" placeholder="Hostname" required></div>
-    <div class="col"><input class="form-control" name="ip" placeholder="IP-Adresse" required></div>
-    <div class="col"><input class="form-control" name="username" placeholder="Benutzername" required></div>
-    <div class="col"><input class="form-control" name="password" type="password" placeholder="Passwort" required></div>
-    <div class="col-auto">
-      <button class="btn btn-primary">Hinzufügen</button>
-    </div>
-  </div>
-</form>
+<table class="table table-striped align-middle">
+    <thead>
+        <tr>
+            <th>Hostname</th>
+            <th>IP-Adresse</th>
+            <th>Username</th>
+            <th>Aktionen</th>
+        </tr>
+    </thead>
+    <tbody>
+        {% for s in switches %}
+        <tr>
+            <td>{{ s['hostname'] }}</td>
+            <td>{{ s['ip'] }}</td>
+            <td>{{ s['username'] }}</td>
+            <td>
+                <!-- Bearbeiten -->
+                <button class="btn btn-sm btn-warning" data-bs-toggle="modal" data-bs-target="#editSwitchModal{{ loop.index }}">Bearbeiten</button>
 
-<!-- Switch-Liste -->
-<table class="table table-striped table-hover align-middle">
-  <thead>
-    <tr>
-      <th>Hostname</th>
-      <th>IP-Adresse</th>
-      <th>Benutzername</th>
-      <th>Aktionen</th>
-    </tr>
-  </thead>
-  <tbody>
-    {% for s in switches %}
-    <tr>
-      <form method="post">
-        <input type="hidden" name="edit_switch" value="1">
-        <input type="hidden" name="old_hostname" value="{{ s['hostname'] }}">
-        <td><input class="form-control form-control-sm" name="hostname" value="{{ s['hostname'] }}"></td>
-        <td><input class="form-control form-control-sm" name="ip" value="{{ s['ip'] }}"></td>
-        <td><input class="form-control form-control-sm" name="username" value="{{ s['username'] }}"></td>
-        <td>
-          <div class="d-flex gap-1">
-            <input type="password" class="form-control form-control-sm" name="password" placeholder="Neues Passwort">
-            <button class="btn btn-sm btn-success">Speichern</button>
-          </div>
-      </form>
-      <form method="post" style="display:inline;">
-        <input type="hidden" name="delete_switch" value="{{ s['hostname'] }}">
-        <button class="btn btn-sm btn-danger ms-1">Löschen</button>
-      </form>
-      </td>
-    </tr>
-    {% endfor %}
-  </tbody>
+                <!-- Löschen -->
+                <form method="post" style="display:inline;">
+                    <input type="hidden" name="delete_switch" value="{{ s['hostname'] }}">
+                    <button class="btn btn-sm btn-danger" type="submit">Löschen</button>
+                </form>
+            </td>
+        </tr>
+
+        <!-- Bearbeiten Modal -->
+        <div class="modal fade" id="editSwitchModal{{ loop.index }}" tabindex="-1">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title text-dark">Switch bearbeiten</h5>
+                        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+                    </div>
+                    <form method="post">
+                        <div class="modal-body">
+                            <input type="hidden" name="edit_switch" value="1">
+                            <input type="hidden" name="old_hostname" value="{{ s['hostname'] }}">
+                            <div class="mb-3">
+                                <label class="form-label">Hostname</label>
+                                <input type="text" name="hostname" class="form-control" value="{{ s['hostname'] }}" required>
+                            </div>
+                            <div class="mb-3">
+                                <label class="form-label">IP-Adresse</label>
+                                <input type="text" name="ip" class="form-control" value="{{ s['ip'] }}" required>
+                            </div>
+                            <div class="mb-3">
+                                <label class="form-label">Username</label>
+                                <input type="text" name="username" class="form-control" value="{{ s['username'] }}" required>
+                            </div>
+                            <div class="mb-3">
+                                <label class="form-label">Passwort</label>
+                                <input type="password" name="password" class="form-control" placeholder="Neues Passwort eingeben (optional)">
+                            </div>
+                        </div>
+                        <div class="modal-footer">
+                            <button class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+                            <button class="btn btn-success" type="submit">Speichern</button>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+        {% endfor %}
+    </tbody>
 </table>
 
+<!-- Hinzufügen Modal -->
+<div class="modal fade" id="addSwitchModal" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title text-dark">Neuen Switch hinzufügen</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+            </div>
+            <form method="post">
+                <div class="modal-body">
+                    <input type="hidden" name="add_switch" value="1">
+                    <div class="mb-3">
+                        <label class="form-label">Hostname</label>
+                        <input type="text" name="hostname" class="form-control" required>
+                    </div>
+                    <div class="mb-3">
+                        <label class="form-label">IP-Adresse</label>
+                        <input type="text" name="ip" class="form-control" required>
+                    </div>
+                    <div class="mb-3">
+                        <label class="form-label">Username</label>
+                        <input type="text" name="username" class="form-control" required>
+                    </div>
+                    <div class="mb-3">
+                        <label class="form-label">Passwort</label>
+                        <input type="password" name="password" class="form-control" required>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+                    <button class="btn btn-primary" type="submit">Hinzufügen</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
 {% endblock %}
-- 
2.49.1


From 0d569dcd1bfabebfd1aebc0225431550c1324746 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 18:23:21 +0200
Subject: [PATCH 056/144] srv/poe_manager/templates/switche.html aktualisiert

---
 srv/poe_manager/templates/switche.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/switche.html b/srv/poe_manager/templates/switche.html
index b3c2096..6bb2e48 100644
--- a/srv/poe_manager/templates/switche.html
+++ b/srv/poe_manager/templates/switche.html
@@ -3,7 +3,7 @@
 <h2>Switch Verwaltung</h2>
 
 <!-- Button zum Hinzufügen -->
-<button class="btn btn-primary mb-3" data-bs-toggle="modal" data-bs-target="#addSwitchModal">Neuen Switch hinzufügen</button>
+<button class="btn btn-success mb-3" data-bs-toggle="modal" data-bs-target="#addSwitchModal">Neuen Switch hinzufügen</button>
 
 <table class="table table-striped align-middle">
     <thead>
-- 
2.49.1


From b00d55e1ad3e028ecf58967c296442921565ac12 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 18:23:54 +0200
Subject: [PATCH 057/144] srv/poe_manager/templates/devices.html aktualisiert

---
 srv/poe_manager/templates/devices.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/devices.html b/srv/poe_manager/templates/devices.html
index 14cd2ab..39bb8b5 100644
--- a/srv/poe_manager/templates/devices.html
+++ b/srv/poe_manager/templates/devices.html
@@ -5,7 +5,7 @@
 
 {% if current_user.is_admin %}
 <!-- Neues Gerät hinzufügen -->
-<button class="btn btn-success mb-3" data-bs-toggle="modal" data-bs-target="#deviceModal" onclick="openDeviceModal()">Neues Gerät</button>
+<button class="btn btn-success mb-3" data-bs-toggle="modal" data-bs-target="#deviceModal" onclick="openDeviceModal()">Neues Gerät hinzufügen</button>
 {% endif %}
 
 <table class="table table-bordered">
-- 
2.49.1


From 1e03dad68f2ae8f5ad87d2e9e8161c6e68c84039 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 18:24:07 +0200
Subject: [PATCH 058/144] srv/poe_manager/templates/switche.html aktualisiert

---
 srv/poe_manager/templates/switche.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/switche.html b/srv/poe_manager/templates/switche.html
index 6bb2e48..cf2ca67 100644
--- a/srv/poe_manager/templates/switche.html
+++ b/srv/poe_manager/templates/switche.html
@@ -5,7 +5,7 @@
 <!-- Button zum Hinzufügen -->
 <button class="btn btn-success mb-3" data-bs-toggle="modal" data-bs-target="#addSwitchModal">Neuen Switch hinzufügen</button>
 
-<table class="table table-striped align-middle">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th>Hostname</th>
-- 
2.49.1


From a29c46345d3fe9cf96dad05f204c479e5f33d5dd Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 18:24:59 +0200
Subject: [PATCH 059/144] srv/poe_manager/templates/switche.html aktualisiert

---
 srv/poe_manager/templates/switche.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/switche.html b/srv/poe_manager/templates/switche.html
index cf2ca67..14c2c6a 100644
--- a/srv/poe_manager/templates/switche.html
+++ b/srv/poe_manager/templates/switche.html
@@ -22,7 +22,7 @@
             <td>{{ s['username'] }}</td>
             <td>
                 <!-- Bearbeiten -->
-                <button class="btn btn-sm btn-warning" data-bs-toggle="modal" data-bs-target="#editSwitchModal{{ loop.index }}">Bearbeiten</button>
+                <button class="btn btn-secondary btn-sm button login white" data-bs-toggle="modal" data-bs-target="#editSwitchModal{{ loop.index }}">Bearbeiten</button>
 
                 <!-- Löschen -->
                 <form method="post" style="display:inline;">
-- 
2.49.1


From 38ad40204851cd294f9f65057dfc512ff9b588df Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 18:27:25 +0200
Subject: [PATCH 060/144] srv/poe_manager/templates/switche.html aktualisiert

---
 srv/poe_manager/templates/switche.html | 56 ++++++++++++++++++++++----
 1 file changed, 48 insertions(+), 8 deletions(-)

diff --git a/srv/poe_manager/templates/switche.html b/srv/poe_manager/templates/switche.html
index 14c2c6a..12fc940 100644
--- a/srv/poe_manager/templates/switche.html
+++ b/srv/poe_manager/templates/switche.html
@@ -3,9 +3,9 @@
 <h2>Switch Verwaltung</h2>
 
 <!-- Button zum Hinzufügen -->
-<button class="btn btn-success mb-3" data-bs-toggle="modal" data-bs-target="#addSwitchModal">Neuen Switch hinzufügen</button>
+<button class="btn btn-primary mb-3" data-bs-toggle="modal" data-bs-target="#addSwitchModal">Neuen Switch hinzufügen</button>
 
-<table class="table table-bordered">
+<table class="table table-striped align-middle">
     <thead>
         <tr>
             <th>Hostname</th>
@@ -22,7 +22,7 @@
             <td>{{ s['username'] }}</td>
             <td>
                 <!-- Bearbeiten -->
-                <button class="btn btn-secondary btn-sm button login white" data-bs-toggle="modal" data-bs-target="#editSwitchModal{{ loop.index }}">Bearbeiten</button>
+                <button class="btn btn-sm btn-warning" data-bs-toggle="modal" data-bs-target="#editSwitchModal{{ loop.index }}">Bearbeiten</button>
 
                 <!-- Löschen -->
                 <form method="post" style="display:inline;">
@@ -40,7 +40,7 @@
                         <h5 class="modal-title text-dark">Switch bearbeiten</h5>
                         <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                     </div>
-                    <form method="post">
+                    <form method="post" onsubmit="return validatePassword('{{ loop.index }}', true)">
                         <div class="modal-body">
                             <input type="hidden" name="edit_switch" value="1">
                             <input type="hidden" name="old_hostname" value="{{ s['hostname'] }}">
@@ -57,8 +57,13 @@
                                 <input type="text" name="username" class="form-control" value="{{ s['username'] }}" required>
                             </div>
                             <div class="mb-3">
-                                <label class="form-label">Passwort</label>
-                                <input type="password" name="password" class="form-control" placeholder="Neues Passwort eingeben (optional)">
+                                <label class="form-label">Neues Passwort</label>
+                                <input type="password" id="password_edit_{{ loop.index }}" name="password" class="form-control" placeholder="Neues Passwort (optional)">
+                            </div>
+                            <div class="mb-3">
+                                <label class="form-label">Passwort bestätigen</label>
+                                <input type="password" id="password_confirm_edit_{{ loop.index }}" name="password_confirm" class="form-control" placeholder="Bestätigen">
+                                <div class="invalid-feedback">Passwörter stimmen nicht überein!</div>
                             </div>
                         </div>
                         <div class="modal-footer">
@@ -81,7 +86,7 @@
                 <h5 class="modal-title text-dark">Neuen Switch hinzufügen</h5>
                 <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
             </div>
-            <form method="post">
+            <form method="post" onsubmit="return validatePassword('add', false)">
                 <div class="modal-body">
                     <input type="hidden" name="add_switch" value="1">
                     <div class="mb-3">
@@ -98,7 +103,12 @@
                     </div>
                     <div class="mb-3">
                         <label class="form-label">Passwort</label>
-                        <input type="password" name="password" class="form-control" required>
+                        <input type="password" id="password_add" name="password" class="form-control" required>
+                    </div>
+                    <div class="mb-3">
+                        <label class="form-label">Passwort bestätigen</label>
+                        <input type="password" id="password_confirm_add" name="password_confirm" class="form-control" required>
+                        <div class="invalid-feedback">Passwörter stimmen nicht überein!</div>
                     </div>
                 </div>
                 <div class="modal-footer">
@@ -109,4 +119,34 @@
         </div>
     </div>
 </div>
+
+<!-- JS: Passwortvalidierung -->
+<script>
+function validatePassword(id, isEdit) {
+    let pass = document.getElementById(isEdit ? `password_edit_${id}` : `password_${id}`) || document.getElementById('password_add');
+    let confirm = document.getElementById(isEdit ? `password_confirm_edit_${id}` : `password_confirm_${id}`) || document.getElementById('password_confirm_add');
+
+    if (!pass || !confirm) return true;
+    if (pass.value !== confirm.value) {
+        confirm.classList.add("is-invalid");
+        return false;
+    } else {
+        confirm.classList.remove("is-invalid");
+        return true;
+    }
+}
+
+// Live-Feedback beim Tippen
+document.addEventListener('input', e => {
+    if (e.target.id.startsWith('password_confirm')) {
+        const id = e.target.id.replace('password_confirm_', '');
+        const pass = document.getElementById('password_' + id);
+        if (pass && pass.value !== e.target.value) {
+            e.target.classList.add('is-invalid');
+        } else {
+            e.target.classList.remove('is-invalid');
+        }
+    }
+});
+</script>
 {% endblock %}
-- 
2.49.1


From 5cdb336e4ad1106b4e4557d6b1651ee4be4f15ce Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 18:28:01 +0200
Subject: [PATCH 061/144] srv/poe_manager/templates/switche.html aktualisiert

---
 srv/poe_manager/templates/switche.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srv/poe_manager/templates/switche.html b/srv/poe_manager/templates/switche.html
index 12fc940..b342123 100644
--- a/srv/poe_manager/templates/switche.html
+++ b/srv/poe_manager/templates/switche.html
@@ -5,7 +5,7 @@
 <!-- Button zum Hinzufügen -->
 <button class="btn btn-primary mb-3" data-bs-toggle="modal" data-bs-target="#addSwitchModal">Neuen Switch hinzufügen</button>
 
-<table class="table table-striped align-middle">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th>Hostname</th>
@@ -22,7 +22,7 @@
             <td>{{ s['username'] }}</td>
             <td>
                 <!-- Bearbeiten -->
-                <button class="btn btn-sm btn-warning" data-bs-toggle="modal" data-bs-target="#editSwitchModal{{ loop.index }}">Bearbeiten</button>
+                <button class="btn btn-sm button login" data-bs-toggle="modal" data-bs-target="#editSwitchModal{{ loop.index }}">Bearbeiten</button>
 
                 <!-- Löschen -->
                 <form method="post" style="display:inline;">
-- 
2.49.1


From 4b25d4dcf64b761877fe2a74fdeeb4562ce322b3 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 18:28:18 +0200
Subject: [PATCH 062/144] srv/poe_manager/templates/switche.html aktualisiert

---
 srv/poe_manager/templates/switche.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/switche.html b/srv/poe_manager/templates/switche.html
index b342123..6d6461d 100644
--- a/srv/poe_manager/templates/switche.html
+++ b/srv/poe_manager/templates/switche.html
@@ -22,7 +22,7 @@
             <td>{{ s['username'] }}</td>
             <td>
                 <!-- Bearbeiten -->
-                <button class="btn btn-sm button login" data-bs-toggle="modal" data-bs-target="#editSwitchModal{{ loop.index }}">Bearbeiten</button>
+                <button class="btn btn-sm button login white" data-bs-toggle="modal" data-bs-target="#editSwitchModal{{ loop.index }}">Bearbeiten</button>
 
                 <!-- Löschen -->
                 <form method="post" style="display:inline;">
-- 
2.49.1


From 11857b224a259aebce978f9dd3b1dabe3c41f16f Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 18:28:51 +0200
Subject: [PATCH 063/144] srv/poe_manager/templates/switche.html aktualisiert

---
 srv/poe_manager/templates/switche.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/switche.html b/srv/poe_manager/templates/switche.html
index 6d6461d..f635ef6 100644
--- a/srv/poe_manager/templates/switche.html
+++ b/srv/poe_manager/templates/switche.html
@@ -3,7 +3,7 @@
 <h2>Switch Verwaltung</h2>
 
 <!-- Button zum Hinzufügen -->
-<button class="btn btn-primary mb-3" data-bs-toggle="modal" data-bs-target="#addSwitchModal">Neuen Switch hinzufügen</button>
+<button class="btn btn-success mb-3" data-bs-toggle="modal" data-bs-target="#addSwitchModal">Neuen Switch hinzufügen</button>
 
 <table class="table table-bordered">
     <thead>
-- 
2.49.1


From 2d74cbce101c0e9318978a674dedeb9301d6e031 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 18:29:46 +0200
Subject: [PATCH 064/144] srv/poe_manager/templates/switche.html aktualisiert

---
 srv/poe_manager/templates/switche.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/switche.html b/srv/poe_manager/templates/switche.html
index f635ef6..225a3d8 100644
--- a/srv/poe_manager/templates/switche.html
+++ b/srv/poe_manager/templates/switche.html
@@ -68,7 +68,7 @@
                         </div>
                         <div class="modal-footer">
                             <button class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
-                            <button class="btn btn-success" type="submit">Speichern</button>
+                            <button class="btn button login white" type="submit">Speichern</button>
                         </div>
                     </form>
                 </div>
-- 
2.49.1


From 02f9445f42c50684b419f0af9a76d88edbc490d3 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 18:30:41 +0200
Subject: [PATCH 065/144] srv/poe_manager/templates/switche.html aktualisiert

---
 srv/poe_manager/templates/switche.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/switche.html b/srv/poe_manager/templates/switche.html
index 225a3d8..a955258 100644
--- a/srv/poe_manager/templates/switche.html
+++ b/srv/poe_manager/templates/switche.html
@@ -113,7 +113,7 @@
                 </div>
                 <div class="modal-footer">
                     <button class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
-                    <button class="btn btn-primary" type="submit">Hinzufügen</button>
+                    <button class="btn button login white" type="submit">Hinzufügen</button>
                 </div>
             </form>
         </div>
-- 
2.49.1


From d33c56776986c1d7a0fa9cf7d351eefd8a790959 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 22:49:23 +0200
Subject: [PATCH 066/144] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index cf76918..4559db0 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -201,10 +201,10 @@ def devices():
             rpi_ip = request.form.get('rpi_ip')
             port = request.form.get('port')
             name = request.form.get('name')
-            switch_hostname = request.form.get('switch_hostname')
+            switch_hostname = request.form.get('switch_hostname') or None
             is_active = 1 if 'is_active' in request.form else 0
 
-            if not all([old_mac, mac, rpi_ip, port, name, switch_hostname]):
+            if not all([old_mac, mac, rpi_ip, port, name]):
                 flash("Alle Felder müssen ausgefüllt sein!")
                 return redirect(url_for('devices'))
 
@@ -223,9 +223,9 @@ def devices():
             try:
                 conn.execute("""
                     UPDATE devices
-                    SET mac=?, rpi_ip=?, port=?, name=?, switch_hostname=?, is_active=?
+                    SET mac=?, rpi_ip=?, port=?, name=?, is_active=?
                     WHERE mac=?
-                """, (mac, rpi_ip, port, name, switch_hostname, is_active, old_mac))
+                """, (mac, rpi_ip, port, name, is_active, old_mac))
                 conn.commit()
                 flash(f"Gerät {name} aktualisiert.")
             except sqlite3.IntegrityError:
-- 
2.49.1


From 0fd53990e6fe0cd05359e2a5209027a322dda8ed Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 22:53:14 +0200
Subject: [PATCH 067/144] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 4559db0..1f071d6 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -204,6 +204,21 @@ def devices():
             switch_hostname = request.form.get('switch_hostname') or None
             is_active = 1 if 'is_active' in request.form else 0
 
+        # --- Prüfen, ob es sich um eine Switch-Änderung handelt ---
+        if mac is None and rpi_ip is None and port is None and name is None and switch_hostname:
+            # Nur den Switch ändern
+            try:
+                conn.execute("""
+                    UPDATE devices
+                    SET switch_hostname=?
+                    WHERE mac=?
+                """, (switch_hostname, old_mac))
+                conn.commit()
+                flash("Switch wurde geändert.")
+            except sqlite3.IntegrityError:
+                flash("Fehler beim Ändern des Switch!")
+            return redirect(url_for('devices'))
+
             if not all([old_mac, mac, rpi_ip, port, name]):
                 flash("Alle Felder müssen ausgefüllt sein!")
                 return redirect(url_for('devices'))
-- 
2.49.1


From cce1de034a211b7288abf7eba3811657f7ba05c8 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 22:59:00 +0200
Subject: [PATCH 068/144] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 1f071d6..9dda1aa 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -207,6 +207,15 @@ def devices():
         # --- Prüfen, ob es sich um eine Switch-Änderung handelt ---
         if mac is None and rpi_ip is None and port is None and name is None and switch_hostname:
             # Nur den Switch ändern
+            device = conn.execute("SELECT name, switch_hostname FROM devices WHERE mac=?", (old_mac,)).fetchone()
+
+            if not device:
+                flash("Gerät nicht gefunden!")
+                return redirect(url_for('devices'))
+
+            old_switch = device['switch_hostname'] or "unbekannt"
+            device_name = device['name']
+
             try:
                 conn.execute("""
                     UPDATE devices
@@ -214,7 +223,7 @@ def devices():
                     WHERE mac=?
                 """, (switch_hostname, old_mac))
                 conn.commit()
-                flash("Switch wurde geändert.")
+                flash(f"Switch von '{device_name}' geändert: {old_switch} → {switch_hostname}")
             except sqlite3.IntegrityError:
                 flash("Fehler beim Ändern des Switch!")
             return redirect(url_for('devices'))
-- 
2.49.1


From 1a5ba7b0aed19e9ee5875d399252b19c0990e82e Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 23:00:47 +0200
Subject: [PATCH 069/144] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 9dda1aa..a6624aa 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -223,7 +223,7 @@ def devices():
                     WHERE mac=?
                 """, (switch_hostname, old_mac))
                 conn.commit()
-                flash(f"Switch von '{device_name}' geändert: {old_switch} → {switch_hostname}")
+                flash(f"Switch von {device_name} geändert: {old_switch} → {switch_hostname}")
             except sqlite3.IntegrityError:
                 flash("Fehler beim Ändern des Switch!")
             return redirect(url_for('devices'))
-- 
2.49.1


From aa8facfe28c379f0952a5a4605654bd7fd0c450f Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 23:05:56 +0200
Subject: [PATCH 070/144] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index a6624aa..3d19ac7 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -329,7 +329,6 @@ def toggle_device(mac):
     flash(f"Gerät '{device['name']}' wurde {status_text}.")
     return redirect(url_for('devices'))
 
-
 @app.route('/switches', methods=['GET', 'POST'])
 @login_required
 def switches():
@@ -373,20 +372,27 @@ def switches():
         except sqlite3.IntegrityError:
             flash("Hostname existiert bereits oder Eingabefehler!")
 
-    # Inline-Delete
-    if request.method == 'POST' and 'delete_switch' in request.form:
-        if not current_user.is_admin:
-            flash("Zugriff verweigert!")
-            return redirect(url_for('switches'))
-        del_hostname = request.form['delete_switch']
-        conn.execute("UPDATE devices SET switch_hostname=NULL WHERE switch_hostname=?", (del_hostname,))
-        conn.execute("DELETE FROM switches WHERE hostname=?", (del_hostname,))
-        conn.commit()
-        flash(f"Switch {del_hostname} gelöscht.")
+@app.route('/switches/delete/<int:id>', methods=['POST'])
+def delete_switch(id):
+    switch = Switch.query.get_or_404(id)
+    # Prüfen, ob noch Geräte diesem Switch zugeordnet sind
+    assigned_devices = Device.query.filter_by(switch_hostname=switch.hostname).all()
 
-    switches = conn.execute("SELECT hostname, ip, username FROM switches").fetchall()
-    conn.close()
-    return render_template('switche.html', switches=switches)
+    if assigned_devices:
+        # Liste der Gerätenamen
+        device_names = [d.hostname for d in assigned_devices]
+        flash(f"Folgende Geräte sind noch dem Switch '{switch.hostname}' zugewiesen: {', '.join(device_names)}", "danger")
+        return redirect(url_for('switches'))
+
+    try:
+        db.session.delete(switch)
+        db.session.commit()
+        flash(f"Switch '{switch.hostname}' wurde gelöscht.", "success")
+    except Exception as e:
+        db.session.rollback()
+        flash(f"Fehler beim Löschen des Switches: {e}", "danger")
+
+    return redirect(url_for('switches'))
 
 @app.route("/get_log")
 @login_required
-- 
2.49.1


From 8d0bdeb93601fff5eb63eb8ce1c74680e22e2912 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 23:08:07 +0200
Subject: [PATCH 071/144] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 3d19ac7..c21c30d 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -372,6 +372,10 @@ def switches():
         except sqlite3.IntegrityError:
             flash("Hostname existiert bereits oder Eingabefehler!")
 
+    switches = conn.execute("SELECT hostname, ip, username FROM switches").fetchall()
+    conn.close()
+    return render_template('switche.html', switches=switches)
+
 @app.route('/switches/delete/<int:id>', methods=['POST'])
 def delete_switch(id):
     switch = Switch.query.get_or_404(id)
-- 
2.49.1


From a644de01ad9aa0627881d5f7a1010ada5be0785e Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 23:09:01 +0200
Subject: [PATCH 072/144] srv/poe_manager/templates/switche.html aktualisiert

---
 srv/poe_manager/templates/switche.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srv/poe_manager/templates/switche.html b/srv/poe_manager/templates/switche.html
index a955258..4afcc0c 100644
--- a/srv/poe_manager/templates/switche.html
+++ b/srv/poe_manager/templates/switche.html
@@ -25,9 +25,10 @@
                 <button class="btn btn-sm button login white" data-bs-toggle="modal" data-bs-target="#editSwitchModal{{ loop.index }}">Bearbeiten</button>
 
                 <!-- Löschen -->
-                <form method="post" style="display:inline;">
-                    <input type="hidden" name="delete_switch" value="{{ s['hostname'] }}">
-                    <button class="btn btn-sm btn-danger" type="submit">Löschen</button>
+                <form method="post" action="{{ url_for('delete_switch', hostname=sw['hostname']) }}" style="display:inline;">
+                    <button class="btn btn-danger btn-sm" onclick="return confirm('Willst du den Switch wirklich löschen?');">
+                        Löschen
+                    </button>
                 </form>
             </td>
         </tr>
-- 
2.49.1


From 0e80925a1154c3e46c394af10891a11e48136904 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 23:12:32 +0200
Subject: [PATCH 073/144] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index c21c30d..31d0fe5 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -376,26 +376,21 @@ def switches():
     conn.close()
     return render_template('switche.html', switches=switches)
 
-@app.route('/switches/delete/<int:id>', methods=['POST'])
-def delete_switch(id):
-    switch = Switch.query.get_or_404(id)
-    # Prüfen, ob noch Geräte diesem Switch zugeordnet sind
-    assigned_devices = Device.query.filter_by(switch_hostname=switch.hostname).all()
-
-    if assigned_devices:
-        # Liste der Gerätenamen
-        device_names = [d.hostname for d in assigned_devices]
-        flash(f"Folgende Geräte sind noch dem Switch '{switch.hostname}' zugewiesen: {', '.join(device_names)}", "danger")
+@app.route('/switches/delete/<hostname>', methods=['POST'])
+@login_required
+def delete_switch(hostname):
+    conn = get_db_connection()
+    devices = conn.execute("SELECT name FROM devices WHERE switch_hostname=?", (hostname,)).fetchall()
+    if devices:
+        device_names = [d['name'] for d in devices]
+        flash(f"Folgende Geräte sind noch dem Switch '{hostname}' zugewiesen: {', '.join(device_names)}", "danger")
+        conn.close()
         return redirect(url_for('switches'))
 
-    try:
-        db.session.delete(switch)
-        db.session.commit()
-        flash(f"Switch '{switch.hostname}' wurde gelöscht.", "success")
-    except Exception as e:
-        db.session.rollback()
-        flash(f"Fehler beim Löschen des Switches: {e}", "danger")
-
+    conn.execute("DELETE FROM switches WHERE hostname=?", (hostname,))
+    conn.commit()
+    conn.close()
+    flash(f"Switch '{hostname}' gelöscht.", "success")
     return redirect(url_for('switches'))
 
 @app.route("/get_log")
-- 
2.49.1


From 738b7f9cb0a2c8afea56e0eb4684ee61d6419b69 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 23:16:01 +0200
Subject: [PATCH 074/144] srv/poe_manager/templates/switche.html aktualisiert

---
 srv/poe_manager/templates/switche.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srv/poe_manager/templates/switche.html b/srv/poe_manager/templates/switche.html
index 4afcc0c..7d0da11 100644
--- a/srv/poe_manager/templates/switche.html
+++ b/srv/poe_manager/templates/switche.html
@@ -25,8 +25,9 @@
                 <button class="btn btn-sm button login white" data-bs-toggle="modal" data-bs-target="#editSwitchModal{{ loop.index }}">Bearbeiten</button>
 
                 <!-- Löschen -->
-                <form method="post" action="{{ url_for('delete_switch', hostname=sw['hostname']) }}" style="display:inline;">
-                    <button class="btn btn-danger btn-sm" onclick="return confirm('Willst du den Switch wirklich löschen?');">
+                <form method="post" style="display:inline;">
+                    <input type="hidden" name="delete_switch" value="{{ d['hostname'] }}">
+                    <button class="btn btn-danger btn-sm" onclick="return confirm('Willst du das Gerät wirklich löschen?');">
                         Löschen
                     </button>
                 </form>
-- 
2.49.1


From 6529fd4643ece2f409d0fa955ab12ae29452bafe Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 23:19:00 +0200
Subject: [PATCH 075/144] srv/poe_manager/templates/switche.html aktualisiert

---
 srv/poe_manager/templates/switche.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srv/poe_manager/templates/switche.html b/srv/poe_manager/templates/switche.html
index 7d0da11..a15f82b 100644
--- a/srv/poe_manager/templates/switche.html
+++ b/srv/poe_manager/templates/switche.html
@@ -25,9 +25,8 @@
                 <button class="btn btn-sm button login white" data-bs-toggle="modal" data-bs-target="#editSwitchModal{{ loop.index }}">Bearbeiten</button>
 
                 <!-- Löschen -->
-                <form method="post" style="display:inline;">
-                    <input type="hidden" name="delete_switch" value="{{ d['hostname'] }}">
-                    <button class="btn btn-danger btn-sm" onclick="return confirm('Willst du das Gerät wirklich löschen?');">
+                <form method="post" action="{{ url_for('delete_switch', hostname=sw['hostname']) }}" style="display:inline;">		                <form method="post" style="display:inline;">
+                    <button class="btn btn-danger btn-sm" onclick="return confirm('Willst du den Switch wirklich löschen?');">
                         Löschen
                     </button>
                 </form>
-- 
2.49.1


From ca86166c5de9a71f848087b94d3be35ab5efc3ab Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 23:20:23 +0200
Subject: [PATCH 076/144] srv/poe_manager/templates/switche.html aktualisiert

---
 srv/poe_manager/templates/switche.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/switche.html b/srv/poe_manager/templates/switche.html
index a15f82b..1e4a2fa 100644
--- a/srv/poe_manager/templates/switche.html
+++ b/srv/poe_manager/templates/switche.html
@@ -25,7 +25,7 @@
                 <button class="btn btn-sm button login white" data-bs-toggle="modal" data-bs-target="#editSwitchModal{{ loop.index }}">Bearbeiten</button>
 
                 <!-- Löschen -->
-                <form method="post" action="{{ url_for('delete_switch', hostname=sw['hostname']) }}" style="display:inline;">		                <form method="post" style="display:inline;">
+                <form method="post" action="{{ url_for('delete_switch', hostname=s['hostname']) }}" style="display:inline;">		                <form method="post" style="display:inline;">
                     <button class="btn btn-danger btn-sm" onclick="return confirm('Willst du den Switch wirklich löschen?');">
                         Löschen
                     </button>
-- 
2.49.1


From cc40ae62761c1a9b326e27227361002dd7d4a4fa Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 23:21:16 +0200
Subject: [PATCH 077/144] srv/poe_manager/templates/switche.html aktualisiert

---
 srv/poe_manager/templates/switche.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/switche.html b/srv/poe_manager/templates/switche.html
index 1e4a2fa..35ef649 100644
--- a/srv/poe_manager/templates/switche.html
+++ b/srv/poe_manager/templates/switche.html
@@ -25,7 +25,7 @@
                 <button class="btn btn-sm button login white" data-bs-toggle="modal" data-bs-target="#editSwitchModal{{ loop.index }}">Bearbeiten</button>
 
                 <!-- Löschen -->
-                <form method="post" action="{{ url_for('delete_switch', hostname=s['hostname']) }}" style="display:inline;">		                <form method="post" style="display:inline;">
+                <form method="post" action="{{ url_for('delete_switch', hostname=s['hostname']) }}" style="display:inline;">		                
                     <button class="btn btn-danger btn-sm" onclick="return confirm('Willst du den Switch wirklich löschen?');">
                         Löschen
                     </button>
-- 
2.49.1


From c4708bbb190ff94ef5cb0b97571a4d50a3a57986 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Tue, 7 Oct 2025 23:21:49 +0200
Subject: [PATCH 078/144] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 31d0fe5..65e149b 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -383,7 +383,7 @@ def delete_switch(hostname):
     devices = conn.execute("SELECT name FROM devices WHERE switch_hostname=?", (hostname,)).fetchall()
     if devices:
         device_names = [d['name'] for d in devices]
-        flash(f"Folgende Geräte sind noch dem Switch '{hostname}' zugewiesen: {', '.join(device_names)}", "danger")
+        flash(f"Folgende Geräte sind noch dem Switch {hostname} zugewiesen: {', '.join(device_names)}", "danger")
         conn.close()
         return redirect(url_for('switches'))
 
-- 
2.49.1


From 5f0d024a155e68f4cc8ea1d88234d0046ecc598a Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 18:06:25 +0200
Subject: [PATCH 079/144] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 48 +++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 65e149b..33f64fe 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -204,33 +204,33 @@ def devices():
             switch_hostname = request.form.get('switch_hostname') or None
             is_active = 1 if 'is_active' in request.form else 0
 
-        # --- Prüfen, ob es sich um eine Switch-Änderung handelt ---
-        if mac is None and rpi_ip is None and port is None and name is None and switch_hostname:
-            # Nur den Switch ändern
-            device = conn.execute("SELECT name, switch_hostname FROM devices WHERE mac=?", (old_mac,)).fetchone()
+            # --- Prüfen, ob es sich um eine Switch-Änderung handelt ---
+            if mac is None and rpi_ip is None and port is None and name is None and switch_hostname:
+                # Nur den Switch ändern
+                device = conn.execute("SELECT name, switch_hostname FROM devices WHERE mac=?", (old_mac,)).fetchone()
 
-            if not device:
-                flash("Gerät nicht gefunden!")
+                if not device:
+                    flash("Gerät nicht gefunden!")
+                    return redirect(url_for('devices'))
+
+                old_switch = device['switch_hostname'] or "unbekannt"
+                device_name = device['name']
+
+                try:
+                    conn.execute("""
+                        UPDATE devices
+                        SET switch_hostname=?
+                        WHERE mac=?
+                    """, (switch_hostname, old_mac))
+                    conn.commit()
+                    flash(f"Switch von {device_name} geändert: {old_switch} → {switch_hostname}")
+                except sqlite3.IntegrityError:
+                    flash("Fehler beim Ändern des Switch!")
                 return redirect(url_for('devices'))
 
-            old_switch = device['switch_hostname'] or "unbekannt"
-            device_name = device['name']
-
-            try:
-                conn.execute("""
-                    UPDATE devices
-                    SET switch_hostname=?
-                    WHERE mac=?
-                """, (switch_hostname, old_mac))
-                conn.commit()
-                flash(f"Switch von {device_name} geändert: {old_switch} → {switch_hostname}")
-            except sqlite3.IntegrityError:
-                flash("Fehler beim Ändern des Switch!")
-            return redirect(url_for('devices'))
-
-            if not all([old_mac, mac, rpi_ip, port, name]):
-                flash("Alle Felder müssen ausgefüllt sein!")
-                return redirect(url_for('devices'))
+                if not all([old_mac, mac, rpi_ip, port, name]):
+                    flash("Alle Felder müssen ausgefüllt sein!")
+                    return redirect(url_for('devices'))
 
             # Prüfen auf doppelte IP außer das aktuelle Gerät
             ip_device = conn.execute("SELECT name FROM devices WHERE rpi_ip=? AND mac<>?", (rpi_ip, old_mac)).fetchone()
-- 
2.49.1


From f6c539ac8da4e715962b1563cfa5acf00524d939 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 18:14:34 +0200
Subject: [PATCH 080/144] srv/poe_manager/templates/devices.html aktualisiert

---
 srv/poe_manager/templates/devices.html | 38 ++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/srv/poe_manager/templates/devices.html b/srv/poe_manager/templates/devices.html
index 39bb8b5..ec3fff1 100644
--- a/srv/poe_manager/templates/devices.html
+++ b/srv/poe_manager/templates/devices.html
@@ -67,7 +67,7 @@
 <div class="modal fade" id="deviceModal" tabindex="-1" aria-hidden="true">
   <div class="modal-dialog">
     <div class="modal-content">
-      <form method="post">
+      <form method="post" onsubmit="return validateIPField(this);">
         <div class="modal-header">
           <h5 class="modal-title black">Neues Gerät hinzufügen</h5>
           <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
@@ -81,6 +81,7 @@
             <div class="mb-3">
                 <label>IP-Adresse</label>
                 <input type="text" name="rpi_ip" class="form-control" required>
+                <div class="invalid-feedback">Bitte eine gültige IP-Adresse eingeben (z. B. 192.168.1.100).</div>
             </div>
             <div class="mb-3">
                 <label>MAC-Adresse</label>
@@ -112,7 +113,7 @@
 <div class="modal fade" id="editDeviceModal" tabindex="-1" aria-hidden="true">
   <div class="modal-dialog">
     <div class="modal-content">
-      <form method="post">
+      <form method="post" onsubmit="return validateIPField(this);">
         <input type="hidden" name="edit_device" value="1">
         <input type="hidden" name="old_mac" id="edit_old_mac">
         <div class="modal-header">
@@ -127,6 +128,7 @@
             <div class="mb-3">
                 <label>IP-Adresse</label>
                 <input type="text" name="rpi_ip" id="edit_ip" class="form-control" required>
+                <div class="invalid-feedback">Bitte eine gültige IP-Adresse eingeben (z. B. 192.168.1.100).</div>
             </div>
             <div class="mb-3">
                 <label>MAC-Adresse</label>
@@ -165,7 +167,7 @@
             </select>
         </div>
         <div class="modal-footer">
-          <button class="btn btn-primarybutton login" type="submit">Speichern</button>
+          <button class="btn btn-primary button login" type="submit">Speichern</button>
           <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
         </div>
       </form>
@@ -190,6 +192,36 @@ function openSwitchModal(mac, switch_hostname) {
     document.getElementById("switch_mac").value = mac;
     document.getElementById("switch_select").value = switch_hostname;
 }
+
+// -------------------
+// IP-Validierung
+// -------------------
+const ipPattern = /^(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}$/;
+
+function validateIP(input) {
+    if (!ipPattern.test(input.value)) {
+        input.classList.add("is-invalid");
+        return false;
+    } else {
+        input.classList.remove("is-invalid");
+        return true;
+    }
+}
+
+function validateIPField(form) {
+    const ipInput = form.querySelector("input[name='rpi_ip']");
+    if (ipInput) {
+        return validateIP(ipInput);
+    }
+    return true;
+}
+
+// Live-Feedback beim Tippen
+document.addEventListener("input", function(e) {
+    if (e.target.name === "rpi_ip") {
+        validateIP(e.target);
+    }
+});
 </script>
 
 {% endblock %}
-- 
2.49.1


From d8a4b17b2871e3bbf6f38b585c63a085148d1dd3 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 18:17:47 +0200
Subject: [PATCH 081/144] srv/poe_manager/templates/devices.html aktualisiert

---
 srv/poe_manager/templates/devices.html | 53 +++++++++++++++++---------
 1 file changed, 35 insertions(+), 18 deletions(-)

diff --git a/srv/poe_manager/templates/devices.html b/srv/poe_manager/templates/devices.html
index ec3fff1..f1db549 100644
--- a/srv/poe_manager/templates/devices.html
+++ b/srv/poe_manager/templates/devices.html
@@ -67,7 +67,7 @@
 <div class="modal fade" id="deviceModal" tabindex="-1" aria-hidden="true">
   <div class="modal-dialog">
     <div class="modal-content">
-      <form method="post" onsubmit="return validateIPField(this);">
+      <form method="post" onsubmit="return validateDeviceForm(this);">
         <div class="modal-header">
           <h5 class="modal-title black">Neues Gerät hinzufügen</h5>
           <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
@@ -76,20 +76,21 @@
             <input type="hidden" name="add_device" value="1">
             <div class="mb-3">
                 <label>Hostname</label>
-                <input type="text" name="name" class="form-control" required>
+                <input type="text" name="name" class="form-control" required placeholder="z.B. Sensor01">
             </div>
             <div class="mb-3">
                 <label>IP-Adresse</label>
-                <input type="text" name="rpi_ip" class="form-control" required>
+                <input type="text" name="rpi_ip" class="form-control" required placeholder="z.B. 192.168.1.100">
                 <div class="invalid-feedback">Bitte eine gültige IP-Adresse eingeben (z. B. 192.168.1.100).</div>
             </div>
             <div class="mb-3">
                 <label>MAC-Adresse</label>
-                <input type="text" name="mac" class="form-control" required>
+                <input type="text" name="mac" class="form-control" required placeholder="z.B. AA:BB:CC:DD:EE:FF">
+                <div class="invalid-feedback">Bitte eine gültige MAC-Adresse eingeben (xx:xx:xx:xx:xx:xx).</div>
             </div>
             <div class="mb-3">
                 <label>Port</label>
-                <input type="text" name="port" class="form-control" required>
+                <input type="text" name="port" class="form-control" required placeholder="z.B. 3">
             </div>
             <div class="mb-3">
                 <label>Switch</label>
@@ -113,7 +114,7 @@
 <div class="modal fade" id="editDeviceModal" tabindex="-1" aria-hidden="true">
   <div class="modal-dialog">
     <div class="modal-content">
-      <form method="post" onsubmit="return validateIPField(this);">
+      <form method="post" onsubmit="return validateDeviceForm(this);">
         <input type="hidden" name="edit_device" value="1">
         <input type="hidden" name="old_mac" id="edit_old_mac">
         <div class="modal-header">
@@ -123,20 +124,21 @@
         <div class="modal-body">
             <div class="mb-3">
                 <label>Hostname</label>
-                <input type="text" name="name" id="edit_name" class="form-control" required>
+                <input type="text" name="name" id="edit_name" class="form-control" required placeholder="z.B. Sensor01">
             </div>
             <div class="mb-3">
                 <label>IP-Adresse</label>
-                <input type="text" name="rpi_ip" id="edit_ip" class="form-control" required>
+                <input type="text" name="rpi_ip" id="edit_ip" class="form-control" required placeholder="z.B. 192.168.1.100">
                 <div class="invalid-feedback">Bitte eine gültige IP-Adresse eingeben (z. B. 192.168.1.100).</div>
             </div>
             <div class="mb-3">
                 <label>MAC-Adresse</label>
-                <input type="text" name="mac" id="edit_mac" class="form-control" required>
+                <input type="text" name="mac" id="edit_mac" class="form-control" required placeholder="z.B. AA:BB:CC:DD:EE:FF">
+                <div class="invalid-feedback">Bitte eine gültige MAC-Adresse eingeben (xx:xx:xx:xx:xx:xx).</div>
             </div>
             <div class="mb-3">
                 <label>Port</label>
-                <input type="text" name="port" id="edit_port" class="form-control" required>
+                <input type="text" name="port" id="edit_port" class="form-control" required placeholder="z.B. 3">
             </div>
         </div>
         <div class="modal-footer">
@@ -198,6 +200,11 @@ function openSwitchModal(mac, switch_hostname) {
 // -------------------
 const ipPattern = /^(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}$/;
 
+// -------------------
+// MAC-Validierung
+// -------------------
+const macPattern = /^([0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}$/;
+
 function validateIP(input) {
     if (!ipPattern.test(input.value)) {
         input.classList.add("is-invalid");
@@ -208,19 +215,29 @@ function validateIP(input) {
     }
 }
 
-function validateIPField(form) {
-    const ipInput = form.querySelector("input[name='rpi_ip']");
-    if (ipInput) {
-        return validateIP(ipInput);
+function validateMAC(input) {
+    if (!macPattern.test(input.value)) {
+        input.classList.add("is-invalid");
+        return false;
+    } else {
+        input.classList.remove("is-invalid");
+        return true;
     }
-    return true;
+}
+
+function validateDeviceForm(form) {
+    const ipInput = form.querySelector("input[name='rpi_ip']");
+    const macInput = form.querySelector("input[name='mac']");
+    let valid = true;
+    if (ipInput) valid = validateIP(ipInput) && valid;
+    if (macInput) valid = validateMAC(macInput) && valid;
+    return valid;
 }
 
 // Live-Feedback beim Tippen
 document.addEventListener("input", function(e) {
-    if (e.target.name === "rpi_ip") {
-        validateIP(e.target);
-    }
+    if (e.target.name === "rpi_ip") validateIP(e.target);
+    if (e.target.name === "mac") validateMAC(e.target);
 });
 </script>
 
-- 
2.49.1


From 93a93e2289f596781a652445987a1d4a3b5afb62 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 18:22:17 +0200
Subject: [PATCH 082/144] srv/poe_manager/templates/switche.html aktualisiert

---
 srv/poe_manager/templates/switche.html | 50 ++++++++++++++++++++------
 1 file changed, 40 insertions(+), 10 deletions(-)

diff --git a/srv/poe_manager/templates/switche.html b/srv/poe_manager/templates/switche.html
index 35ef649..100e43e 100644
--- a/srv/poe_manager/templates/switche.html
+++ b/srv/poe_manager/templates/switche.html
@@ -41,7 +41,7 @@
                         <h5 class="modal-title text-dark">Switch bearbeiten</h5>
                         <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                     </div>
-                    <form method="post" onsubmit="return validatePassword('{{ loop.index }}', true)">
+                    <form method="post" onsubmit="return validateSwitchForm(this, '{{ loop.index }}')">
                         <div class="modal-body">
                             <input type="hidden" name="edit_switch" value="1">
                             <input type="hidden" name="old_hostname" value="{{ s['hostname'] }}">
@@ -51,7 +51,8 @@
                             </div>
                             <div class="mb-3">
                                 <label class="form-label">IP-Adresse</label>
-                                <input type="text" name="ip" class="form-control" value="{{ s['ip'] }}" required>
+                                <input type="text" name="ip" class="form-control" value="{{ s['ip'] }}" required placeholder="z.B. 192.168.1.100">
+                                <div class="invalid-feedback">Bitte eine gültige IP-Adresse eingeben (z. B. 192.168.1.100).</div>
                             </div>
                             <div class="mb-3">
                                 <label class="form-label">Username</label>
@@ -87,28 +88,29 @@
                 <h5 class="modal-title text-dark">Neuen Switch hinzufügen</h5>
                 <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
             </div>
-            <form method="post" onsubmit="return validatePassword('add', false)">
+            <form method="post" onsubmit="return validateSwitchForm(this, 'add')">
                 <div class="modal-body">
                     <input type="hidden" name="add_switch" value="1">
                     <div class="mb-3">
                         <label class="form-label">Hostname</label>
-                        <input type="text" name="hostname" class="form-control" required>
+                        <input type="text" name="hostname" class="form-control" required placeholder="z.B. Switch01">
                     </div>
                     <div class="mb-3">
                         <label class="form-label">IP-Adresse</label>
-                        <input type="text" name="ip" class="form-control" required>
+                        <input type="text" name="ip" class="form-control" required placeholder="z.B. 192.168.1.100">
+                        <div class="invalid-feedback">Bitte eine gültige IP-Adresse eingeben (z. B. 192.168.1.100).</div>
                     </div>
                     <div class="mb-3">
                         <label class="form-label">Username</label>
-                        <input type="text" name="username" class="form-control" required>
+                        <input type="text" name="username" class="form-control" required placeholder="z.B. admin">
                     </div>
                     <div class="mb-3">
                         <label class="form-label">Passwort</label>
-                        <input type="password" id="password_add" name="password" class="form-control" required>
+                        <input type="password" id="password_add" name="password" class="form-control" required placeholder="z.B. geheim123">
                     </div>
                     <div class="mb-3">
                         <label class="form-label">Passwort bestätigen</label>
-                        <input type="password" id="password_confirm_add" name="password_confirm" class="form-control" required>
+                        <input type="password" id="password_confirm_add" name="password_confirm" class="form-control" required placeholder="Passwort wiederholen">
                         <div class="invalid-feedback">Passwörter stimmen nicht überein!</div>
                     </div>
                 </div>
@@ -121,8 +123,9 @@
     </div>
 </div>
 
-<!-- JS: Passwortvalidierung -->
+<!-- JS: Passwort + IP-Validierung -->
 <script>
+// Passwortcheck
 function validatePassword(id, isEdit) {
     let pass = document.getElementById(isEdit ? `password_edit_${id}` : `password_${id}`) || document.getElementById('password_add');
     let confirm = document.getElementById(isEdit ? `password_confirm_edit_${id}` : `password_confirm_${id}`) || document.getElementById('password_confirm_add');
@@ -137,8 +140,35 @@ function validatePassword(id, isEdit) {
     }
 }
 
-// Live-Feedback beim Tippen
+// -------------------
+// IP-Validierung
+// -------------------
+const ipPattern = /^(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}$/;
+
+function validateIP(input) {
+    if (!ipPattern.test(input.value)) {
+        input.classList.add("is-invalid");
+        return false;
+    } else {
+        input.classList.remove("is-invalid");
+        return true;
+    }
+}
+
+function validateSwitchForm(form, id) {
+    const ipInput = form.querySelector("input[name='ip']");
+    let valid = true;
+    if (ipInput) valid = validateIP(ipInput) && valid;
+
+    // Passwortcheck
+    valid = validatePassword(id, id !== 'add') && valid;
+
+    return valid;
+}
+
+// Live-Feedback IP & Passwort
 document.addEventListener('input', e => {
+    if (e.target.name === "ip") validateIP(e.target);
     if (e.target.id.startsWith('password_confirm')) {
         const id = e.target.id.replace('password_confirm_', '');
         const pass = document.getElementById('password_' + id);
-- 
2.49.1


From 7eec72879630eb9637abe213ea21db5c41e87f73 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 18:25:24 +0200
Subject: [PATCH 083/144] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 33f64fe..ad73b54 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -255,22 +255,6 @@ def devices():
             except sqlite3.IntegrityError:
                 flash("Fehler beim Aktualisieren des Geräts!")
 
-        # -----------------------
-        # Gerät aktivieren/deaktivieren
-        # -----------------------
-        elif 'toggle_device' in request.form:
-            mac = request.form.get('toggle_device')
-            device = conn.execute("SELECT is_active, name FROM devices WHERE mac=?", (mac,)).fetchone()
-            if device:
-                new_status = 0 if device['is_active'] else 1
-                conn.execute("UPDATE devices SET is_active=? WHERE mac=?", (new_status, mac))
-                conn.commit()
-                status_text = "deaktiviert" if new_status == 0 else "aktiviert"
-                flash(f"Gerät '{device['name']}' wurde {status_text}.")
-            else:
-                flash("Gerät nicht gefunden!")
-            return redirect(url_for('devices'))
-
         # -----------------------
         # Gerät löschen
         # -----------------------
@@ -326,7 +310,7 @@ def toggle_device(mac):
     conn.close()
 
     status_text = "deaktiviert" if new_status == 0 else "aktiviert"
-    flash(f"Gerät '{device['name']}' wurde {status_text}.")
+    flash(f"Gerät {device['name']} wurde {status_text}.")
     return redirect(url_for('devices'))
 
 @app.route('/switches', methods=['GET', 'POST'])
-- 
2.49.1


From 404f12e5feb339738ab2bc2b6dfb2ec15dfaac88 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 18:27:50 +0200
Subject: [PATCH 084/144] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index ad73b54..e3bf378 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -293,16 +293,14 @@ def devices():
 @login_required
 def toggle_device(mac):
     if not current_user.is_admin:
-        flash("Zugriff verweigert!")
-        return redirect(url_for('devices'))
+        return {"success": False, "msg": "Zugriff verweigert!"}, 403
 
     conn = get_db_connection()
     device = conn.execute("SELECT is_active, name FROM devices WHERE mac=?", (mac,)).fetchone()
 
     if not device:
-        flash("Gerät nicht gefunden!")
         conn.close()
-        return redirect(url_for('devices'))
+        return {"success": False, "msg": "Gerät nicht gefunden!"}, 404
 
     new_status = 0 if device['is_active'] else 1
     conn.execute("UPDATE devices SET is_active=? WHERE mac=?", (new_status, mac))
@@ -310,8 +308,8 @@ def toggle_device(mac):
     conn.close()
 
     status_text = "deaktiviert" if new_status == 0 else "aktiviert"
-    flash(f"Gerät {device['name']} wurde {status_text}.")
-    return redirect(url_for('devices'))
+    return {"success": True, "msg": f"Gerät {device['name']} wurde {status_text}.", "new_status": new_status}
+
 
 @app.route('/switches', methods=['GET', 'POST'])
 @login_required
-- 
2.49.1


From a2c2f6464f80ca9a85ab0083da846e7f7a4b1691 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 18:29:39 +0200
Subject: [PATCH 085/144] srv/poe_manager/templates/devices.html aktualisiert

---
 srv/poe_manager/templates/devices.html | 34 ++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/srv/poe_manager/templates/devices.html b/srv/poe_manager/templates/devices.html
index f1db549..9476f01 100644
--- a/srv/poe_manager/templates/devices.html
+++ b/srv/poe_manager/templates/devices.html
@@ -29,11 +29,10 @@
             <td>{{ d['port'] }}</td>
             <td>{{ d['switch_hostname'] or '-' }}</td>
             <td>
-                <form method="post" action="{{ url_for('toggle_device', mac=d['mac']) }}" style="display:inline;">
-                    <button class="btn btn-sm {% if d['is_active'] %}btn-success{% else %}btn-secondary{% endif %}" type="submit">
-                        {% if d['is_active'] %}Deaktivieren{% else %}Aktivieren{% endif %}
-                    </button>
-                </form>
+                <button class="btn btn-sm {% if d['is_active'] %}btn-success{% else %}btn-secondary{% endif %}" 
+                        onclick="toggleDevice('{{ d['mac'] }}', this)">
+                    {% if d['is_active'] %}Deaktivieren{% else %}Aktivieren{% endif %}
+                </button>
             </td>
             {% if current_user.is_admin %}
             <td>
@@ -239,6 +238,31 @@ document.addEventListener("input", function(e) {
     if (e.target.name === "rpi_ip") validateIP(e.target);
     if (e.target.name === "mac") validateMAC(e.target);
 });
+
+function toggleDevice(mac, btn) {
+    fetch(`/devices/toggle/${mac}`, { method: 'POST' })
+        .then(resp => resp.json())
+        .then(data => {
+            if (data.success) {
+                // Button-Styling und Text aktualisieren
+                if (data.new_status === 1) {
+                    btn.classList.remove('btn-secondary');
+                    btn.classList.add('btn-success');
+                    btn.innerText = 'Deaktivieren';
+                } else {
+                    btn.classList.remove('btn-success');
+                    btn.classList.add('btn-secondary');
+                    btn.innerText = 'Aktivieren';
+                }
+
+                // Optional: Flash-Nachricht anzeigen
+                alert(data.msg);
+            } else {
+                alert(data.msg);
+            }
+        })
+        .catch(err => console.error(err));
+}
 </script>
 
 {% endblock %}
-- 
2.49.1


From 207eed1f0044fa5bcf07a56492c8d466257c8a5b Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 18:31:51 +0200
Subject: [PATCH 086/144] srv/poe_manager/templates/devices.html aktualisiert

---
 srv/poe_manager/templates/devices.html | 34 +++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/srv/poe_manager/templates/devices.html b/srv/poe_manager/templates/devices.html
index 9476f01..8bcd7a9 100644
--- a/srv/poe_manager/templates/devices.html
+++ b/srv/poe_manager/templates/devices.html
@@ -239,12 +239,13 @@ document.addEventListener("input", function(e) {
     if (e.target.name === "mac") validateMAC(e.target);
 });
 
+// Aktivieren/Deaktivieren
 function toggleDevice(mac, btn) {
     fetch(`/devices/toggle/${mac}`, { method: 'POST' })
         .then(resp => resp.json())
         .then(data => {
             if (data.success) {
-                // Button-Styling und Text aktualisieren
+                // Button aktualisieren
                 if (data.new_status === 1) {
                     btn.classList.remove('btn-secondary');
                     btn.classList.add('btn-success');
@@ -255,10 +256,35 @@ function toggleDevice(mac, btn) {
                     btn.innerText = 'Aktivieren';
                 }
 
-                // Optional: Flash-Nachricht anzeigen
-                alert(data.msg);
+                // Flash-Nachricht im Frontend aktualisieren
+                let flashContainer = document.getElementById('flash-messages');
+                if (!flashContainer) {
+                    flashContainer = document.createElement('div');
+                    flashContainer.id = 'flash-messages';
+                    flashContainer.style.position = 'fixed';
+                    flashContainer.style.top = '10px';
+                    flashContainer.style.right = '10px';
+                    flashContainer.style.zIndex = 1050;
+                    document.body.appendChild(flashContainer);
+                }
+
+                const flash = document.createElement('div');
+                flash.className = 'alert alert-success alert-dismissible fade show';
+                flash.role = 'alert';
+                flash.innerHTML = `
+                    ${data.msg}
+                    <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
+                `;
+                flashContainer.appendChild(flash);
+
+                // Automatisch nach 3 Sekunden ausblenden
+                setTimeout(() => {
+                    flash.classList.remove('show');
+                    flash.classList.add('hide');
+                    flash.addEventListener('transitionend', () => flash.remove());
+                }, 3000);
             } else {
-                alert(data.msg);
+                console.error(data.msg);
             }
         })
         .catch(err => console.error(err));
-- 
2.49.1


From 9c25d532ecd9c93eae4164c6d7f38203ac808d6a Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 18:46:26 +0200
Subject: [PATCH 087/144] srv/poe_manager/templates/logs.html aktualisiert

---
 srv/poe_manager/templates/logs.html | 72 ++++++++++++++++++-----------
 1 file changed, 45 insertions(+), 27 deletions(-)

diff --git a/srv/poe_manager/templates/logs.html b/srv/poe_manager/templates/logs.html
index fcaf6d5..d5a7b8a 100644
--- a/srv/poe_manager/templates/logs.html
+++ b/srv/poe_manager/templates/logs.html
@@ -3,6 +3,11 @@
 
 <h2>Live Log</h2>
 
+<!-- Refresh-Button unter der Überschrift -->
+<button id="refresh-btn" class="btn btn-primary mb-3">
+    🔄 Logs aktualisieren
+</button>
+
 <div id="log-container">
     <div id="log-box"></div>
     <div id="refresh-timer">
@@ -11,36 +16,49 @@
 </div>
 
 <script>
-const intervalMinutes = {{ interval | int }};
-const intervalMilliseconds = intervalMinutes * 60 * 1000;
-let lastUpdateTime = Date.now();
+document.addEventListener("DOMContentLoaded", () => {
+    // --- Seitentitel setzen ---
+    const baseTitle = document.title.split(" - ")[0];
+    document.title = baseTitle + " - Live Log";
 
-function fetchLog() {
-    fetch("{{ url_for('get_log') }}")
-        .then(response => response.text())
-        .then(data => {
-            const box = document.getElementById("log-box");
-            const filteredLines = data
-                .split("\n")
-                .filter(line => !line.includes("ist erreichbar!"))
-                .join("\n");
-            box.innerText = filteredLines;
-            box.scrollTop = box.scrollHeight;
-            lastUpdateTime = Date.now();
-        })
-        .catch(err => console.error("Fehler beim Laden der Logs:", err));
-}
+    // --- Intervallwerte ---
+    const intervalMinutes = {{ interval | int }};
+    const intervalMilliseconds = intervalMinutes * 60 * 1000;
+    let lastUpdateTime = Date.now();
 
-function updateTimer() {
-    const now = Date.now();
-    const remainingMs = intervalMilliseconds - (now - lastUpdateTime);
-    const remainingSec = Math.max(Math.ceil(remainingMs / 1000), 0);
-    document.getElementById("timer").innerText = remainingSec;
-}
+    // --- Log laden ---
+    function fetchLog() {
+        fetch("{{ url_for('get_log') }}")
+            .then(response => response.text())
+            .then(data => {
+                const box = document.getElementById("log-box");
+                const filteredLines = data
+                    .split("\n")
+                    .filter(line => !line.includes("ist erreichbar!"))
+                    .join("\n");
+                box.innerText = filteredLines;
+                box.scrollTop = box.scrollHeight;
+                lastUpdateTime = Date.now();
+            })
+            .catch(err => console.error("Fehler beim Laden der Logs:", err));
+    }
 
-setInterval(updateTimer, 1000);
-fetchLog();
-setInterval(fetchLog, intervalMilliseconds);
+    // --- Timer aktualisieren ---
+    function updateTimer() {
+        const now = Date.now();
+        const remainingMs = intervalMilliseconds - (now - lastUpdateTime);
+        const remainingSec = Math.max(Math.ceil(remainingMs / 1000), 0);
+        document.getElementById("timer").innerText = remainingSec;
+    }
+
+    // --- Button klick ---
+    document.getElementById("refresh-btn").addEventListener("click", fetchLog);
+
+    // --- Initial starten ---
+    setInterval(updateTimer, 1000);
+    fetchLog();
+    setInterval(fetchLog, intervalMilliseconds);
+});
 </script>
 
 {% endblock %}
-- 
2.49.1


From 44b7a9e0b0fe0b44c04d2a00c406d8e3f2529a87 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 18:49:11 +0200
Subject: [PATCH 088/144] srv/poe_manager/templates/logs.html aktualisiert

---
 srv/poe_manager/templates/logs.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/logs.html b/srv/poe_manager/templates/logs.html
index d5a7b8a..4fa8be7 100644
--- a/srv/poe_manager/templates/logs.html
+++ b/srv/poe_manager/templates/logs.html
@@ -4,7 +4,7 @@
 <h2>Live Log</h2>
 
 <!-- Refresh-Button unter der Überschrift -->
-<button id="refresh-btn" class="btn btn-primary mb-3">
+<button id="refresh-btn" class="btn btn-success mb-3">
     🔄 Logs aktualisieren
 </button>
 
-- 
2.49.1


From 4fd22bd3ec53fa2552b868de8d715fc7bcd609f9 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 18:50:58 +0200
Subject: [PATCH 089/144] srv/poe_manager/templates/logs.html aktualisiert

---
 srv/poe_manager/templates/logs.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srv/poe_manager/templates/logs.html b/srv/poe_manager/templates/logs.html
index 4fa8be7..a693501 100644
--- a/srv/poe_manager/templates/logs.html
+++ b/srv/poe_manager/templates/logs.html
@@ -3,9 +3,8 @@
 
 <h2>Live Log</h2>
 
-<!-- Refresh-Button unter der Überschrift -->
 <button id="refresh-btn" class="btn btn-success mb-3">
-    🔄 Logs aktualisieren
+    <span style="font-size: 1.2rem; color: white;">⟳</span>
 </button>
 
 <div id="log-container">
-- 
2.49.1


From c957a32a86727128ddce9b52d9350dbcb61ea62f Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 18:51:47 +0200
Subject: [PATCH 090/144] srv/poe_manager/templates/logs.html aktualisiert

---
 srv/poe_manager/templates/logs.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/logs.html b/srv/poe_manager/templates/logs.html
index a693501..420c4fa 100644
--- a/srv/poe_manager/templates/logs.html
+++ b/srv/poe_manager/templates/logs.html
@@ -4,7 +4,7 @@
 <h2>Live Log</h2>
 
 <button id="refresh-btn" class="btn btn-success mb-3">
-    <span style="font-size: 1.2rem; color: white;">⟳</span>
+    <span style="font-size: 1.2rem; color: white;">⟳</span> Logs aktualisieren
 </button>
 
 <div id="log-container">
-- 
2.49.1


From 2c9a715d3707b3f4095e7d9b1dc6e310412652df Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 18:57:12 +0200
Subject: [PATCH 091/144] srv/poe_manager/templates/logs.html aktualisiert

---
 srv/poe_manager/templates/logs.html | 45 ++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/srv/poe_manager/templates/logs.html b/srv/poe_manager/templates/logs.html
index 420c4fa..82e5585 100644
--- a/srv/poe_manager/templates/logs.html
+++ b/srv/poe_manager/templates/logs.html
@@ -16,14 +16,10 @@
 
 <script>
 document.addEventListener("DOMContentLoaded", () => {
-    // --- Seitentitel setzen ---
-    const baseTitle = document.title.split(" - ")[0];
-    document.title = baseTitle + " - Live Log";
-
-    // --- Intervallwerte ---
+    // --- Intervall aus Datenbank (Jinja Variable) ---
     const intervalMinutes = {{ interval | int }};
     const intervalMilliseconds = intervalMinutes * 60 * 1000;
-    let lastUpdateTime = Date.now();
+    let lastUpdateTime = Date.now(); // wird nach Log-Auswertung gesetzt
 
     // --- Log laden ---
     function fetchLog() {
@@ -31,13 +27,36 @@ document.addEventListener("DOMContentLoaded", () => {
             .then(response => response.text())
             .then(data => {
                 const box = document.getElementById("log-box");
+
+                // Zeilen filtern
                 const filteredLines = data
                     .split("\n")
-                    .filter(line => !line.includes("ist erreichbar!"))
-                    .join("\n");
-                box.innerText = filteredLines;
+                    .filter(line => !line.includes("ist erreichbar!"));
+
+                box.innerText = filteredLines.join("\n");
                 box.scrollTop = box.scrollHeight;
-                lastUpdateTime = Date.now();
+
+                // --- Timer: letzte "----" Linie finden ---
+                let lastSeparatorIndex = -1;
+                for (let i = filteredLines.length - 1; i >= 0; i--) {
+                    if (filteredLines[i].startsWith("--------------------------------------------------------------------")) {
+                        lastSeparatorIndex = i;
+                        break;
+                    }
+                }
+
+                // ersten Zeitstempel nach Separator nehmen
+                if (lastSeparatorIndex >= 0 && lastSeparatorIndex + 1 < filteredLines.length) {
+                    const firstLine = filteredLines[lastSeparatorIndex + 1];
+                    const match = firstLine.match(/^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/);
+                    if (match) {
+                        lastUpdateTime = new Date(match[1]).getTime();
+                    } else {
+                        lastUpdateTime = Date.now();
+                    }
+                } else {
+                    lastUpdateTime = Date.now();
+                }
             })
             .catch(err => console.error("Fehler beim Laden der Logs:", err));
     }
@@ -54,9 +73,9 @@ document.addEventListener("DOMContentLoaded", () => {
     document.getElementById("refresh-btn").addEventListener("click", fetchLog);
 
     // --- Initial starten ---
-    setInterval(updateTimer, 1000);
-    fetchLog();
-    setInterval(fetchLog, intervalMilliseconds);
+    fetchLog();                  // zuerst laden
+    setInterval(fetchLog, intervalMilliseconds); // automatische Updates nach DB-Intervall
+    setInterval(updateTimer, 1000);             // Timer jede Sekunde
 });
 </script>
 
-- 
2.49.1


From de6b5c7fe904a18352ebb437af8a0a597884d9df Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 18:59:51 +0200
Subject: [PATCH 092/144] srv/poe_manager/templates/logs.html aktualisiert

---
 srv/poe_manager/templates/logs.html | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/srv/poe_manager/templates/logs.html b/srv/poe_manager/templates/logs.html
index 82e5585..039bfb5 100644
--- a/srv/poe_manager/templates/logs.html
+++ b/srv/poe_manager/templates/logs.html
@@ -16,19 +16,16 @@
 
 <script>
 document.addEventListener("DOMContentLoaded", () => {
-    // --- Intervall aus Datenbank (Jinja Variable) ---
     const intervalMinutes = {{ interval | int }};
     const intervalMilliseconds = intervalMinutes * 60 * 1000;
     let lastUpdateTime = Date.now(); // wird nach Log-Auswertung gesetzt
 
-    // --- Log laden ---
     function fetchLog() {
         fetch("{{ url_for('get_log') }}")
             .then(response => response.text())
             .then(data => {
                 const box = document.getElementById("log-box");
 
-                // Zeilen filtern
                 const filteredLines = data
                     .split("\n")
                     .filter(line => !line.includes("ist erreichbar!"));
@@ -36,7 +33,7 @@ document.addEventListener("DOMContentLoaded", () => {
                 box.innerText = filteredLines.join("\n");
                 box.scrollTop = box.scrollHeight;
 
-                // --- Timer: letzte "----" Linie finden ---
+                // letzte Separator-Linie finden
                 let lastSeparatorIndex = -1;
                 for (let i = filteredLines.length - 1; i >= 0; i--) {
                     if (filteredLines[i].startsWith("--------------------------------------------------------------------")) {
@@ -61,21 +58,19 @@ document.addEventListener("DOMContentLoaded", () => {
             .catch(err => console.error("Fehler beim Laden der Logs:", err));
     }
 
-    // --- Timer aktualisieren ---
     function updateTimer() {
         const now = Date.now();
-        const remainingMs = intervalMilliseconds - (now - lastUpdateTime);
+        const nextRefresh = lastUpdateTime + intervalMilliseconds;
+        const remainingMs = nextRefresh - now;
         const remainingSec = Math.max(Math.ceil(remainingMs / 1000), 0);
         document.getElementById("timer").innerText = remainingSec;
     }
 
-    // --- Button klick ---
     document.getElementById("refresh-btn").addEventListener("click", fetchLog);
 
-    // --- Initial starten ---
-    fetchLog();                  // zuerst laden
-    setInterval(fetchLog, intervalMilliseconds); // automatische Updates nach DB-Intervall
-    setInterval(updateTimer, 1000);             // Timer jede Sekunde
+    fetchLog();
+    setInterval(fetchLog, intervalMilliseconds);
+    setInterval(updateTimer, 1000);
 });
 </script>
 
-- 
2.49.1


From 225750f6bc365d34da14e87f6bfc94367f254192 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 19:01:40 +0200
Subject: [PATCH 093/144] srv/poe_manager/templates/logs.html aktualisiert

---
 srv/poe_manager/templates/logs.html | 30 +++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/srv/poe_manager/templates/logs.html b/srv/poe_manager/templates/logs.html
index 039bfb5..5d9ab07 100644
--- a/srv/poe_manager/templates/logs.html
+++ b/srv/poe_manager/templates/logs.html
@@ -15,39 +15,44 @@
 </div>
 
 <script>
+function parseLogTimestamp(ts) {
+    // ts = "2025-10-08 16:48:16"
+    const parts = ts.match(/^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})$/);
+    if (!parts) return Date.now();
+    const [, year, month, day, hour, minute, second] = parts.map(Number);
+    return new Date(year, month - 1, day, hour, minute, second).getTime();
+}
+
 document.addEventListener("DOMContentLoaded", () => {
     const intervalMinutes = {{ interval | int }};
     const intervalMilliseconds = intervalMinutes * 60 * 1000;
-    let lastUpdateTime = Date.now(); // wird nach Log-Auswertung gesetzt
+    let lastUpdateTime = Date.now();
 
     function fetchLog() {
         fetch("{{ url_for('get_log') }}")
-            .then(response => response.text())
+            .then(res => res.text())
             .then(data => {
                 const box = document.getElementById("log-box");
-
                 const filteredLines = data
                     .split("\n")
                     .filter(line => !line.includes("ist erreichbar!"));
-
                 box.innerText = filteredLines.join("\n");
                 box.scrollTop = box.scrollHeight;
 
-                // letzte Separator-Linie finden
-                let lastSeparatorIndex = -1;
+                // letzte Separator-Linie
+                let lastSep = -1;
                 for (let i = filteredLines.length - 1; i >= 0; i--) {
                     if (filteredLines[i].startsWith("--------------------------------------------------------------------")) {
-                        lastSeparatorIndex = i;
+                        lastSep = i;
                         break;
                     }
                 }
 
-                // ersten Zeitstempel nach Separator nehmen
-                if (lastSeparatorIndex >= 0 && lastSeparatorIndex + 1 < filteredLines.length) {
-                    const firstLine = filteredLines[lastSeparatorIndex + 1];
+                if (lastSep >= 0 && lastSep + 1 < filteredLines.length) {
+                    const firstLine = filteredLines[lastSep + 1];
                     const match = firstLine.match(/^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/);
                     if (match) {
-                        lastUpdateTime = new Date(match[1]).getTime();
+                        lastUpdateTime = parseLogTimestamp(match[1]);
                     } else {
                         lastUpdateTime = Date.now();
                     }
@@ -55,7 +60,7 @@ document.addEventListener("DOMContentLoaded", () => {
                     lastUpdateTime = Date.now();
                 }
             })
-            .catch(err => console.error("Fehler beim Laden der Logs:", err));
+            .catch(err => console.error(err));
     }
 
     function updateTimer() {
@@ -72,6 +77,7 @@ document.addEventListener("DOMContentLoaded", () => {
     setInterval(fetchLog, intervalMilliseconds);
     setInterval(updateTimer, 1000);
 });
+
 </script>
 
 {% endblock %}
-- 
2.49.1


From 8ff4515a1707aad562015c3eceb08ac225b41109 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 19:03:14 +0200
Subject: [PATCH 094/144] srv/poe_manager/templates/logs.html aktualisiert

---
 srv/poe_manager/templates/logs.html | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srv/poe_manager/templates/logs.html b/srv/poe_manager/templates/logs.html
index 5d9ab07..3e24d81 100644
--- a/srv/poe_manager/templates/logs.html
+++ b/srv/poe_manager/templates/logs.html
@@ -16,7 +16,6 @@
 
 <script>
 function parseLogTimestamp(ts) {
-    // ts = "2025-10-08 16:48:16"
     const parts = ts.match(/^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})$/);
     if (!parts) return Date.now();
     const [, year, month, day, hour, minute, second] = parts.map(Number);
@@ -65,9 +64,9 @@ document.addEventListener("DOMContentLoaded", () => {
 
     function updateTimer() {
         const now = Date.now();
-        const nextRefresh = lastUpdateTime + intervalMilliseconds;
-        const remainingMs = nextRefresh - now;
-        const remainingSec = Math.max(Math.ceil(remainingMs / 1000), 0);
+        const elapsed = now - lastUpdateTime;
+        const remainingMs = intervalMilliseconds - (elapsed % intervalMilliseconds);
+        const remainingSec = Math.ceil(remainingMs / 1000);
         document.getElementById("timer").innerText = remainingSec;
     }
 
@@ -77,7 +76,6 @@ document.addEventListener("DOMContentLoaded", () => {
     setInterval(fetchLog, intervalMilliseconds);
     setInterval(updateTimer, 1000);
 });
-
 </script>
 
 {% endblock %}
-- 
2.49.1


From b7c6264082f669e3283e6acac101709c700a36bd Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 19:25:11 +0200
Subject: [PATCH 095/144] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index e3bf378..f982463 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -122,12 +122,23 @@ def settings():
 
     if request.method == "POST":
         new_interval = int(request.form["interval"])
+
+        # Minuten und Sekunden berechnen
+        interval_minutes = new_interval
+        check_interval_seconds = new_interval * 60
+
         conn = sqlite3.connect("sqlite.db")
         c = conn.cursor()
-        # upsert
-        c.execute("INSERT INTO settings (key, value) VALUES (?, ?) "
-                  "ON CONFLICT(key) DO UPDATE SET value=excluded.value",
-                  ("interval", new_interval))
+        # interval (Minuten)
+        c.execute("""
+            INSERT INTO settings (key, value) VALUES (?, ?)
+            ON CONFLICT(key) DO UPDATE SET value=excluded.value
+        """, ("interval", interval_minutes))
+        # check_interval (Sekunden)
+        c.execute("""
+            INSERT INTO settings (key, value) VALUES (?, ?)
+            ON CONFLICT(key) DO UPDATE SET value=excluded.value
+        """, ("check_interval", check_interval_seconds))
         conn.commit()
         conn.close()
 
@@ -135,7 +146,7 @@ def settings():
         import subprocess
         subprocess.run(["systemctl", "restart", "rpi-check.service"])
 
-        flash(f"Intervall auf {new_interval} Minuten gesetzt und Service neu gestartet!")
+        flash(f"Intervall auf {interval_minutes} Minuten gesetzt und Service neu gestartet!")
         return redirect(url_for("settings"))
 
     return render_template("settings.html", interval=interval)
-- 
2.49.1


From 0cc9d2ea0be6137925d6c79a4cce112e049af729 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 19:32:09 +0200
Subject: [PATCH 096/144] srv/poe_manager/templates/users.html aktualisiert

---
 srv/poe_manager/templates/users.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srv/poe_manager/templates/users.html b/srv/poe_manager/templates/users.html
index fb66ae3..d0f9488 100644
--- a/srv/poe_manager/templates/users.html
+++ b/srv/poe_manager/templates/users.html
@@ -24,14 +24,14 @@
             {% if current_user.is_admin %}
             <td class="custom-actions d-flex gap-1 align-items-center">
                 <!-- Rolle ändern -->
-                <button class="btn btn-primary btn-sm" data-bs-toggle="modal"
+                <button class="btn btn-sm button login white" data-bs-toggle="modal"
                         data-bs-target="#roleModal"
                         onclick="openRoleModal({{ u['id'] }}, '{{ u['username'] }}', {{ u['is_admin'] }})">
                     Rolle ändern
                 </button>
 
                 <!-- Passwort ändern -->
-                <button class="btn btn-warning btn-sm" data-bs-toggle="modal"
+                <button class="btn btn-sm button login white" data-bs-toggle="modal"
                         data-bs-target="#passwordModal"
                         onclick="openPasswordModal({{ u['id'] }}, '{{ u['username'] }}')">
                     Passwort ändern
-- 
2.49.1


From f8042669b419142b1f34d710146a63266d890ec2 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 19:33:50 +0200
Subject: [PATCH 097/144] srv/poe_manager/templates/index.html aktualisiert

---
 srv/poe_manager/templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index 0ef9f3d..c544fea 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% block content %}
-
+<title>PoE Manager - Dashboard</title>
 <h2>Dashboard</h2>
 <div class="row row-cols-1 row-cols-md-6 g-3">
     {% for d in devices %}
-- 
2.49.1


From 18a2b8facf156a401b4187918be6b6b36830b7ca Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 19:34:18 +0200
Subject: [PATCH 098/144] srv/poe_manager/templates/index.html aktualisiert

---
 srv/poe_manager/templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index c544fea..0ef9f3d 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% block content %}
-<title>PoE Manager - Dashboard</title>
+
 <h2>Dashboard</h2>
 <div class="row row-cols-1 row-cols-md-6 g-3">
     {% for d in devices %}
-- 
2.49.1


From 9d50113c203f543a4c869f284d805cb3719f8d4c Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 19:38:13 +0200
Subject: [PATCH 099/144] srv/poe_manager/templates/index.html aktualisiert

---
 srv/poe_manager/templates/index.html | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index 0ef9f3d..1ce0f56 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -1,7 +1,10 @@
 {% extends "base.html" %}
 {% block content %}
 
-<h2>Dashboard</h2>
+<h2 class="d-flex justify-content-between align-items-center">
+    Dashboard
+    <span id="dashboard-timer" class="badge bg-success">-- s</span>
+</h2>
 <div class="row row-cols-1 row-cols-md-6 g-3">
     {% for d in devices %}
     <div class="col">
@@ -24,5 +27,27 @@
     </div>
     {% endfor %}
 </div>
+<script>
+document.addEventListener("DOMContentLoaded", () => {
+    const intervalMinutes = {{ interval | int }};
+    const intervalMilliseconds = intervalMinutes * 60 * 1000;
+    let lastUpdateTime = Date.now(); // optional: vom letzten Refresh / Log-Eintrag
+
+    function updateDashboardTimer() {
+        const now = Date.now();
+        const elapsed = now - lastUpdateTime;
+        const remainingMs = intervalMilliseconds - (elapsed % intervalMilliseconds);
+        const remainingSec = Math.ceil(remainingMs / 1000);
+        document.getElementById("dashboard-timer").innerText = remainingSec + " s";
+    }
+
+    // Optional: reset timer beim manuellen Refresh
+    // lastUpdateTime = Date.now(); 
+
+    setInterval(updateDashboardTimer, 1000);
+    updateDashboardTimer(); // direkt beim Laden
+});
+</script>
+
 
 {% endblock %}
-- 
2.49.1


From 2d735fd4b4702edf50b7d90833ce74e8dbb25bd1 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 19:38:43 +0200
Subject: [PATCH 100/144] srv/poe_manager/static/css/style.css aktualisiert

---
 srv/poe_manager/static/css/style.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srv/poe_manager/static/css/style.css b/srv/poe_manager/static/css/style.css
index 47d08c1..422de38 100644
--- a/srv/poe_manager/static/css/style.css
+++ b/srv/poe_manager/static/css/style.css
@@ -28,6 +28,11 @@ pre {
     margin-right: 5px;
 }
 
+#dashboard-timer {
+    font-size: 0.9rem;
+    padding: 0.25rem 0.5rem;
+}
+
 .device-card {
     border: 1px solid #ccc;
     border-radius: 5px;
-- 
2.49.1


From f479de850801fa7cdfe0bf64d60fba5aef2111e5 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 19:41:01 +0200
Subject: [PATCH 101/144] srv/poe_manager/templates/index.html aktualisiert

---
 srv/poe_manager/templates/index.html | 43 ++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index 1ce0f56..799de77 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -29,11 +29,18 @@
 </div>
 <script>
 document.addEventListener("DOMContentLoaded", () => {
-    const intervalMinutes = {{ interval | int }};
+    const intervalMinutes = {{ interval | int }}; // aus DB
     const intervalMilliseconds = intervalMinutes * 60 * 1000;
-    let lastUpdateTime = Date.now(); // optional: vom letzten Refresh / Log-Eintrag
+    let lastUpdateTime = Date.now();
 
-    function updateDashboardTimer() {
+    function parseLogTimestamp(ts) {
+        const parts = ts.match(/^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})$/);
+        if (!parts) return Date.now();
+        const [, year, month, day, hour, minute, second] = parts.map(Number);
+        return new Date(year, month - 1, day, hour, minute, second).getTime();
+    }
+
+    function updateTimer() {
         const now = Date.now();
         const elapsed = now - lastUpdateTime;
         const remainingMs = intervalMilliseconds - (elapsed % intervalMilliseconds);
@@ -41,13 +48,33 @@ document.addEventListener("DOMContentLoaded", () => {
         document.getElementById("dashboard-timer").innerText = remainingSec + " s";
     }
 
-    // Optional: reset timer beim manuellen Refresh
-    // lastUpdateTime = Date.now(); 
+    function fetchLastLog() {
+        fetch("{{ url_for('get_log') }}")
+            .then(response => response.text())
+            .then(data => {
+                const lines = data.split("\n").filter(line => !line.includes("ist erreichbar!"));
+                let lastSepIndex = -1;
+                for (let i = lines.length - 1; i >= 0; i--) {
+                    if (lines[i].startsWith("--------------------------------------------------------------------")) {
+                        lastSepIndex = i;
+                        break;
+                    }
+                }
+                if (lastSepIndex >= 0 && lastSepIndex + 1 < lines.length) {
+                    const firstLine = lines[lastSepIndex + 1];
+                    const match = firstLine.match(/^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/);
+                    if (match) lastUpdateTime = parseLogTimestamp(match[1]);
+                }
+            })
+            .catch(err => console.error("Fehler beim Laden der Logs:", err));
+    }
 
-    setInterval(updateDashboardTimer, 1000);
-    updateDashboardTimer(); // direkt beim Laden
+    // Timer aktualisieren jede Sekunde
+    setInterval(updateTimer, 1000);
+
+    // einmal beim Laden die letzte Log-Zeit setzen
+    fetchLastLog();
 });
 </script>
 
-
 {% endblock %}
-- 
2.49.1


From 3ab5e023fe7f1358b909c507038fa4de536a157e Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 19:43:55 +0200
Subject: [PATCH 102/144] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index f982463..62efe61 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -84,11 +84,16 @@ def logout():
 @app.route("/")
 @login_required
 def index():
+    # Geräte aus DB laden
     conn = sqlite3.connect("sqlite.db")
     c = conn.cursor()
-    # is_active mit abfragen
     c.execute("SELECT mac, name, is_active FROM devices ORDER BY name ASC")
     devices = c.fetchall()
+
+    # Intervall aus DB (Minuten) laden
+    c.execute("SELECT value FROM settings WHERE key='interval'")
+    row = c.fetchone()
+    interval = int(row[0]) if row else 5  # Default 5 Minuten
     conn.close()
 
     # Status aus letztem Log ermitteln
@@ -103,7 +108,8 @@ def index():
                     if dev[1] in line:
                         status_dict[dev[0]] = "online" if "erreichbar" in line else "offline"
 
-    return render_template("index.html", devices=devices, status=status_dict)
+    # Template rendern mit Devices, Status und Intervall
+    return render_template("index.html", devices=devices, status=status_dict, interval=interval)
 
 @app.route("/settings", methods=["GET", "POST"])
 @login_required
-- 
2.49.1


From 64e9ebc3ea5645f80e79dcd251df4a6d989eea35 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 19:45:22 +0200
Subject: [PATCH 103/144] srv/poe_manager/templates/index.html aktualisiert

---
 srv/poe_manager/templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index 799de77..c802c47 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -3,7 +3,7 @@
 
 <h2 class="d-flex justify-content-between align-items-center">
     Dashboard
-    <span id="dashboard-timer" class="badge bg-success">-- s</span>
+    <span id="dashboard-timer" class="badge bg-success">Nächste Prüfung in -- s</span>
 </h2>
 <div class="row row-cols-1 row-cols-md-6 g-3">
     {% for d in devices %}
-- 
2.49.1


From e7458aca5f3827d37d59773c213c1229e8bf25a8 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 19:47:17 +0200
Subject: [PATCH 104/144] srv/poe_manager/templates/index.html aktualisiert

---
 srv/poe_manager/templates/index.html | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index c802c47..3163bba 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -3,7 +3,9 @@
 
 <h2 class="d-flex justify-content-between align-items-center">
     Dashboard
-    <span id="dashboard-timer" class="badge bg-success">Nächste Prüfung in -- s</span>
+    <span id="dashboard-timer" class="badge bg-success">
+        Nächste Prüfung in -- Sekunden
+    </span>
 </h2>
 <div class="row row-cols-1 row-cols-md-6 g-3">
     {% for d in devices %}
@@ -45,7 +47,8 @@ document.addEventListener("DOMContentLoaded", () => {
         const elapsed = now - lastUpdateTime;
         const remainingMs = intervalMilliseconds - (elapsed % intervalMilliseconds);
         const remainingSec = Math.ceil(remainingMs / 1000);
-        document.getElementById("dashboard-timer").innerText = remainingSec + " s";
+        document.getElementById("dashboard-timer").innerText =
+            `Nächste Prüfung in ${remainingSec} Sekunden`;
     }
 
     function fetchLastLog() {
@@ -69,7 +72,7 @@ document.addEventListener("DOMContentLoaded", () => {
             .catch(err => console.error("Fehler beim Laden der Logs:", err));
     }
 
-    // Timer aktualisieren jede Sekunde
+    // Timer alle 1 Sekunde aktualisieren
     setInterval(updateTimer, 1000);
 
     // einmal beim Laden die letzte Log-Zeit setzen
-- 
2.49.1


From 250a131542915cd6caba0edd254cc390dacb0d5e Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 19:57:10 +0200
Subject: [PATCH 105/144] srv/poe_manager/templates/index.html aktualisiert

---
 srv/poe_manager/templates/index.html | 31 ++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index 3163bba..5c7cd70 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -29,12 +29,15 @@
     </div>
     {% endfor %}
 </div>
+
 <script>
 document.addEventListener("DOMContentLoaded", () => {
-    const intervalMinutes = {{ interval | int }}; // aus DB
+    const intervalMinutes = {{ interval | int }}; // Intervall aus DB in Minuten
     const intervalMilliseconds = intervalMinutes * 60 * 1000;
     let lastUpdateTime = Date.now();
 
+    let reloadCountdown = null; // Reload-Timer (10s) 
+
     function parseLogTimestamp(ts) {
         const parts = ts.match(/^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})$/);
         if (!parts) return Date.now();
@@ -46,9 +49,25 @@ document.addEventListener("DOMContentLoaded", () => {
         const now = Date.now();
         const elapsed = now - lastUpdateTime;
         const remainingMs = intervalMilliseconds - (elapsed % intervalMilliseconds);
-        const remainingSec = Math.ceil(remainingMs / 1000);
-        document.getElementById("dashboard-timer").innerText =
-            `Nächste Prüfung in ${remainingSec} Sekunden`;
+        let remainingSec = Math.ceil(remainingMs / 1000);
+
+        const timerElem = document.getElementById("dashboard-timer");
+
+        if (remainingSec > 0) {
+            // Haupt-Timer läuft normal
+            timerElem.innerText = `Nächste Prüfung in ${remainingSec} Sekunden`;
+        } else {
+            // Haupt-Timer abgelaufen → Reload-Timer starten, falls noch nicht gestartet
+            if (reloadCountdown === null) {
+                reloadCountdown = 10; // 10 Sekunden Countdown
+            }
+            timerElem.innerText = `Aktualisieren der Seite in ${reloadCountdown} Sekunden`;
+            reloadCountdown--;
+
+            if (reloadCountdown < 0) {
+                window.location.reload(); // Seite neu laden
+            }
+        }
     }
 
     function fetchLastLog() {
@@ -72,10 +91,10 @@ document.addEventListener("DOMContentLoaded", () => {
             .catch(err => console.error("Fehler beim Laden der Logs:", err));
     }
 
-    // Timer alle 1 Sekunde aktualisieren
+    // Timer jede Sekunde aktualisieren
     setInterval(updateTimer, 1000);
 
-    // einmal beim Laden die letzte Log-Zeit setzen
+    // einmal beim Laden letzte Log-Zeit setzen
     fetchLastLog();
 });
 </script>
-- 
2.49.1


From 847c7200559ff228beb86e3fc843ccae06fe08bd Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 20:14:59 +0200
Subject: [PATCH 106/144] srv/poe_manager/templates/index.html aktualisiert

---
 srv/poe_manager/templates/index.html | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index 5c7cd70..7a4c703 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -32,11 +32,10 @@
 
 <script>
 document.addEventListener("DOMContentLoaded", () => {
-    const intervalMinutes = {{ interval | int }}; // Intervall aus DB in Minuten
+    const intervalMinutes = {{ interval | int }};
     const intervalMilliseconds = intervalMinutes * 60 * 1000;
     let lastUpdateTime = Date.now();
-
-    let reloadCountdown = null; // Reload-Timer (10s) 
+    let reloadCountdown = null;
 
     function parseLogTimestamp(ts) {
         const parts = ts.match(/^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})$/);
@@ -48,19 +47,15 @@ document.addEventListener("DOMContentLoaded", () => {
     function updateTimer() {
         const now = Date.now();
         const elapsed = now - lastUpdateTime;
-        const remainingMs = intervalMilliseconds - (elapsed % intervalMilliseconds);
-        let remainingSec = Math.ceil(remainingMs / 1000);
-
         const timerElem = document.getElementById("dashboard-timer");
 
-        if (remainingSec > 0) {
-            // Haupt-Timer läuft normal
+        if (elapsed < intervalMilliseconds) {
+            // Haupt-Timer läuft
+            const remainingSec = Math.ceil((intervalMilliseconds - elapsed) / 1000);
             timerElem.innerText = `Nächste Prüfung in ${remainingSec} Sekunden`;
         } else {
-            // Haupt-Timer abgelaufen → Reload-Timer starten, falls noch nicht gestartet
-            if (reloadCountdown === null) {
-                reloadCountdown = 10; // 10 Sekunden Countdown
-            }
+            // Haupt-Timer abgelaufen → Reload-Timer starten
+            if (reloadCountdown === null) reloadCountdown = 10; // 10 Sekunden Countdown
             timerElem.innerText = `Aktualisieren der Seite in ${reloadCountdown} Sekunden`;
             reloadCountdown--;
 
@@ -91,10 +86,7 @@ document.addEventListener("DOMContentLoaded", () => {
             .catch(err => console.error("Fehler beim Laden der Logs:", err));
     }
 
-    // Timer jede Sekunde aktualisieren
     setInterval(updateTimer, 1000);
-
-    // einmal beim Laden letzte Log-Zeit setzen
     fetchLastLog();
 });
 </script>
-- 
2.49.1


From c2a74e54cb7837a6d6d415fe64c9be87eea3f7e8 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 20:16:25 +0200
Subject: [PATCH 107/144] srv/poe_manager/templates/index.html aktualisiert

---
 srv/poe_manager/templates/index.html | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index 7a4c703..762a3c2 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -36,6 +36,7 @@ document.addEventListener("DOMContentLoaded", () => {
     const intervalMilliseconds = intervalMinutes * 60 * 1000;
     let lastUpdateTime = Date.now();
     let reloadCountdown = null;
+    let reloadTriggered = false; // verhindert endlose Reloads
 
     function parseLogTimestamp(ts) {
         const parts = ts.match(/^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})$/);
@@ -56,11 +57,15 @@ document.addEventListener("DOMContentLoaded", () => {
         } else {
             // Haupt-Timer abgelaufen → Reload-Timer starten
             if (reloadCountdown === null) reloadCountdown = 10; // 10 Sekunden Countdown
-            timerElem.innerText = `Aktualisieren der Seite in ${reloadCountdown} Sekunden`;
-            reloadCountdown--;
 
-            if (reloadCountdown < 0) {
-                window.location.reload(); // Seite neu laden
+            if (!reloadTriggered) {
+                timerElem.innerText = `Aktualisieren der Seite in ${reloadCountdown} Sekunden`;
+                reloadCountdown--;
+
+                if (reloadCountdown < 0) {
+                    reloadTriggered = true; // Reload nur einmal ausführen
+                    window.location.reload(); // Seite neu laden
+                }
             }
         }
     }
@@ -91,4 +96,5 @@ document.addEventListener("DOMContentLoaded", () => {
 });
 </script>
 
+
 {% endblock %}
-- 
2.49.1


From 3e49f433aac82dfa4209882b35483831936c10ea Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 20:18:59 +0200
Subject: [PATCH 108/144] srv/poe_manager/templates/index.html aktualisiert

---
 srv/poe_manager/templates/index.html | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index 762a3c2..af836d4 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -34,16 +34,9 @@
 document.addEventListener("DOMContentLoaded", () => {
     const intervalMinutes = {{ interval | int }};
     const intervalMilliseconds = intervalMinutes * 60 * 1000;
-    let lastUpdateTime = Date.now();
+    let lastUpdateTime = Date.now(); // Startpunkt beim Laden der Seite
     let reloadCountdown = null;
-    let reloadTriggered = false; // verhindert endlose Reloads
-
-    function parseLogTimestamp(ts) {
-        const parts = ts.match(/^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})$/);
-        if (!parts) return Date.now();
-        const [, year, month, day, hour, minute, second] = parts.map(Number);
-        return new Date(year, month - 1, day, hour, minute, second).getTime();
-    }
+    let reloadTriggered = false;
 
     function updateTimer() {
         const now = Date.now();
@@ -63,13 +56,14 @@ document.addEventListener("DOMContentLoaded", () => {
                 reloadCountdown--;
 
                 if (reloadCountdown < 0) {
-                    reloadTriggered = true; // Reload nur einmal ausführen
-                    window.location.reload(); // Seite neu laden
+                    reloadTriggered = true;
+                    window.location.reload();
                 }
             }
         }
     }
 
+    // Initiale Synchronisierung mit letzter Log-Zeit optional
     function fetchLastLog() {
         fetch("{{ url_for('get_log') }}")
             .then(response => response.text())
@@ -85,7 +79,12 @@ document.addEventListener("DOMContentLoaded", () => {
                 if (lastSepIndex >= 0 && lastSepIndex + 1 < lines.length) {
                     const firstLine = lines[lastSepIndex + 1];
                     const match = firstLine.match(/^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/);
-                    if (match) lastUpdateTime = parseLogTimestamp(match[1]);
+                    if (match) {
+                        const logTime = new Date(match[1]).getTime();
+                        // Nur Offset setzen, damit Haupt-Timer beim Laden nicht sofort abläuft
+                        const offset = Math.min(Date.now() - logTime, intervalMilliseconds);
+                        lastUpdateTime = Date.now() - offset;
+                    }
                 }
             })
             .catch(err => console.error("Fehler beim Laden der Logs:", err));
@@ -96,5 +95,4 @@ document.addEventListener("DOMContentLoaded", () => {
 });
 </script>
 
-
 {% endblock %}
-- 
2.49.1


From 8ca32bf7a9b3f224d3a5cbb5c134b62d328f967c Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 20:20:35 +0200
Subject: [PATCH 109/144] srv/poe_manager/templates/index.html aktualisiert

---
 srv/poe_manager/templates/index.html | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index af836d4..bb8c856 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -34,7 +34,7 @@
 document.addEventListener("DOMContentLoaded", () => {
     const intervalMinutes = {{ interval | int }};
     const intervalMilliseconds = intervalMinutes * 60 * 1000;
-    let lastUpdateTime = Date.now(); // Startpunkt beim Laden der Seite
+    let lastUpdateTime = Date.now();  // Standard: jetzt
     let reloadCountdown = null;
     let reloadTriggered = false;
 
@@ -47,12 +47,14 @@ document.addEventListener("DOMContentLoaded", () => {
             // Haupt-Timer läuft
             const remainingSec = Math.ceil((intervalMilliseconds - elapsed) / 1000);
             timerElem.innerText = `Nächste Prüfung in ${remainingSec} Sekunden`;
+            timerElem.classList.remove("reload");
         } else {
             // Haupt-Timer abgelaufen → Reload-Timer starten
-            if (reloadCountdown === null) reloadCountdown = 10; // 10 Sekunden Countdown
+            if (reloadCountdown === null) reloadCountdown = 10;
 
             if (!reloadTriggered) {
                 timerElem.innerText = `Aktualisieren der Seite in ${reloadCountdown} Sekunden`;
+                timerElem.classList.add("reload");
                 reloadCountdown--;
 
                 if (reloadCountdown < 0) {
@@ -63,7 +65,6 @@ document.addEventListener("DOMContentLoaded", () => {
         }
     }
 
-    // Initiale Synchronisierung mit letzter Log-Zeit optional
     function fetchLastLog() {
         fetch("{{ url_for('get_log') }}")
             .then(response => response.text())
@@ -81,9 +82,12 @@ document.addEventListener("DOMContentLoaded", () => {
                     const match = firstLine.match(/^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/);
                     if (match) {
                         const logTime = new Date(match[1]).getTime();
-                        // Nur Offset setzen, damit Haupt-Timer beim Laden nicht sofort abläuft
-                        const offset = Math.min(Date.now() - logTime, intervalMilliseconds);
-                        lastUpdateTime = Date.now() - offset;
+                        // Wenn Log älter als Intervall → Timer jetzt starten
+                        if (Date.now() - logTime < intervalMilliseconds) {
+                            lastUpdateTime = logTime;
+                        } else {
+                            lastUpdateTime = Date.now();
+                        }
                     }
                 }
             })
-- 
2.49.1


From cd654cf9a096b4827463d64bed562cbbfd9a3ad8 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 20:24:39 +0200
Subject: [PATCH 110/144] srv/poe_manager/templates/index.html aktualisiert

---
 srv/poe_manager/templates/index.html | 52 +++++++++-------------------
 1 file changed, 17 insertions(+), 35 deletions(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index bb8c856..1f839b5 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -32,37 +32,24 @@
 
 <script>
 document.addEventListener("DOMContentLoaded", () => {
-    const intervalMinutes = {{ interval | int }};
+    const intervalMinutes = {{ interval | int }}; // aus DB
     const intervalMilliseconds = intervalMinutes * 60 * 1000;
-    let lastUpdateTime = Date.now();  // Standard: jetzt
-    let reloadCountdown = null;
-    let reloadTriggered = false;
+    let lastUpdateTime = Date.now();
+
+    function parseLogTimestamp(ts) {
+        const parts = ts.match(/^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})$/);
+        if (!parts) return Date.now();
+        const [, year, month, day, hour, minute, second] = parts.map(Number);
+        return new Date(year, month - 1, day, hour, minute, second).getTime();
+    }
 
     function updateTimer() {
         const now = Date.now();
         const elapsed = now - lastUpdateTime;
-        const timerElem = document.getElementById("dashboard-timer");
-
-        if (elapsed < intervalMilliseconds) {
-            // Haupt-Timer läuft
-            const remainingSec = Math.ceil((intervalMilliseconds - elapsed) / 1000);
-            timerElem.innerText = `Nächste Prüfung in ${remainingSec} Sekunden`;
-            timerElem.classList.remove("reload");
-        } else {
-            // Haupt-Timer abgelaufen → Reload-Timer starten
-            if (reloadCountdown === null) reloadCountdown = 10;
-
-            if (!reloadTriggered) {
-                timerElem.innerText = `Aktualisieren der Seite in ${reloadCountdown} Sekunden`;
-                timerElem.classList.add("reload");
-                reloadCountdown--;
-
-                if (reloadCountdown < 0) {
-                    reloadTriggered = true;
-                    window.location.reload();
-                }
-            }
-        }
+        const remainingMs = intervalMilliseconds - (elapsed % intervalMilliseconds);
+        const remainingSec = Math.ceil(remainingMs / 1000);
+        document.getElementById("dashboard-timer").innerText =
+            `Nächste Prüfung in ${remainingSec} Sekunden`;
     }
 
     function fetchLastLog() {
@@ -80,21 +67,16 @@ document.addEventListener("DOMContentLoaded", () => {
                 if (lastSepIndex >= 0 && lastSepIndex + 1 < lines.length) {
                     const firstLine = lines[lastSepIndex + 1];
                     const match = firstLine.match(/^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/);
-                    if (match) {
-                        const logTime = new Date(match[1]).getTime();
-                        // Wenn Log älter als Intervall → Timer jetzt starten
-                        if (Date.now() - logTime < intervalMilliseconds) {
-                            lastUpdateTime = logTime;
-                        } else {
-                            lastUpdateTime = Date.now();
-                        }
-                    }
+                    if (match) lastUpdateTime = parseLogTimestamp(match[1]);
                 }
             })
             .catch(err => console.error("Fehler beim Laden der Logs:", err));
     }
 
+    // Timer alle 1 Sekunde aktualisieren
     setInterval(updateTimer, 1000);
+
+    // einmal beim Laden die letzte Log-Zeit setzen
     fetchLastLog();
 });
 </script>
-- 
2.49.1


From 122a4bd4a45f01c3e2145d00013baad0e2a89257 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 20:27:40 +0200
Subject: [PATCH 111/144] srv/poe_manager/templates/index.html aktualisiert

---
 srv/poe_manager/templates/index.html | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index 1f839b5..2c19ca9 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -46,7 +46,7 @@ document.addEventListener("DOMContentLoaded", () => {
     function updateTimer() {
         const now = Date.now();
         const elapsed = now - lastUpdateTime;
-        const remainingMs = intervalMilliseconds - (elapsed % intervalMilliseconds);
+        const remainingMs = Math.max(intervalMilliseconds - elapsed, 0);
         const remainingSec = Math.ceil(remainingMs / 1000);
         document.getElementById("dashboard-timer").innerText =
             `Nächste Prüfung in ${remainingSec} Sekunden`;
@@ -56,19 +56,14 @@ document.addEventListener("DOMContentLoaded", () => {
         fetch("{{ url_for('get_log') }}")
             .then(response => response.text())
             .then(data => {
-                const lines = data.split("\n").filter(line => !line.includes("ist erreichbar!"));
-                let lastSepIndex = -1;
-                for (let i = lines.length - 1; i >= 0; i--) {
-                    if (lines[i].startsWith("--------------------------------------------------------------------")) {
-                        lastSepIndex = i;
-                        break;
+                const lines = data.split("\n").map(l => l.trim()).filter(Boolean);
+                if (lines.length > 0) {
+                    const lastLine = lines[lines.length - 1];
+                    const match = lastLine.match(/^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/);
+                    if (match) {
+                        lastUpdateTime = parseLogTimestamp(match[1]);
                     }
                 }
-                if (lastSepIndex >= 0 && lastSepIndex + 1 < lines.length) {
-                    const firstLine = lines[lastSepIndex + 1];
-                    const match = firstLine.match(/^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/);
-                    if (match) lastUpdateTime = parseLogTimestamp(match[1]);
-                }
             })
             .catch(err => console.error("Fehler beim Laden der Logs:", err));
     }
-- 
2.49.1


From 831da1479e04acc04a551d02804031d8a325218d Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 20:28:46 +0200
Subject: [PATCH 112/144] revert 122a4bd4a45f01c3e2145d00013baad0e2a89257

revert srv/poe_manager/templates/index.html aktualisiert
---
 srv/poe_manager/templates/index.html | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index 2c19ca9..1f839b5 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -46,7 +46,7 @@ document.addEventListener("DOMContentLoaded", () => {
     function updateTimer() {
         const now = Date.now();
         const elapsed = now - lastUpdateTime;
-        const remainingMs = Math.max(intervalMilliseconds - elapsed, 0);
+        const remainingMs = intervalMilliseconds - (elapsed % intervalMilliseconds);
         const remainingSec = Math.ceil(remainingMs / 1000);
         document.getElementById("dashboard-timer").innerText =
             `Nächste Prüfung in ${remainingSec} Sekunden`;
@@ -56,14 +56,19 @@ document.addEventListener("DOMContentLoaded", () => {
         fetch("{{ url_for('get_log') }}")
             .then(response => response.text())
             .then(data => {
-                const lines = data.split("\n").map(l => l.trim()).filter(Boolean);
-                if (lines.length > 0) {
-                    const lastLine = lines[lines.length - 1];
-                    const match = lastLine.match(/^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/);
-                    if (match) {
-                        lastUpdateTime = parseLogTimestamp(match[1]);
+                const lines = data.split("\n").filter(line => !line.includes("ist erreichbar!"));
+                let lastSepIndex = -1;
+                for (let i = lines.length - 1; i >= 0; i--) {
+                    if (lines[i].startsWith("--------------------------------------------------------------------")) {
+                        lastSepIndex = i;
+                        break;
                     }
                 }
+                if (lastSepIndex >= 0 && lastSepIndex + 1 < lines.length) {
+                    const firstLine = lines[lastSepIndex + 1];
+                    const match = firstLine.match(/^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/);
+                    if (match) lastUpdateTime = parseLogTimestamp(match[1]);
+                }
             })
             .catch(err => console.error("Fehler beim Laden der Logs:", err));
     }
-- 
2.49.1


From 2b92c328e125bc9c687f4aa337c6e67e62d1ab18 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 20:32:15 +0200
Subject: [PATCH 113/144] srv/poe_manager/templates/index.html aktualisiert

---
 srv/poe_manager/templates/index.html | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index 1f839b5..b3e19c3 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -46,10 +46,15 @@ document.addEventListener("DOMContentLoaded", () => {
     function updateTimer() {
         const now = Date.now();
         const elapsed = now - lastUpdateTime;
-        const remainingMs = intervalMilliseconds - (elapsed % intervalMilliseconds);
-        const remainingSec = Math.ceil(remainingMs / 1000);
+        const remainingMs = intervalMilliseconds - elapsed;
+        const remainingSec = Math.ceil(Math.max(remainingMs, 0) / 1000);
         document.getElementById("dashboard-timer").innerText =
             `Nächste Prüfung in ${remainingSec} Sekunden`;
+
+        if (elapsed >= intervalMilliseconds) {
+            // Timer abgelaufen → Reload starten
+            window.location.reload();
+        }
     }
 
     function fetchLastLog() {
-- 
2.49.1


From 61b01372333aba74a3c1fc0434e7cace5dd99b91 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 20:34:17 +0200
Subject: [PATCH 114/144] srv/poe_manager/templates/index.html aktualisiert

---
 srv/poe_manager/templates/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index b3e19c3..4a1735a 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -46,8 +46,8 @@ document.addEventListener("DOMContentLoaded", () => {
     function updateTimer() {
         const now = Date.now();
         const elapsed = now - lastUpdateTime;
-        const remainingMs = intervalMilliseconds - elapsed;
-        const remainingSec = Math.ceil(Math.max(remainingMs, 0) / 1000);
+        const remainingMs = intervalMilliseconds - (elapsed % intervalMilliseconds);
+        const remainingSec = Math.ceil(remainingMs / 1000);
         document.getElementById("dashboard-timer").innerText =
             `Nächste Prüfung in ${remainingSec} Sekunden`;
 
-- 
2.49.1


From 580cda1accd15838827658b9fd2b958cc42ffe32 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 20:35:09 +0200
Subject: [PATCH 115/144] srv/poe_manager/templates/index.html aktualisiert

---
 srv/poe_manager/templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index 4a1735a..8d1e747 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -51,7 +51,7 @@ document.addEventListener("DOMContentLoaded", () => {
         document.getElementById("dashboard-timer").innerText =
             `Nächste Prüfung in ${remainingSec} Sekunden`;
 
-        if (elapsed >= intervalMilliseconds) {
+        if (remainingSec <= 1) {
             // Timer abgelaufen → Reload starten
             window.location.reload();
         }
-- 
2.49.1


From 3544675975f73d5ed25cf505cb52030aea8e68dd Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 20:37:12 +0200
Subject: [PATCH 116/144] srv/poe_manager/templates/index.html aktualisiert

---
 srv/poe_manager/templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index 8d1e747..a817235 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -51,7 +51,7 @@ document.addEventListener("DOMContentLoaded", () => {
         document.getElementById("dashboard-timer").innerText =
             `Nächste Prüfung in ${remainingSec} Sekunden`;
 
-        if (remainingSec <= 1) {
+        if (remainingSec == 0) {
             // Timer abgelaufen → Reload starten
             window.location.reload();
         }
-- 
2.49.1


From ad0e48b979633b0ef7ef5257f8445ef2beccdf48 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 20:38:31 +0200
Subject: [PATCH 117/144] srv/poe_manager/templates/index.html aktualisiert

---
 srv/poe_manager/templates/index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index a817235..333fd49 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -51,8 +51,9 @@ document.addEventListener("DOMContentLoaded", () => {
         document.getElementById("dashboard-timer").innerText =
             `Nächste Prüfung in ${remainingSec} Sekunden`;
 
-        if (remainingSec == 0) {
+        if (remainingSec <= 1) {
             // Timer abgelaufen → Reload starten
+            sleep 1
             window.location.reload();
         }
     }
-- 
2.49.1


From e244092667fb7446400b04bba8a49792dbd10d5b Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 20:39:06 +0200
Subject: [PATCH 118/144] srv/poe_manager/templates/index.html aktualisiert

---
 srv/poe_manager/templates/index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index 333fd49..8d1e747 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -53,7 +53,6 @@ document.addEventListener("DOMContentLoaded", () => {
 
         if (remainingSec <= 1) {
             // Timer abgelaufen → Reload starten
-            sleep 1
             window.location.reload();
         }
     }
-- 
2.49.1


From 8a5745e3373ac71e2cb07727a99dcc5930a31af2 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 20:46:00 +0200
Subject: [PATCH 119/144] srv/poe_manager/templates/index.html aktualisiert

---
 srv/poe_manager/templates/index.html | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index 8d1e747..3d7ac24 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -62,22 +62,16 @@ document.addEventListener("DOMContentLoaded", () => {
             .then(response => response.text())
             .then(data => {
                 const lines = data.split("\n").filter(line => !line.includes("ist erreichbar!"));
-                let lastSepIndex = -1;
-                for (let i = lines.length - 1; i >= 0; i--) {
-                    if (lines[i].startsWith("--------------------------------------------------------------------")) {
-                        lastSepIndex = i;
-                        break;
-                    }
-                }
-                if (lastSepIndex >= 0 && lastSepIndex + 1 < lines.length) {
-                    const firstLine = lines[lastSepIndex + 1];
-                    const match = firstLine.match(/^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/);
-                    if (match) lastUpdateTime = parseLogTimestamp(match[1]);
-                }
+                if (lines.length === 0) return;
+
+                const lastLine = lines[lines.length - 1]; // letzte Zeile
+                const match = lastLine.match(/^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/);
+                if (match) lastUpdateTime = parseLogTimestamp(match[1]);
             })
             .catch(err => console.error("Fehler beim Laden der Logs:", err));
     }
 
+
     // Timer alle 1 Sekunde aktualisieren
     setInterval(updateTimer, 1000);
 
-- 
2.49.1


From a4441859339802592c5f210c10226c41b679dc28 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 20:47:37 +0200
Subject: [PATCH 120/144] revert 8a5745e3373ac71e2cb07727a99dcc5930a31af2

revert srv/poe_manager/templates/index.html aktualisiert
---
 srv/poe_manager/templates/index.html | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index 3d7ac24..8d1e747 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -62,16 +62,22 @@ document.addEventListener("DOMContentLoaded", () => {
             .then(response => response.text())
             .then(data => {
                 const lines = data.split("\n").filter(line => !line.includes("ist erreichbar!"));
-                if (lines.length === 0) return;
-
-                const lastLine = lines[lines.length - 1]; // letzte Zeile
-                const match = lastLine.match(/^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/);
-                if (match) lastUpdateTime = parseLogTimestamp(match[1]);
+                let lastSepIndex = -1;
+                for (let i = lines.length - 1; i >= 0; i--) {
+                    if (lines[i].startsWith("--------------------------------------------------------------------")) {
+                        lastSepIndex = i;
+                        break;
+                    }
+                }
+                if (lastSepIndex >= 0 && lastSepIndex + 1 < lines.length) {
+                    const firstLine = lines[lastSepIndex + 1];
+                    const match = firstLine.match(/^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/);
+                    if (match) lastUpdateTime = parseLogTimestamp(match[1]);
+                }
             })
             .catch(err => console.error("Fehler beim Laden der Logs:", err));
     }
 
-
     // Timer alle 1 Sekunde aktualisieren
     setInterval(updateTimer, 1000);
 
-- 
2.49.1


From 45ba78c374e7e301cff6ca9cf32fca6bb056838c Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 21:12:50 +0200
Subject: [PATCH 121/144] .gitignore aktualisiert

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 1a3b01a..e99b790 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,4 +44,4 @@ __pycache__/
 !/srv/poe_manager/static/images/*
 
 # Optional: SQLite DB ignorieren (falls du nicht willst, dass Passwörter im Repo landen)
-# /srv/poe_manager/sqlite.db
+/srv/poe_manager/sqlite.db
-- 
2.49.1


From 349710e0d31248f04ef72bfed6573c3a549c6537 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 21:13:35 +0200
Subject: [PATCH 122/144] =?UTF-8?q?srv/poe=5Fmanager/sqlite.db=20gel=C3=B6?=
 =?UTF-8?q?scht?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 srv/poe_manager/sqlite.db | Bin 40960 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 srv/poe_manager/sqlite.db

diff --git a/srv/poe_manager/sqlite.db b/srv/poe_manager/sqlite.db
deleted file mode 100644
index 5530fe32bba16034124bfbfb0b19d319866eb125..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 40960
zcmeI*&1>W69S3m9@@qD+c9<F;h7`>*12GdPmgSfD5U9qH6OSFm@muWa!8o>TE3vIa
zl3(ImhF*H>|FD<-3qAI<htg7dXfIpJvQX$Ab_dFqmQtuB+cQx}N)OBK?Ce)W(xXQ|
zNk4raDWFFRDIMo!U1B<lI%w()M|?<-B=Hl5AqZmE7*~vOIk=31bGcy5$s6VSio3+t
z_~&bD{~&xH1PJ;g`jZa={=ct1T>H)HuUEHMe{tVtsD}UqAOHafKmY;|fWWsX@G3}o
zf{z}NKXd8L)4tS}#&S#27BgqMDDY*0Df7?s0<)-OHdYv87&Kc<S*VqnLNR;D7wb$;
zsBc<p)C;*GU(8pEM`cE=<n!}2+C<h{y+%*b^kH)#-4$}7sQO*?cf>QY)@ZhLc`Pwm
zu`KKhMP^UP@RfX-iOi3eIVuX-ebG#f*|>G^5K|N~LQxRYLW!BLleCRxYN3@-!|MsI
zuanmgEErAFb$Qs;mUEwtW?8$iIhU^Pu^Bh}qxpHSgtmR|V0xV-<Y8NyYL|WE;iS<V
z>58@7SnjgHE=wx~k30D68CjnvG~YmzE=SVPXfpev*Pfnz<%Ws5X>1v~j=Ma;V32&3
zwe~sEBvrE}Zrk=&)#BXb_8aXREzj_k@=;bawmKBV@?78C>TR=C#O!fJVC)yfMN`uz
zirT)b#m&}j59HyS!@X(Tl~Bm-4(<l;qqEX&u-42&|C9L7w|GCjTZale-9i4*eNKxT
zy1_0AuIrCT>zaQRoL^$r?J5~fWZt%t=CEB9%i6_tvAlEcx$y7)g<!u#{-0~ZxNRK&
z^R`*!YTP!95@j@r*KC$GV|1>4PSBeFul}DJ1q={?00bZa0SG_<0uX=z1R(Hz6&O3+
zfk5E8qDz{-9J{<ZJXfN6D&ConCYh`r4o?KRn&I<(zRri`YFo?~&fDs6RL!K5xfUNk
z*-;L&mti%1dU4u3yG+gWy>KEwsjBV0vz{VEnpsts4mthwTo_0B-Q8<1<$nAucwH%-
zgrkv2BwQ@AspuA)*x51`w^%l5b!9A5Vf9{q);>^s($1j64kCxS&S4@W4$i`bS){aI
zE2k>;T9)n9jvC#>SwT^bPCK(kqSG#f`9`*15__qhn7Jy4YiF(J2NgM<$R+E7HsL2m
zDk~26Q!ACSkqWyL7LEQDdonw>lIiL%b4@)qyV4_kxN=xId0E%_VQz4oJ{`-&s6Naj
zrAoEm>Sr`g%t+EGK1&ah)6q#X73FgJ>?oF~mQzzjeYwZg^UWG7WRlh7zLgAlBN@Y`
zG?H#5lenEsVcMF-Rq>*nJP2103Y~m&roLdg<5{!F?Y}sd^2OG9HG4MJN(XYMotEWH
zJg!IyY1}+6om|yl)>5;qs!iKMJXaIC1yQRg@vz$6-8EnEJLyjd`ZfI*`u9cw0|X!d
z0SG_<0uX=z1Rwwb2tWV=@2Y^83Xo>sj?+&)Cg1kAP#;oH$<mEJ4+l*>^;s2*eup*x
zZwaseW77XI{YUzj^o-8aKlZ=&|KVLdQRD>y2tWV=5P$##AOHafKmY>ot-uE9p`Sf|
z5cILjH}-7Q_<SG|d;6TrB@g&QBxVq}h(}(J@wr1F;9Y*}aC1&<dW@Yt4FtVO+s-)l
z=2J4e%_WQ-a_pvi9_>rmqS>9BkI+VR%!p=pHeHM8xIH><kB)L?bbQmfh>qE#W4EHs
zOxV~awTR~I(GhzzYh@DIa2U}hS=1IC<!+Ff`;Btu`+qO}JA(c<{Wbj+{Wtn^`p@*A
zj0y}8fB*y_009U<00Izz00bZa0SLUK0?W?;ye^6+lOA)LaGTS(%bdoX=9Ht%Y1HAQ
zXdi3-{lA00B<Nom6ATc500bZa0SG_<0uX=z1Rwwb2z)aF8Oluru3gsG2~VP@PuS>_
z+||KeFQd<zk!)s5QIeC9oSkhIDxG1mf4QBQTn+nMqn217r&O-n+k3&rBek?Zx`~I^
zF5g7f7Q5l2=cyMv?UQ4*mOhnw-EE~dZA;zCf!0&|t!}j{re>GtSI5yjH@%XR>Oh%}
z(&qbr2mRXo`~QD^Gbf0>KmY;|fB*y_009U<00Izz00bcLT?;I~5TM-DL$mL|eE(0<
zUlYa;1_(d^0uX=z1Rwwb2tWV=5P$##-X{ScNd-ykKS5IS@Bcp~=r8C`-=|Z=xj+B{
z5P$##AOHafKmY;|fB*!3C<3bvYMqvcx}=Vq{rHbaD)g|`lUnDEWgQoZ%)kHtjG(`y
tKl`D$;5;D!0SG_<0uX=z1Rwwb2tWV=@14LZwN5Ud_Z<(Ykk8%)@L${}t9$?e

-- 
2.49.1


From 1a67dca394ad69ec9a931006fe60c635e8ea75b5 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 21:14:19 +0200
Subject: [PATCH 123/144] revert 349710e0d31248f04ef72bfed6573c3a549c6537
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

revert srv/poe_manager/sqlite.db gelöscht
---
 srv/poe_manager/sqlite.db | Bin 0 -> 40960 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 srv/poe_manager/sqlite.db

diff --git a/srv/poe_manager/sqlite.db b/srv/poe_manager/sqlite.db
new file mode 100644
index 0000000000000000000000000000000000000000..5530fe32bba16034124bfbfb0b19d319866eb125
GIT binary patch
literal 40960
zcmeI*&1>W69S3m9@@qD+c9<F;h7`>*12GdPmgSfD5U9qH6OSFm@muWa!8o>TE3vIa
zl3(ImhF*H>|FD<-3qAI<htg7dXfIpJvQX$Ab_dFqmQtuB+cQx}N)OBK?Ce)W(xXQ|
zNk4raDWFFRDIMo!U1B<lI%w()M|?<-B=Hl5AqZmE7*~vOIk=31bGcy5$s6VSio3+t
z_~&bD{~&xH1PJ;g`jZa={=ct1T>H)HuUEHMe{tVtsD}UqAOHafKmY;|fWWsX@G3}o
zf{z}NKXd8L)4tS}#&S#27BgqMDDY*0Df7?s0<)-OHdYv87&Kc<S*VqnLNR;D7wb$;
zsBc<p)C;*GU(8pEM`cE=<n!}2+C<h{y+%*b^kH)#-4$}7sQO*?cf>QY)@ZhLc`Pwm
zu`KKhMP^UP@RfX-iOi3eIVuX-ebG#f*|>G^5K|N~LQxRYLW!BLleCRxYN3@-!|MsI
zuanmgEErAFb$Qs;mUEwtW?8$iIhU^Pu^Bh}qxpHSgtmR|V0xV-<Y8NyYL|WE;iS<V
z>58@7SnjgHE=wx~k30D68CjnvG~YmzE=SVPXfpev*Pfnz<%Ws5X>1v~j=Ma;V32&3
zwe~sEBvrE}Zrk=&)#BXb_8aXREzj_k@=;bawmKBV@?78C>TR=C#O!fJVC)yfMN`uz
zirT)b#m&}j59HyS!@X(Tl~Bm-4(<l;qqEX&u-42&|C9L7w|GCjTZale-9i4*eNKxT
zy1_0AuIrCT>zaQRoL^$r?J5~fWZt%t=CEB9%i6_tvAlEcx$y7)g<!u#{-0~ZxNRK&
z^R`*!YTP!95@j@r*KC$GV|1>4PSBeFul}DJ1q={?00bZa0SG_<0uX=z1R(Hz6&O3+
zfk5E8qDz{-9J{<ZJXfN6D&ConCYh`r4o?KRn&I<(zRri`YFo?~&fDs6RL!K5xfUNk
z*-;L&mti%1dU4u3yG+gWy>KEwsjBV0vz{VEnpsts4mthwTo_0B-Q8<1<$nAucwH%-
zgrkv2BwQ@AspuA)*x51`w^%l5b!9A5Vf9{q);>^s($1j64kCxS&S4@W4$i`bS){aI
zE2k>;T9)n9jvC#>SwT^bPCK(kqSG#f`9`*15__qhn7Jy4YiF(J2NgM<$R+E7HsL2m
zDk~26Q!ACSkqWyL7LEQDdonw>lIiL%b4@)qyV4_kxN=xId0E%_VQz4oJ{`-&s6Naj
zrAoEm>Sr`g%t+EGK1&ah)6q#X73FgJ>?oF~mQzzjeYwZg^UWG7WRlh7zLgAlBN@Y`
zG?H#5lenEsVcMF-Rq>*nJP2103Y~m&roLdg<5{!F?Y}sd^2OG9HG4MJN(XYMotEWH
zJg!IyY1}+6om|yl)>5;qs!iKMJXaIC1yQRg@vz$6-8EnEJLyjd`ZfI*`u9cw0|X!d
z0SG_<0uX=z1Rwwb2tWV=@2Y^83Xo>sj?+&)Cg1kAP#;oH$<mEJ4+l*>^;s2*eup*x
zZwaseW77XI{YUzj^o-8aKlZ=&|KVLdQRD>y2tWV=5P$##AOHafKmY>ot-uE9p`Sf|
z5cILjH}-7Q_<SG|d;6TrB@g&QBxVq}h(}(J@wr1F;9Y*}aC1&<dW@Yt4FtVO+s-)l
z=2J4e%_WQ-a_pvi9_>rmqS>9BkI+VR%!p=pHeHM8xIH><kB)L?bbQmfh>qE#W4EHs
zOxV~awTR~I(GhzzYh@DIa2U}hS=1IC<!+Ff`;Btu`+qO}JA(c<{Wbj+{Wtn^`p@*A
zj0y}8fB*y_009U<00Izz00bZa0SLUK0?W?;ye^6+lOA)LaGTS(%bdoX=9Ht%Y1HAQ
zXdi3-{lA00B<Nom6ATc500bZa0SG_<0uX=z1Rwwb2z)aF8Oluru3gsG2~VP@PuS>_
z+||KeFQd<zk!)s5QIeC9oSkhIDxG1mf4QBQTn+nMqn217r&O-n+k3&rBek?Zx`~I^
zF5g7f7Q5l2=cyMv?UQ4*mOhnw-EE~dZA;zCf!0&|t!}j{re>GtSI5yjH@%XR>Oh%}
z(&qbr2mRXo`~QD^Gbf0>KmY;|fB*y_009U<00Izz00bcLT?;I~5TM-DL$mL|eE(0<
zUlYa;1_(d^0uX=z1Rwwb2tWV=5P$##-X{ScNd-ykKS5IS@Bcp~=r8C`-=|Z=xj+B{
z5P$##AOHafKmY;|fB*!3C<3bvYMqvcx}=Vq{rHbaD)g|`lUnDEWgQoZ%)kHtjG(`y
tKl`D$;5;D!0SG_<0uX=z1Rwwb2tWV=@14LZwN5Ud_Z<(Ykk8%)@L${}t9$?e

literal 0
HcmV?d00001

-- 
2.49.1


From b2f9b701fe7a154e0b212c29baa36258c19559fb Mon Sep 17 00:00:00 2001
From: Master <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 21:27:05 +0200
Subject: [PATCH 124/144] Index.html

---
 srv/poe_manager/sqlite.db            | Bin 40960 -> 40960 bytes
 srv/poe_manager/templates/index.html |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/sqlite.db b/srv/poe_manager/sqlite.db
index 5530fe32bba16034124bfbfb0b19d319866eb125..548dc798dbd4aab38089f9b1e139e0a155805201 100644
GIT binary patch
delta 150
zcmV;H0BQe#zyg540+1U4L6ICo0YR}~qz?=O4qE^Za}MSXTMgs05g<zrvs)gi0Sp5V
z&;Sqc58n^a5680+V89QP&@VIr2eSn*%MJk|k%1oxEC&Y<D<u^d3A6b=3jqTM57)B?
zK*tY}PzkfwPcSeA0T1dA+_Mpo(GQc|j|>+v69EG$5o2g&V{2b&ZggdGc42HbFaV;E
E5TlPT1ONa4

delta 314
zcmZoTz|?SnX@WGP?L--8M%#@EOZa(Mcpo$H7xO*ii{^d2Sy13IZ+#gHo2aO0V`xcg
zaS05kJA!~yzEO##X<9{TxtnK+u5P(&W|*6!PmW`xqi$wcil0wFc1lrRX_%X{xp%Uo
zX}CqcuV<ldk#kZ(Qesx2WmSobu9;7HSW${gRz|+7L850-Nvf}LNm90JnUSNdZ6gOW
zo1(V(<|MgAj65v-#~JuP@ZaaZz<+$Rpu%?k$sh7L7+EG?&^KY^*vx8hnopCJL7Iad
z=u%Np4wy5MX$Bp3c7APDQE`sVKkc{~nK}5+ZDw~k4l#&h^L2j%16Bt9SNwN23r@Jm
kKlyGykGQD_BeSM(az<)$c6?@DNorA9Vveza!J-KQ058X6lK=n!

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index 8d1e747..105ace2 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -61,7 +61,7 @@ document.addEventListener("DOMContentLoaded", () => {
         fetch("{{ url_for('get_log') }}")
             .then(response => response.text())
             .then(data => {
-                const lines = data.split("\n").filter(line => !line.includes("ist erreichbar!"));
+                const lines = data.split("\n");
                 let lastSepIndex = -1;
                 for (let i = lines.length - 1; i >= 0; i--) {
                     if (lines[i].startsWith("--------------------------------------------------------------------")) {
-- 
2.49.1


From cea081585f64cca0fab5ab8e9d4405fa383230c8 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 21:30:08 +0200
Subject: [PATCH 125/144] srv/poe_manager/templates/logs.html aktualisiert

---
 srv/poe_manager/templates/logs.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srv/poe_manager/templates/logs.html b/srv/poe_manager/templates/logs.html
index 3e24d81..67b0f42 100644
--- a/srv/poe_manager/templates/logs.html
+++ b/srv/poe_manager/templates/logs.html
@@ -77,5 +77,4 @@ document.addEventListener("DOMContentLoaded", () => {
     setInterval(updateTimer, 1000);
 });
 </script>
-
 {% endblock %}
-- 
2.49.1


From 57ce7d0c6fb023dd8c45caf92639347d4a025821 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 21:30:45 +0200
Subject: [PATCH 126/144] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 62efe61..7a8b50e 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -327,7 +327,6 @@ def toggle_device(mac):
     status_text = "deaktiviert" if new_status == 0 else "aktiviert"
     return {"success": True, "msg": f"Gerät {device['name']} wurde {status_text}.", "new_status": new_status}
 
-
 @app.route('/switches', methods=['GET', 'POST'])
 @login_required
 def switches():
-- 
2.49.1


From af689c20b8b9428883714d0cdea30b1c9dabc4c3 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 21:33:16 +0200
Subject: [PATCH 127/144] srv/poe_manager/templates/logs.html aktualisiert

---
 srv/poe_manager/templates/logs.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srv/poe_manager/templates/logs.html b/srv/poe_manager/templates/logs.html
index 67b0f42..5f87f73 100644
--- a/srv/poe_manager/templates/logs.html
+++ b/srv/poe_manager/templates/logs.html
@@ -33,8 +33,7 @@ document.addEventListener("DOMContentLoaded", () => {
             .then(data => {
                 const box = document.getElementById("log-box");
                 const filteredLines = data
-                    .split("\n")
-                    .filter(line => !line.includes("ist erreichbar!"));
+                    .split("\n");
                 box.innerText = filteredLines.join("\n");
                 box.scrollTop = box.scrollHeight;
 
-- 
2.49.1


From 4258ff07eb12fa658df566765fcc94c255a714f4 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 21:37:27 +0200
Subject: [PATCH 128/144] srv/poe_manager/templates/logs.html aktualisiert

---
 srv/poe_manager/templates/logs.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/logs.html b/srv/poe_manager/templates/logs.html
index 5f87f73..cf442ef 100644
--- a/srv/poe_manager/templates/logs.html
+++ b/srv/poe_manager/templates/logs.html
@@ -7,8 +7,9 @@
     <span style="font-size: 1.2rem; color: white;">⟳</span> Logs aktualisieren
 </button>
 
+Nächstes Update in <span id="timer"></span> Sekunden
+
 <div id="log-container">
-    <div id="log-box"></div>
     <div id="refresh-timer">
         Nächstes Update in <span id="timer"></span> Sekunden
     </div>
-- 
2.49.1


From 91885932c88d09a3b9d2ade327ba321906b62dd2 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 21:38:00 +0200
Subject: [PATCH 129/144] srv/poe_manager/templates/logs.html aktualisiert

---
 srv/poe_manager/templates/logs.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/srv/poe_manager/templates/logs.html b/srv/poe_manager/templates/logs.html
index cf442ef..e39584a 100644
--- a/srv/poe_manager/templates/logs.html
+++ b/srv/poe_manager/templates/logs.html
@@ -7,8 +7,6 @@
     <span style="font-size: 1.2rem; color: white;">⟳</span> Logs aktualisieren
 </button>
 
-Nächstes Update in <span id="timer"></span> Sekunden
-
 <div id="log-container">
     <div id="refresh-timer">
         Nächstes Update in <span id="timer"></span> Sekunden
-- 
2.49.1


From fbfafd0055813db74b7951e80a308b4f7b0fdfe3 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 21:39:25 +0200
Subject: [PATCH 130/144] srv/poe_manager/templates/logs.html aktualisiert

---
 srv/poe_manager/templates/logs.html | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srv/poe_manager/templates/logs.html b/srv/poe_manager/templates/logs.html
index e39584a..4b89457 100644
--- a/srv/poe_manager/templates/logs.html
+++ b/srv/poe_manager/templates/logs.html
@@ -7,11 +7,9 @@
     <span style="font-size: 1.2rem; color: white;">⟳</span> Logs aktualisieren
 </button>
 
-<div id="log-container">
-    <div id="refresh-timer">
-        Nächstes Update in <span id="timer"></span> Sekunden
-    </div>
-</div>
+<span id="refresh-timer" class="badge bg-success">
+    Nächste Update in Prüfung in <span id="timer"></span> Sekunden
+</span>
 
 <script>
 function parseLogTimestamp(ts) {
-- 
2.49.1


From 459aeb22cfbac56d88edfb3e7afd7551c15b07e7 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 21:40:22 +0200
Subject: [PATCH 131/144] revert fbfafd0055813db74b7951e80a308b4f7b0fdfe3

revert srv/poe_manager/templates/logs.html aktualisiert
---
 srv/poe_manager/templates/logs.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srv/poe_manager/templates/logs.html b/srv/poe_manager/templates/logs.html
index 4b89457..e39584a 100644
--- a/srv/poe_manager/templates/logs.html
+++ b/srv/poe_manager/templates/logs.html
@@ -7,9 +7,11 @@
     <span style="font-size: 1.2rem; color: white;">⟳</span> Logs aktualisieren
 </button>
 
-<span id="refresh-timer" class="badge bg-success">
-    Nächste Update in Prüfung in <span id="timer"></span> Sekunden
-</span>
+<div id="log-container">
+    <div id="refresh-timer">
+        Nächstes Update in <span id="timer"></span> Sekunden
+    </div>
+</div>
 
 <script>
 function parseLogTimestamp(ts) {
-- 
2.49.1


From 861c019324ca708d4f3562613a93d7f2354dcc07 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 21:40:45 +0200
Subject: [PATCH 132/144] srv/poe_manager/templates/logs.html aktualisiert

---
 srv/poe_manager/templates/logs.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srv/poe_manager/templates/logs.html b/srv/poe_manager/templates/logs.html
index e39584a..dd2d4b4 100644
--- a/srv/poe_manager/templates/logs.html
+++ b/srv/poe_manager/templates/logs.html
@@ -7,10 +7,11 @@
     <span style="font-size: 1.2rem; color: white;">⟳</span> Logs aktualisieren
 </button>
 
+<span id="refresh-timer" class="badge bg-success">
+    Nächste Update in Prüfung in <span id="timer"></span> Sekunden
+</span>
+
 <div id="log-container">
-    <div id="refresh-timer">
-        Nächstes Update in <span id="timer"></span> Sekunden
-    </div>
 </div>
 
 <script>
-- 
2.49.1


From 56ed90f5602e7012d85b79e27f4ca8f3a228e920 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 21:41:23 +0200
Subject: [PATCH 133/144] revert 861c019324ca708d4f3562613a93d7f2354dcc07

revert srv/poe_manager/templates/logs.html aktualisiert
---
 srv/poe_manager/templates/logs.html | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srv/poe_manager/templates/logs.html b/srv/poe_manager/templates/logs.html
index dd2d4b4..e39584a 100644
--- a/srv/poe_manager/templates/logs.html
+++ b/srv/poe_manager/templates/logs.html
@@ -7,11 +7,10 @@
     <span style="font-size: 1.2rem; color: white;">⟳</span> Logs aktualisieren
 </button>
 
-<span id="refresh-timer" class="badge bg-success">
-    Nächste Update in Prüfung in <span id="timer"></span> Sekunden
-</span>
-
 <div id="log-container">
+    <div id="refresh-timer">
+        Nächstes Update in <span id="timer"></span> Sekunden
+    </div>
 </div>
 
 <script>
-- 
2.49.1


From b1eaecf3f295cd6e9b6ff6cbb3cf0585e9703388 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 21:42:28 +0200
Subject: [PATCH 134/144] revert 4258ff07eb12fa658df566765fcc94c255a714f4

revert srv/poe_manager/templates/logs.html aktualisiert
---
 srv/poe_manager/templates/logs.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srv/poe_manager/templates/logs.html b/srv/poe_manager/templates/logs.html
index e39584a..5f87f73 100644
--- a/srv/poe_manager/templates/logs.html
+++ b/srv/poe_manager/templates/logs.html
@@ -8,6 +8,7 @@
 </button>
 
 <div id="log-container">
+    <div id="log-box"></div>
     <div id="refresh-timer">
         Nächstes Update in <span id="timer"></span> Sekunden
     </div>
-- 
2.49.1


From 25d778086ddbc07ef156af4be41d62a8f04f4bf5 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 21:54:08 +0200
Subject: [PATCH 135/144] srv/poe_manager/templates/devices.html aktualisiert

---
 srv/poe_manager/templates/devices.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/devices.html b/srv/poe_manager/templates/devices.html
index 8bcd7a9..08b1ba9 100644
--- a/srv/poe_manager/templates/devices.html
+++ b/srv/poe_manager/templates/devices.html
@@ -16,7 +16,7 @@
             <th>MAC-Adresse</th>
             <th>Port</th>
             <th>Switch</th>
-            <th>Status</th>
+            {% if current_user.is_admin %}<th>Status</th>{% endif %}
             {% if current_user.is_admin %}<th>Aktionen</th>{% endif %}
         </tr>
     </thead>
-- 
2.49.1


From 1e94ac6ddeb4123952cf0f2f906d995b1b7a2fd3 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 21:57:43 +0200
Subject: [PATCH 136/144] srv/poe_manager/templates/devices.html aktualisiert

---
 srv/poe_manager/templates/devices.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/devices.html b/srv/poe_manager/templates/devices.html
index 08b1ba9..efc8ed3 100644
--- a/srv/poe_manager/templates/devices.html
+++ b/srv/poe_manager/templates/devices.html
@@ -28,13 +28,13 @@
             <td>{{ d['mac'] }}</td>
             <td>{{ d['port'] }}</td>
             <td>{{ d['switch_hostname'] or '-' }}</td>
+            {% if current_user.is_admin %}
             <td>
                 <button class="btn btn-sm {% if d['is_active'] %}btn-success{% else %}btn-secondary{% endif %}" 
                         onclick="toggleDevice('{{ d['mac'] }}', this)">
                     {% if d['is_active'] %}Deaktivieren{% else %}Aktivieren{% endif %}
                 </button>
             </td>
-            {% if current_user.is_admin %}
             <td>
                 <!-- Bearbeiten Modal -->
                 <button class="btn btn-secondary btn-sm button login white" data-bs-toggle="modal" data-bs-target="#editDeviceModal"
-- 
2.49.1


From 9965d8d4fbfab504d62cf2b9fdb01ffad0ea5fa4 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 21:59:22 +0200
Subject: [PATCH 137/144] srv/poe_manager/templates/devices.html aktualisiert

---
 srv/poe_manager/templates/devices.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srv/poe_manager/templates/devices.html b/srv/poe_manager/templates/devices.html
index efc8ed3..4172023 100644
--- a/srv/poe_manager/templates/devices.html
+++ b/srv/poe_manager/templates/devices.html
@@ -14,8 +14,8 @@
             <th>Hostname</th>
             <th>IP-Adresse</th>
             <th>MAC-Adresse</th>
-            <th>Port</th>
             <th>Switch</th>
+            <th>Port</th>
             {% if current_user.is_admin %}<th>Status</th>{% endif %}
             {% if current_user.is_admin %}<th>Aktionen</th>{% endif %}
         </tr>
@@ -26,8 +26,8 @@
             <td>{{ d['name'] }}</td>
             <td>{{ d['rpi_ip'] }}</td>
             <td>{{ d['mac'] }}</td>
-            <td>{{ d['port'] }}</td>
             <td>{{ d['switch_hostname'] or '-' }}</td>
+            <td>{{ d['port'] }}</td>
             {% if current_user.is_admin %}
             <td>
                 <button class="btn btn-sm {% if d['is_active'] %}btn-success{% else %}btn-secondary{% endif %}" 
-- 
2.49.1


From cbce015eddcb0d466dea82d7c9c6482e1c99f846 Mon Sep 17 00:00:00 2001
From: Master <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 22:01:03 +0200
Subject: [PATCH 138/144] DB

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index e99b790..1a3b01a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,4 +44,4 @@ __pycache__/
 !/srv/poe_manager/static/images/*
 
 # Optional: SQLite DB ignorieren (falls du nicht willst, dass Passwörter im Repo landen)
-/srv/poe_manager/sqlite.db
+# /srv/poe_manager/sqlite.db
-- 
2.49.1


From 5df7a1378072c35465becac73504434f28838262 Mon Sep 17 00:00:00 2001
From: Master <tim@eertmoed.de>
Date: Wed, 8 Oct 2025 22:02:40 +0200
Subject: [PATCH 139/144] DB

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 1a3b01a..1644153 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,4 +44,4 @@ __pycache__/
 !/srv/poe_manager/static/images/*
 
 # Optional: SQLite DB ignorieren (falls du nicht willst, dass Passwörter im Repo landen)
-# /srv/poe_manager/sqlite.db
+!/srv/poe_manager/sqlite.db
-- 
2.49.1


From f6ce3763a565e27585a91dd912a157f1c2a7b3df Mon Sep 17 00:00:00 2001
From: Master <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 12:32:24 +0200
Subject: [PATCH 140/144] v1.1

---
 srv/poe_manager/sqlite.db       | Bin 40960 -> 40960 bytes
 usr/local/bin/custom/ips.list   |   8 ---
 usr/local/bin/custom/poe.sh.bak |  87 --------------------------------
 3 files changed, 95 deletions(-)
 delete mode 100644 usr/local/bin/custom/ips.list
 delete mode 100755 usr/local/bin/custom/poe.sh.bak

diff --git a/srv/poe_manager/sqlite.db b/srv/poe_manager/sqlite.db
index 548dc798dbd4aab38089f9b1e139e0a155805201..06b3c8ef28954ba8e0a51ebd4361d09ba4a0733e 100644
GIT binary patch
delta 1137
zcmZuvOK%%h7@hI>K?CEPs0~(9KvX0usB%0H&t&G3wDKd)c#K`U9^0wAaL1m9pJO|A
z#<4evB^K<U8i_vuOIT1V3s_YwvP2aU>IMlUR2E%j3tiB0i&0E^rIGHObMJS~cfNc4
z$Z`D0@x@iN_~4xgTKw+**TCz-1qAfGe|qoXzu>}TX_3W`#tSa@`VHSWmo4}yf*|~<
z_P#>$)CS3N8#b^(l8mghYK9(~u5g=eYGPm8Ckj%r5sSBVb=VWsXmiLLxo%!!^n|dh
zrrLQv*vzJT$-87iugg@DZVIg^y*uPL2jzCGG-$9vW><^Gj%b=-h?tP8WUBi1_84=z
zeJ|Ze{#bb4MsVInz0=HcB|XYy4;wkN9^}kkKB5R|K9Pyu=J@(Bk|y)rQOVRBMX@mO
zw+`!Sza*xl*uXR@cRB~19r2E|Tq{YU8Tv#plllD!J!)vZ!S?p#-g|M>VB1xHime{d
z{kuG&c4JzzK1_$J=~}ua>IET_$x)+JEKyWb$!L5>FPTQYUGy7=+DKx{N+{#s)U?cy
z>BM?H&fg#mu}{}pR4ClE8(lyU#05?ea0Y$@r{DxUo-Dop6}Y;Ht)u5B;ktzR(Cjn}
zr}a2My?usw@aL%a1e|&Y;4?1|MEtq;XM2=?;Hz66PvFM-vhR{ofieqe3Q`(WD5wRk
zzi+OsZn<7Zldw!#`CB%Py`E+j>!D3^s7+s6vWs(&mZ73RCI~4R5}VeyH$QM7#Rud3
z>X!T88fp+S8YD<4^N=k=IcR-2m2m!_)@WGfAXBzJok}=n5;On24CM-BIqUaZ*L>g!
z;sFu@egxluV^9ZQ0tq|=KiRo$fum(CfL;)FPtglucrKvR3|w>QOxQ7pPU9pYt6*2K
zz<drLPlK>WdfEQYuj%#wY|WZ=;`R{?Tt~q7pbM_s4XglBaJrF|vFnX$uOs(IYgBoS
zq}E2g{sEEOi!|f4P+STPJ9N0kY!s3S-jMf9VvpJhq_o>~=5VjCm|`IjNb($ObxYO)
z2A(3|sr|bCnk?Oa0^VG}R?t_aos+XRSj3$;c!oH@DQdsIUu_FN0R9S!eRR1}RV$5B
h&FHK9rrabc;w=aEE|~pOw)5rl4Zhq@{`nkTd;$GSF<Srt

delta 468
zcmZoTz|?SnX@WGP<3t%}M#qf_OZa)1`Jx&4i}{}MMe{!1tf=74w>etQlQGAzBt4)a
zxyrQ2uOP(SLpRJLAk8PSs>sXGIIt=)$k^R0Fx4k0IXlcVtE@QKBQq_<IWyDE)HFZU
zEVV2#FgUz2GAhEd%Co4rBE{9zJHj<Rz^^zo-&D6K-PV?ifq{XU{{jR52mbr~7x<5F
z7ECz6Kly^bk=R)VcD}`oe2e+7@vq>o;`iZ~<NLsO3FxeDJ}wPLc7AO|L2*vQ$>;5q
z8I>kB%5&+k1I1KD#W~F<i`uDh>99e$W|LFwfm~K7*K~3)NR|c4HJQ8!B+Crt8c&`G
zl+|DYazVx$O@3gnC=PTYJO6bC{@?sx`QP)u<bTY6m;XBdIiOSb^P93V^D~;WgGe(r
z5NXN^B28F8q%kvyG-6_5=I1oz1scP|U&z3}lfMw?i&Xx}h4GU)nD{?{{Qh&ZV8Ijq
z%^&jl1$dbuD(^7zzv92MS#ZKdekCSmS^mttlGLKI#2iCmMrKXH<c!qh?0A@%nZf4&
H{fq(thLL+r

diff --git a/usr/local/bin/custom/ips.list b/usr/local/bin/custom/ips.list
deleted file mode 100644
index 523bb5a..0000000
--- a/usr/local/bin/custom/ips.list
+++ /dev/null
@@ -1,8 +0,0 @@
-#IP-RPI:IP-SWITCH:PORT:NAME
-192.168.120.104:192.168.200.117:37:HAP04
-192.168.120.110:192.168.200.116:1/14:HAP10
-192.168.120.114:192.168.200.116:1/26:HAP14
-192.168.120.115:192.168.200.116:1/23:HAP15
-192.168.120.118:192.168.200.116:1/34:HAP18
-192.168.120.123:192.168.200.117:36:HAP23
-192.168.120.131:192.168.200.118:1/36:HAP31
\ No newline at end of file
diff --git a/usr/local/bin/custom/poe.sh.bak b/usr/local/bin/custom/poe.sh.bak
deleted file mode 100755
index fa0624e..0000000
--- a/usr/local/bin/custom/poe.sh.bak
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-
-USER="admin"
-PASS="Expl0rer#2022"
-IP_FILE="/usr/local/bin/custom/ips.list"
-LOGFILE="/var/log/rpi.log"
-
-function disable_poe() {
-    local switch_ip=$1
-    local port=$2
-    expect <<EOF
-set timeout 5
-spawn ssh $USER@$switch_ip
-
-expect {
-    "assword:" { send "$PASS\r"; exp_continue }
-    "Press any key" { send "\r"; exp_continue }
-    -re ".*> $" { }
-}
-send "configure terminal\r"
-expect "(config)#"
-send "interface $port\r"
-expect "(eth-$port)#"
-send "no power-over-ethernet\r"
-expect "(eth-$port)#"
-send "exit\r"
-expect "(config)#"
-send "exit\r"
-expect "#"
-send "exit\r"
-expect ">"
-send "exit\r"
-expect "Do you want to log out (y/n)?" { send "y\r" }
-expect eof
-EOF
-}
-
-function enable_poe() {
-    local switch_ip=$1
-    local port=$2
-    expect <<EOF
-set timeout 5
-spawn ssh $USER@$switch_ip
-
-expect {
-    "assword:" { send "$PASS\r"; exp_continue }
-    "Press any key" { send "\r"; exp_continue }
-    -re ".*> $" { }
-}
-send "configure terminal\r"
-expect "(config)#"
-send "interface $port\r"
-expect "(eth-$port)#"
-send "power-over-ethernet\r"
-expect "(eth-$port)#"
-send "exit\r"
-expect "(config)#"
-send "exit\r"
-expect "#"
-send "exit\r"
-expect ">"
-send "exit\r"
-expect "Do you want to log out (y/n)?" { send "y\r" }
-expect eof
-EOF
-}
-
-echo "" > $LOGFILE
-while true; do
-   echo "--------------------------------------------------------------------" >> $LOGFILE
-#   echo "$(date '+%Y-%m-%d %H:%M:%S') Check Start" >> $LOGFILE
-   while IFS=: read -r ip switch port hap; do
-       ping -c 1 -W 2 $ip &> /dev/null
-       if [ $? -ne 0 ]; then
-           echo "$(date '+%Y-%m-%d %H:%M:%S') $ip nicht erreichbar, PoE auf Port $port am Switch $switch wird deaktiviert." >> $LOGFILE
-           disable_poe $switch $port
-           sleep 5
-           enable_poe $switch $port
-           echo "$(date '+%Y-%m-%d %H:%M:%S') PoE auf Port $port für IP $ip am Switch $switch aktiviert." >> $LOGFILE
-       fi
-#       if [ $? -ne 1 ]; then
-#           echo "$(date '+%Y-%m-%d %H:%M:%S') $hap ist erreichbar!" >> $LOGFILE
-#       fi
-   done < "$IP_FILE"
-#   echo "$(date '+%Y-%m-%d %H:%M:%S') Check beendet" >> $LOGFILE
-   sleep 300
-done
-- 
2.49.1


From 41f244cc59473276d65639d6e8f153e6d16773e1 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 13:34:55 +0200
Subject: [PATCH 141/144] usr/local/bin/custom/poe.sh aktualisiert

---
 usr/local/bin/custom/poe.sh | 62 +++++++++++++++++++++----------------
 1 file changed, 35 insertions(+), 27 deletions(-)

diff --git a/usr/local/bin/custom/poe.sh b/usr/local/bin/custom/poe.sh
index 79dcbb1..30f630a 100644
--- a/usr/local/bin/custom/poe.sh
+++ b/usr/local/bin/custom/poe.sh
@@ -1,9 +1,20 @@
 #!/bin/bash
+# ============================================================================
+# PoE Device Check Script
+# - prüft Erreichbarkeit von Geräten
+# - startet PoE-Port bei Ausfall neu
+# - loggt Ereignisse
+# - löscht alte Logfiles (>30 Tage)
+# ============================================================================
 
-LOGFILE="/var/log/rpi-$(date '+%Y%m%d%H%M%S').log"
+LOG_DIR="/var/log"
+LOGFILE="$LOG_DIR/rpi-$(date '+%Y%m%d%H%M%S').log"
 
-# Intervall aus DB (Sekunden) abrufen
-SLEEP=$(python3 - <<END
+# Alte Logfiles löschen (älter als 30 Tage)
+find "$LOG_DIR" -type f -name "rpi-*.log" -mtime +30 -delete
+
+# Intervall aus DB abrufen
+SLEEP=$(python3 - <<'END'
 import sqlite3
 conn = sqlite3.connect("/srv/poe_manager/sqlite.db")
 row = conn.execute("SELECT value FROM settings WHERE key='check_interval'").fetchone()
@@ -12,8 +23,7 @@ print(row[0] if row else 300)
 END
 )
 
-# Umrechnung falls nötig
-SLEEP=${SLEEP:-300}  # default 300 Sekunden
+SLEEP=${SLEEP:-300}
 
 function disable_poe() {
     local switch_ip=$1
@@ -23,7 +33,6 @@ function disable_poe() {
     expect <<EOF
 set timeout 5
 spawn ssh $username@$switch_ip
-
 expect {
     "assword:" { send "$password\r"; exp_continue }
     "Press any key" { send "\r"; exp_continue }
@@ -40,8 +49,7 @@ expect "(config)#"
 send "exit\r"
 expect "#"
 send "exit\r"
-expect ">"
-send "exit\r"
+expect ">"; send "exit\r"
 expect "Do you want to log out (y/n)?" { send "y\r" }
 expect eof
 EOF
@@ -55,7 +63,6 @@ function enable_poe() {
     expect <<EOF
 set timeout 5
 spawn ssh $username@$switch_ip
-
 expect {
     "assword:" { send "$password\r"; exp_continue }
     "Press any key" { send "\r"; exp_continue }
@@ -72,30 +79,31 @@ expect "(config)#"
 send "exit\r"
 expect "#"
 send "exit\r"
-expect ">"
-send "exit\r"
+expect ">"; send "exit\r"
 expect "Do you want to log out (y/n)?" { send "y\r" }
 expect eof
 EOF
 }
 
-echo "" > $LOGFILE
+echo "" > "$LOGFILE"
+
 while true; do
-    echo "--------------------------------------------------------------------" >> $LOGFILE
-    IP_FILE=$(python3 /srv/poe_manager/generate_ips.py)
-    while IFS=: read -r rpi_ip dev_name switch_ip switch_hostname switch_port switch_user switch_pass; do
-        ping -c 1 -W 2 "$rpi_ip" &> /dev/null
-        if [ $? -ne 0 ]; then
-            echo "$(date '+%Y-%m-%d %H:%M:%S') $dev_name ist nicht erreichbar!" >> $LOGFILE
-            disable_poe "$switch_ip" "$switch_port" "$switch_user" "$switch_pass"
-            echo "$(date '+%Y-%m-%d %H:%M:%S') $dev_name PoE auf Port $switch_port am Switch $switch_hostname deaktiviert." >> $LOGFILE
-            sleep 2
-            enable_poe "$switch_ip" "$switch_port" "$switch_user" "$switch_pass"
-            echo "$(date '+%Y-%m-%d %H:%M:%S') $dev_name PoE auf Port $switch_port am Switch $switch_hostname aktiviert." >> $LOGFILE
+    echo "--------------------------------------------------------------------" >> "$LOGFILE"
+    python3 /srv/poe_manager/generate_ips.py | while IFS=: read -r rpi_ip dev_name switch_ip switch_hostname switch_port switch_user switch_pass; do
+        if ping -c 1 -W 2 "$rpi_ip" &> /dev/null; then
+            echo "$(date '+%Y-%m-%d %H:%M:%S') $dev_name ist erreichbar!" >> "$LOGFILE"
         else
-            echo "$(date '+%Y-%m-%d %H:%M:%S') $dev_name ist erreichbar!" >> $LOGFILE
+            echo "$(date '+%Y-%m-%d %H:%M:%S') $dev_name ist nicht erreichbar!" >> "$LOGFILE"
+
+            # Nur PoE neu starten, wenn Port vorhanden ist
+            if [ -n "$switch_port" ]; then
+                disable_poe "$switch_ip" "$switch_port" "$switch_user" "$switch_pass"
+                echo "$(date '+%Y-%m-%d %H:%M:%S') $dev_name PoE auf Port $switch_port am Switch $switch_hostname deaktiviert." >> "$LOGFILE"
+                sleep 2
+                enable_poe "$switch_ip" "$switch_port" "$switch_user" "$switch_pass"
+                echo "$(date '+%Y-%m-%d %H:%M:%S') $dev_name PoE auf Port $switch_port am Switch $switch_hostname aktiviert." >> "$LOGFILE"
+            fi
         fi
-    done < "$IP_FILE"
-    rm -f "$IP_FILE"
-    sleep $SLEEP
+    done
+    sleep "$SLEEP"
 done
-- 
2.49.1


From 772d19036999044f116c8da9f2d7d761e9418f28 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 13:35:48 +0200
Subject: [PATCH 142/144] srv/poe_manager/generate_ips.py aktualisiert

---
 srv/poe_manager/generate_ips.py | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/srv/poe_manager/generate_ips.py b/srv/poe_manager/generate_ips.py
index 53409ec..a299564 100644
--- a/srv/poe_manager/generate_ips.py
+++ b/srv/poe_manager/generate_ips.py
@@ -1,21 +1,12 @@
 #!/usr/bin/env python3
 import sqlite3
-import tempfile
-import os
 from app import decrypt_password, DB_PATH
 
 def generate_ips_list():
     conn = sqlite3.connect(DB_PATH)
     conn.row_factory = sqlite3.Row
 
-    # Alle Switches laden
     switches = {row['hostname']: row for row in conn.execute("SELECT hostname, ip, username, password FROM switches")}
-    
-#    # Alle Geräte laden
-#    devices = conn.execute("SELECT mac, rpi_ip, port, name, switch_hostname FROM devices").fetchall()
-#    conn.close()
-
-    # Nur aktive Geräte laden
     devices = conn.execute("""
         SELECT mac, rpi_ip, port, name, switch_hostname 
         FROM devices 
@@ -23,22 +14,13 @@ def generate_ips_list():
     """).fetchall()
     conn.close()
 
-    tmp = tempfile.NamedTemporaryFile(delete=False, mode='w', prefix='ips_', suffix='.list')
-    tmp_path = tmp.name
-
     for dev in devices:
         switch = switches.get(dev['switch_hostname'])
         if not switch:
-            continue  # Switch existiert nicht, überspringen
-
+            continue
         password = decrypt_password(switch['password'])
-        # Format: IP-Device:Hostname-Device:IP-Switch:Hostname-Switch:Port-Switch:Username-Switch:Password-Switch
-        line = f"{dev['rpi_ip']}:{dev['name']}:{switch['ip']}:{switch['hostname']}:{dev['port']}:{switch['username']}:{password}\n"
-        tmp.write(line)
-
-    tmp.close()
-    return tmp_path
+        port = dev['port'] or ""
+        print(f"{dev['rpi_ip']}:{dev['name']}:{switch['ip']}:{switch['hostname']}:{port}:{switch['username']}:{password}")
 
 if __name__ == "__main__":
-    path = generate_ips_list()
-    print(path)  # optional, gibt die Tempdatei zurück
+    generate_ips_list()
-- 
2.49.1


From 20b38194a5293d4c772b570e16ef8d96185ccf7a Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 13:38:01 +0200
Subject: [PATCH 143/144] srv/poe_manager/create_db.py aktualisiert

---
 srv/poe_manager/create_db.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srv/poe_manager/create_db.py b/srv/poe_manager/create_db.py
index 3ee92d7..3107428 100644
--- a/srv/poe_manager/create_db.py
+++ b/srv/poe_manager/create_db.py
@@ -15,11 +15,11 @@ CREATE TABLE IF NOT EXISTS switches (
 
 # Devices
 c.execute("""
-CREATE TABLE IF NOT EXISTS devices (
+CREATE TABLE devices (
     mac TEXT PRIMARY KEY,
     rpi_ip TEXT NOT NULL,
     switch_hostname TEXT NOT NULL,
-    port TEXT NOT NULL,
+    port TEXT,
     name TEXT NOT NULL,
     is_active INTEGER DEFAULT 0,
     FOREIGN KEY (switch_hostname) REFERENCES switches(hostname)
-- 
2.49.1


From 59a9000de51eb0b8ea82752006d536c2d7021cee Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 11:39:31 +0000
Subject: [PATCH 144/144] Table changes

---
 srv/poe_manager/sqlite.db | Bin 40960 -> 49152 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/srv/poe_manager/sqlite.db b/srv/poe_manager/sqlite.db
index 06b3c8ef28954ba8e0a51ebd4361d09ba4a0733e..33d7fba92dadaf70fdde149e0514547a310163d2 100644
GIT binary patch
delta 371
zcmZoTz|_#dJV9D8iGhKE2a1`1H1|XuW91|Uy|PYTZXO0s&hHHTO8m!pg?Uf&9OTjG
znZWs-Zwm-+Y%JyEY7*jM7nhc1Y_6Ux&)v_a!=(TOlY6-(CST-^W8wYAsJyXJo^i82
z&v8Z;zQ+vvCN}P3)8%Coca)xdkyk=ACABOwIkh<65XxZX|G{8CvC(?7690V#QJ`bk
z`NA0ZkMZ~L`|%6#UE-U<7q(eZ!GUk`Z(IAx-u8Brt?cY3ciP)dF1NFveB9o0@>V-5
zF)olk{&WWZ*ZlkWC-bNCU*)gmUkTI~$UiyDUutrMzjBPBRgw{_D6>9es)?0pnw5c}
zRhqF?l7*FN5(`K)CD|&`%*xov$|%h$#n8$ug&9TEGSMnA*~-j<NrYLSGsVKnIMFI4
h#mdyg$|%vwz<g0az-GaMC;Ss9D6=wx0u;&<000t`V~_v<

delta 366
zcmZo@U~V|TG(lQ0ih+TF3y5KWb)t^3d=!ITStl>=HwI2_Q3ie`{^Q)De4lxRc~A2k
z<k9Duuvt-HIu}=yI5WGrv@~N2>tsf*{>h<S{FA3~2~S?j6~9@Z=Qtw^{||=06DR&;
z(`8{3ca)xdkyk=6CABOwIkh<65XxZPti*p`L7eXc13T|;M!v25$N0+mJNPX5y?B4~
zUD~Xu@R)aUn4LW%>*N4?vB|IO)F=Df+f6=hZ^;UBZq&qyVUwrW*-sX<x1HQ$ZzaLS
zf1QDyKZJq*5dRwf2L3GmY5XDlulUaa4YJ{%T<foHXk?XU!Y<0J&zO>Im1t&VY-DAW
zW|d-Sm1M+<B5Ijvm6&X0X2CRhzrUEB2(vzCiiMSNqE$+Ym8pr9QKFTBInV*Zut0;-
cAR|&utW49a3=FN(jIEL^tW1+w76k+V01rT2YybcN

-- 
2.49.1