0.9.7.16: vorhandene Preview-Caches ohne Massendownload weiterverwenden

0.9.7.15: Piwigo-AJAX-Lader für WebDAV-Bilder reparieren

.ci-trigger-0977

@@ -0,0 +1 @@
+0.9.7.7

.github/workflows/lint.yml

@@ -5,8 +5,12 @@ on:
   pull_request:
 
 jobs:
-  syntax:
+  php-syntax:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version: ['8.2', '8.3', '8.4', '8.5']
     steps:
       - name: Repository auschecken
         uses: actions/checkout@v4
@@ -14,7 +18,7 @@ jobs:
       - name: PHP installieren
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.2'
+          php-version: ${{ matrix.php-version }}
           coverage: none
 
       - name: PHP Syntax pruefen
@@ -25,6 +29,31 @@ jobs:
             php -l "$file"
           done < <(find . -type f -name '*.php' -print0)
 
+      - name: Doppelte Bratonien-Funktionen pruefen
+        shell: bash
+        run: |
+          set -euo pipefail
+          duplicates="$(grep -RhoE 'function[[:space:]]+bratonien_tools_[A-Za-z0-9_]+' --include='*.php' . | awk '{print $2}' | sort | uniq -d || true)"
+          if [[ -n "$duplicates" ]]; then
+            echo "Doppelte globale Bratonien-Funktionen gefunden:" >&2
+            printf '%s\n' "$duplicates" >&2
+            exit 1
+          fi
+
+  script-syntax:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Repository auschecken
+        uses: actions/checkout@v4
+
+      - name: Admin JavaScript Syntax pruefen
+        shell: bash
+        run: |
+          set -euo pipefail
+          sed -n '/<script>/,/<\/script>/p' template/admin_tabs.tpl | sed '1d;$d' > /tmp/bratonien-admin-tabs.js
+          node --check /tmp/bratonien-admin-tabs.js
+          node --check js/nc_connector_edit_v2.js
+
       - name: Python Syntax pruefen
         shell: bash
         run: |

CURRENT_STATUS.md

@@ -1,122 +1,139 @@
 # Aktueller Entwicklungsstand
 
-Stand: 18.08.2026
+Stand: 19.08.2026
 
 ## Plugin
 
-- Aktuelle Plugin-Version: **0.9.4.4**
-- Aktueller Entwicklungsblock: **NC Connector – Endnutzer-Assistent und Konsolidierung**
-- `0.9.3.43` markiert den abgeschlossenen vorherigen Meilenstein.
-- `0.9.4.x` ist der neue Entwicklungsblock.
+- Aktuelle Plugin-Version: **0.9.6.1**
+- Aktueller Entwicklungsblock: **NC Connector – WebDAV-End-to-End-Pfad mit Piwigo-Registrierung, Preview-/Derivatstrecke und sauberem Verbindungs-Lebenszyklus**
+- GitHub ist das führende Repository.
+- Der bestehende lokale Connector bleibt vollständig erhalten und wird nicht automatisch migriert.
 
-## Produktiver Stand
+## Nicht verhandelbare Architekturregeln
 
-Der lokale NC Connector ist im aktuellen Bratonien-Einsatz End-to-End funktionsfähig:
+- Nextcloud bleibt die Quelle der Originalbilder.
+- Originalbilder werden **nicht dauerhaft nach Piwigo kopiert**.
+- Der bestehende lokale Produktionsweg bleibt funktionsfähig.
+- WebDAV benötigt nur Nextcloud-Adresse, Benutzer/App-Passwort und normale WebDAV-Berechtigungen des Benutzers.
+- Kein Nextcloud-PostgreSQL-Zugriff, kein `occ`, keine Storage-IDs, keine Host-Mounts, kein FUSE, davfs oder rclone als Voraussetzung.
+- WebDAV-Verbindungen werden voneinander isoliert verarbeitet.
+- Fehler der WebDAV-Bildverarbeitung dürfen keinen normalen Piwigo-Seitenaufruf zum Absturz bringen.
 
-- Nextcloud-Freigaben `folder` und `file` werden verarbeitet.
-- Ordnerfreigaben werden als physische Piwigo-Alben synchronisiert.
-- Einzeldateifreigaben werden als echte Piwigo-Orphans ohne Albumzuordnung registriert.
-- Entfernte Freigaben werden aus Piwigo entfernt, Originaldateien bleiben erhalten.
-- Neue physische Connector-Alben werden privat angelegt.
-- API-first-Synchronisierung ist produktiv für Piwigo **16.4.0** freigegeben.
-- Piwigo-Album- und Fotoinformationen werden nach dem direkten Sync aktualisiert.
-- Der gemeinsame systemd-Timer verarbeitet aktive Verbindungen regelmäßig.
+## Bestehende Quellenmodi
 
-## 0.9.4.1
+Weiterhin vorhanden:
 
-Die Statusaktualisierung im Admin-UI wurde von Seiten-Reload auf gezielte DOM-Aktualisierung umgestellt. Der Poller aktualisiert nur noch **Letzter Lauf** und **Nächster Lauf**. Offene Dialoge, Details und der Assistent bleiben dadurch erhalten.
+- `legacy-view`
+- `user-shares`
+- `selected-fileids`
 
-## 0.9.4.2
+Neuer WebDAV-Modus:
 
-### Verbindungsassistent
+- `webdav-placeholder`
 
-Der Assistent wurde aus Endnutzersicht konsolidiert. Technische Werte werden nur gezielt abgefragt, wenn eine automatische Prüfung sie nicht bestätigen kann.
+Es gibt keine automatische Migration bestehender Verbindungen auf WebDAV.
 
-### Storage-Mappings
+## WebDAV-Ablauf in 0.9.6.1
 
-Das Storage-Format erlaubt einen leeren `source_prefix`. Damit kann ein kompletter Storage direkt auf einen lokalen Mount zeigen.
-
-### Native Aktivierung
-
-`nc-connector-install.php` unterstützt API-only-Verbindungen ohne dauerhaft gespeicherten Login-Fallback. Ein Fallback ist nur nötig, wenn keine nutzbare API gespeichert ist.
-
-## 0.9.4.3
-
-- Syntaxfehler im Wizard-Abschluss korrigiert.
-- Neue Wizard-Durchläufe werden von alten serverseitigen Zuständen getrennt.
-- Abbrechen und Schließen verwerfen den laufenden Wizard-State.
-
-## 0.9.4.4
-
-Der Connector-Benutzer aus Schritt 1 ist zugleich der lesende Datenbank-Benutzer. Der Assistent fragt deshalb Benutzername und Passwort nicht erneut ab.
-
-Ablauf:
-
-1. Nextcloud-Adresse + Connector-Benutzer + Passwort.
-2. Web-Zugang und OCS werden geprüft.
-3. Derselbe Benutzer und dasselbe Passwort werden automatisch für PostgreSQL verwendet.
-4. Der Assistent prüft den üblichen Weg mit Nextcloud-Host, Port 5432 und Datenbank `nextcloud` bzw. bekannte passende Verbindungswerte.
-5. Nur wenn die Datenbank dort nicht erreichbar ist, werden Host, Port und Datenbankname abgefragt. Benutzer und Passwort bleiben unverändert aus Schritt 1.
-6. Danach folgen gegebenenfalls Storage-Zuordnung, Showcase-Benutzer, Piwigo-API und Fallback.
-
-Die PHP-Datei `include/nc_connector_wizard.inc.php` wurde vor dem Versionsbump mit dem PHP-Parser geprüft.
-
-## Architektur NC Connector
-
-- Nextcloud ist Quelle der Originalbilder.
-- Piwigo erhält einen Shadow Tree aus Verzeichnissen und Symlinks.
-- PostgreSQL-Reader und die Views `piwigo_showcase_sources` / `piwigo_showcase_activity` liefern Quellen und Aktivität.
-- Runtime-Konfigurationen: `/etc/bratonien-tools/nc-connector/connection-*.conf`
-- State: `/var/lib/bratonien-tools/nc-connector/connection-ID`
-- Öffentlicher Admin-Status: Piwigo `_data/bratonien-tools/nc-connector-status/`
-- Runner: `runtime/run-all.sh`
-- Einzelverbindung: `runtime/sync.sh`
+1. Der Assistent prüft Nextcloud über WebDAV und lässt sichtbare Verzeichnisse auswählen.
+2. `runtime/reconcile-webdav.php` erzeugt die verbindungseigene Runtime-Konfiguration.
+3. `runtime/lib/build_webdav_placeholder_source.py` liest die ausgewählten Verzeichnisse rekursiv per PROPFIND.
+4. Ordner, Dateinamen, Nextcloud-Datei-ID, MIME-Typ, Größe, ETag und WebDAV-Pfad werden erfasst.
+5. Eine lokale Platzhalterquelle wird erzeugt, ohne Originalbilder dauerhaft zu speichern.
+6. `runtime/lib/shadow_tree.py` baut daraus den verbindungseigenen Shadow Tree.
+7. Der WebDAV-Galeriebaum liegt unter `_data/bratonien-tools/nc-webdav-gallery/connection-ID` und wird als eigene physische Piwigo-Site registriert.
+8. Dadurch erscheint die ausgewählte Nextcloud-Wurzel als normales Piwigo-Album; technische `bratonien-webdav-ID`-Wrapper werden nicht angezeigt.
+9. Vorbereitete Arbeitsbilder liegen unter `_data/bratonien-tools/nc-webdav-preview/connection-ID`.
+10. Arbeitsbilder werden als JPEG beziehungsweise PNG erzeugt und maximal auf 4096 px Kantenlänge begrenzt, damit Piwigos Bildbibliothek sie zuverlässig verarbeiten kann.
+11. Der CLI-Derivat-Builder korrigiert die Piwigo-Bildabmessungen anhand des Arbeitsbilds und erzeugt die aktuell konfigurierten Standard- und Custom-Derivate.
+12. Der normale Frontend-Aufruf erzeugt **keine** Derivate. Fehlt ein Derivat, wird das vorbereitete Bild als sicherer Fallback ausgeliefert.
+13. Originalbilder werden bei echtem Originalabruf serverseitig über `webdav-image.php` aus Nextcloud gestreamt; Nextcloud-Zugangsdaten erscheinen nicht im Browser.
 
 ## Piwigo-Synchronisierung
 
-Priorität:
+WebDAV verwendet denselben Piwigo-Synchronisationspfad wie der bestehende Connector, aber mit einer verbindungseigenen physischen Site.
 
-1. gespeicherter Piwigo-API-Key;
-2. bei nicht nutzbarer API gespeicherter Benutzername/Passwort-Fallback;
-3. ohne beide Wege Abbruch mit Fehlerstatus.
+Nach der Dateisynchronisierung laufen die vorhandenen Piwigo-Nacharbeiten, darunter Metadaten-, Integritäts-, Kategorie-, Pfad-, Rang- und Cache-Aktualisierungen sowie der Orphan-Abgleich.
 
-Produktive API-Methoden:
+Die direkte produktive Synchronisierung ist derzeit ausdrücklich auf **Piwigo 16.4.0** abgestimmt.
 
-- `bratonien.nc.syncProductive`
-- `bratonien.nc.syncOrphans`
+## WebDAV-Bildausgabe und Derivate
 
-`bratonien.nc.syncProductive` ist auf Piwigo 16.4.0 versionsgebunden. Der direkte Sync verwendet Bratonien-eigene Logik auf Basis der Piwigo-Core-Funktionen, nicht das Rendern oder Fernsteuern einer Admin-Seite.
+Wichtige Dateien:
 
-## Activity Gate und Shadow Tree
+- `include/webdav_image_runtime.inc.php` – Zuordnung Piwigo-Bild ↔ WebDAV-Quelle, Preview-/Derivat-Helfer und URL-Filter.
+- `webdav-image.php` – berechtigungsgeprüfter serverseitiger Original-/Preview-Abruf.
+- `runtime/lib/precache-webdav-previews.php` – vorbereitete JPEG-/PNG-Arbeitsbilder ohne dauerhafte Originalkopie.
+- `runtime/lib/build-webdav-derivatives.php` – CLI-Aufbau der konfigurierten Piwigo-Derivate.
 
-Das Activity Gate berücksichtigt:
+Der Frontend-Hook führt keine Bildgenerierung mehr aus. Damit bleibt ein Fehler in GD/Imagick/External ImageMagick auf den Hintergrundlauf begrenzt.
 
-- Aktivitätsstand;
-- Share-Fingerprint;
-- Quiet-Time;
-- Max-Wartezeit;
-- periodischen Full-Sync;
-- Reparaturbedarf bei beschädigter lokaler Struktur.
+## Löschen einer WebDAV-Verbindung seit 0.9.6.1
 
-Der Shadow-Tree-Wechsel besitzt einen Rollback auf den vorherigen Baum, falls das Umschalten fehlschlägt.
+Eine gelöschte WebDAV-Verbindung darf keine weiterhin sichtbaren oder über alte Piwigo-Datensätze erreichbaren Bilder hinterlassen.
+
+Beim Löschen über die Oberfläche:
+
+- werden die zur Verbindung gehörende Piwigo-Site, ihre Alben und Bilddatensätze entfernt;
+- werden zugehörige Piwigo-Derivate entfernt;
+- bleiben die Nextcloud-Originaldateien unangetastet;
+- werden Laufzeit- und Preview-Daten anschließend bereinigt.
+
+Zusätzlich läuft `runtime/cleanup-webdav-piwigo.php` im gemeinsamen Runner. Er erkennt verwaiste WebDAV-Piwigo-Sites, für die keine Connector-Verbindung mehr existiert, und entfernt deren Piwigo-Inhalte sowie Gallery-, Source-, Preview-, State-, Status- und Runtime-Reste. Damit werden auch bereits vor 0.9.6.1 gelöschte Verbindungen nachträglich bereinigt.
+
+## Gemeinsamer Runner
+
+`runtime/run-all.sh` verarbeitet die Schritte in kontrollierter Reihenfolge:
+
+1. lokale Verbindungen reconciliieren;
+2. WebDAV-Verbindungen reconciliieren;
+3. verwaiste WebDAV-Piwigo-Inhalte bereinigen;
+4. verwaiste allgemeine Runtime-Dateien bereinigen;
+5. aktive WebDAV-Verbindungen synchronisieren;
+6. aktive lokale Verbindungen synchronisieren.
+
+Der vorhandene systemd-Timer ruft direkt die Runtime aus dem installierten Plugin auf.
+
+## Status- und UI-Regeln
+
+- Hintergrund-Polling lädt die Admin-Seite nicht neu.
+- Ein geöffneter Verbindungsassistent bleibt bei Statusaktualisierungen geöffnet.
+- Fehlgeschlagene Fallback-/Credential-Prüfungen schließen den Assistenten nicht.
+- Laufzeitfehler unterscheiden WebDAV-Lesen, Piwigo-Synchronisierung, Preview- und Derivatfehler.
 
 ## Sicherheit
 
-- Nextcloud-Originale werden nicht gelöscht.
 - Connector-Zugangsdaten werden verschlüsselt gespeichert.
-- Wizard-Secrets bleiben serverseitig.
-- Storage-Pfade werden validiert.
-- SQL-View-Namen werden validiert.
-- Piwigo-API ist versionsgebunden.
-- Mutierende Admin-Aktionen verwenden Post/Redirect/Get, sodass Browser-Reloads sie nicht erneut ausführen.
-- Self-Updates sind an einen konkreten Commit und SHA-256 gebunden.
+- WebDAV-Credentials werden nur serverseitig verwendet.
+- Bildzugriffe über `webdav-image.php` werden gegen Piwigos Zugriffsrechte geprüft.
+- Nextcloud-Originale werden weder beim Sync noch beim Löschen einer Verbindung verändert.
+- Derivate und Arbeitsbilder sind lokale Cache-/Arbeitsdaten und dürfen entfernt beziehungsweise neu aufgebaut werden.
 
-## Noch offen
+## Aktueller Prüfstand
 
-- vollständiger Remote-Nextcloud-Adapter ohne direkten PostgreSQL-/Storage-Zugriff;
-- weitere Bereinigung alter Legacy-Migrationshelfer, sobald sie nicht mehr benötigt werden;
-- weitere Endnutzer-Optimierung des Assistenten auf Basis realer Fehler- und Installationspfade.
+Bereits umgesetzt:
 
-## Repository-Fallback
+- WebDAV-Verbindungsassistent;
+- Verzeichnisauswahl;
+- rekursiver WebDAV-Scan;
+- Shadow Tree;
+- separate Piwigo-Site je WebDAV-Verbindung;
+- sichtbare Albumstruktur ohne technische Wrapper;
+- echte Bildausgabe aus Nextcloud;
+- lokale vorbereitete Arbeitsbilder;
+- CLI-Derivatstrecke;
+- Piwigo-Nacharbeiten und Orphan-Abgleich;
+- ETag-basierte Wiederverwendung vorbereiteter Bilder;
+- Löschen einer Verbindung einschließlich Piwigo-Inhalten;
+- nachträgliche Bereinigung bereits verwaister WebDAV-Piwigo-Sites.
 
-GitHub bleibt das führende Repository. Das private Gitea-System dient weiterhin als Mirror/Fallback.
+Weiter zu prüfen beziehungsweise unter realer Last zu härten:
+
+- vollständiger Derivataufbau für alle in der Installation vorkommenden Standard- und Custom-Größen;
+- Verhalten bei großen Bildmengen und vielen gleichzeitig noch nicht vorbereiteten Bildern;
+- Fehlerfälle verschiedener Bildformate und Bild-Backends;
+- langfristige Änderungserkennung und Performance im produktiven Einsatz.
+
+## Versionsregel
+
+Die aktuelle Versionslinie ist **0.9.6.x**. Weitere Sprünge auf eine neue Minor-/Major-Linie erfolgen nur bewusst und ausdrücklich.

README.md

@@ -2,7 +2,7 @@
 
 Modulares Piwigo-Plugin für Administration, Bildverarbeitung, geschützte Freigaben, Fotoauswahl und die Anbindung von Nextcloud an Piwigo.
 
-Aktuelle Plugin-Version: **0.9.4.4**
+Aktuelle Plugin-Version: **0.9.6.1**
 
 ## Grundprinzip
 
@@ -12,113 +12,131 @@ Für die Administration gilt: Der normale Nutzer sieht Aufgaben, Entscheidungen
 
 ## NC Connector
 
-Der NC Connector synchronisiert ausdrücklich freigegebene Nextcloud-Inhalte mit Piwigo.
+Der NC Connector synchronisiert ausdrücklich ausgewählte Nextcloud-Inhalte mit Piwigo.
 
 ### Datenmodell
 
 - Nextcloud bleibt die Quelle der Originaldateien.
-- Originalbilder werden nicht in eine zweite dauerhafte Bibliothek kopiert.
-- Ein Shadow Tree erzeugt die für Piwigo benötigte Verzeichnisstruktur mit Symlinks.
-- Ordnerfreigaben werden als physische Piwigo-Alben synchronisiert.
-- Einzeldateifreigaben werden im Galerie-Root verlinkt und als echte Piwigo-Orphans ohne Albumzuordnung registriert.
-- Entfernte Freigaben werden aus Shadow Tree und Piwigo entfernt, das Nextcloud-Original bleibt erhalten.
+- Originalbilder werden nicht dauerhaft in eine zweite Bibliothek unter Piwigo kopiert.
+- Ein Shadow Tree erzeugt die für Piwigo benötigte Ordnerstruktur.
+- Ordner werden als physische Piwigo-Alben synchronisiert.
+- Root-Dateien können als Piwigo-Orphans registriert werden.
 - Neu importierte physische Connector-Alben werden privat angelegt.
+- Entfernte Quellen werden aus Shadow Tree und Piwigo entfernt; die Nextcloud-Originale bleiben erhalten.
 
-### Verbindungsassistent
+### Bestehende lokale Quellenmodi
 
-Neue Verbindungen werden bevorzugt mit einem Endnutzer-Assistenten angelegt.
+Der bestehende Connector unterstützt weiterhin:
 
-Ablauf:
+- `legacy-view`
+- `user-shares`
+- `selected-fileids`
 
-1. Nextcloud-Adresse, Benutzer und Passwort eingeben.
-2. Der Assistent prüft HTTP/HTTPS, Nextcloud-Status und Anmeldung.
-3. Derselbe in Schritt 1 angegebene Connector-Benutzer und dasselbe Passwort werden auch für den lesenden PostgreSQL-Zugriff verwendet; es gibt im normalen Ablauf keine zweite Benutzer-/Passwortabfrage.
-4. Vorhandene passende Connector-Werte für Host, Port, Datenbank und Storage-Zuordnungen werden wiederverwendet, aber erneut mit dem aktuellen Zugang geprüft.
-5. Nur wenn der übliche PostgreSQL-Weg nicht erreichbar ist, werden abweichende Datenbank-Adresse, Port und Datenbankname gezielt abgefragt. Benutzer und Passwort bleiben dabei die Angaben aus Schritt 1.
-6. Nicht automatisch zuordenbare Storage-Mounts werden einzeln bestätigt.
-7. Danach wird der Nextcloud-Benutzer gewählt, dessen Freigaben verwendet werden sollen. Empfohlen wird ein eigener `showcase`-Benutzer.
-8. Piwigo-API-Zugang testen oder bewusst überspringen.
-9. Optionaler bzw. bei übersprungener API verpflichtender Login-Fallback.
-10. Erst der Abschluss legt die Verbindung dauerhaft an.
+Diese Modi bleiben erhalten. Es gibt keine automatische Migration auf WebDAV.
 
-Wizard-Geheimnisse werden während der Einrichtung serverseitig in der Sitzung gehalten. Ein fehlgeschlagener Test leert die Eingaben nicht. Ein API-Test verändert die dauerhafte API-Konfiguration erst beim erfolgreichen Abschluss des Assistenten.
+### WebDAV-Modus
 
-Die vollständige technische Maske bleibt weiterhin über **Ohne Assistent anlegen** sowie bei bestehenden Verbindungen unter **Technische Einstellungen** erreichbar.
+Der neue Endnutzerpfad verwendet `source_mode=webdav-placeholder` und `adapter=remote`.
 
-### Lokaler Adapter
+Benötigt werden nur:
 
-Der derzeit produktive Adapter verwendet:
+- Nextcloud-Adresse;
+- Nextcloud-Benutzer bzw. App-Passwort;
+- normaler WebDAV-Zugriff auf die Inhalte dieses Benutzers;
+- eine normale Piwigo-Installation mit ihrer vorhandenen PHP-/Bildverarbeitungsumgebung.
 
-- PostgreSQL-Reader mit minimalen Leserechten;
-- Source-View `piwigo_showcase_sources`;
-- Activity-View `piwigo_showcase_activity`;
-- explizite Storage-Zuordnungen auf bereits vorhandene lokale Mounts;
-- Plugin-eigene Runtime und getrennten State pro Verbindung.
+Nicht vorausgesetzt werden:
 
-Ein Storage-Mapping besteht aus `storage_id`, einem optionalen `source_prefix` und dem lokalen Mount. Ein leerer Prefix ist zulässig und bedeutet, dass der Mount direkt dem Storage-Root entspricht.
+- PostgreSQL-Zugriff auf Nextcloud;
+- `occ`-Adminzugriff;
+- Storage-IDs oder Backend-Pfade;
+- zusätzliche Host-Mounts;
+- FUSE;
+- davfs;
+- rclone.
 
-### Activity Gate
+### WebDAV-Ablauf
 
-Der regelmäßige Lauf berücksichtigt:
-
-- Nextcloud-Aktivität;
-- Signatur der sichtbaren Freigaben;
-- Quiet-Time;
-- maximale Wartezeit;
-- periodischen Full-Sync;
-- notwendigen Reparaturlauf bei beschädigtem Shadow Tree oder fehlenden Piwigo-Alben.
+1. Der Assistent prüft Nextcloud und liest die sichtbaren Verzeichnisse per WebDAV.
+2. Ausgewählte Verzeichnisse werden rekursiv per PROPFIND eingelesen.
+3. Ordner, Dateiname, Nextcloud-Datei-ID, MIME-Typ, Größe, ETag und WebDAV-Pfad werden erfasst.
+4. `runtime/lib/build_webdav_placeholder_source.py` erzeugt eine lokale Platzhalterquelle ohne dauerhafte Originalkopie.
+5. `runtime/lib/shadow_tree.py` baut daraus den verbindungseigenen Shadow Tree.
+6. Der WebDAV-Galeriebaum liegt unter `_data/bratonien-tools/nc-webdav-gallery/connection-ID`.
+7. Jede WebDAV-Verbindung wird als eigene physische Piwigo-Site registriert. Die ausgewählte Nextcloud-Wurzel erscheint dadurch direkt als Album; technische `bratonien-webdav-ID`-Wrapper bleiben unsichtbar.
+8. `runtime/lib/precache-webdav-previews.php` erzeugt vorbereitete Arbeitsbilder als JPEG beziehungsweise PNG mit maximal 4096 px Kantenlänge.
+9. `runtime/lib/build-webdav-derivatives.php` korrigiert die Piwigo-Bildabmessungen und erzeugt die konfigurierten Standard- und Custom-Derivate im Hintergrundlauf.
+10. Der Frontend-Aufruf erzeugt keine Derivate. Fehlt eines, wird das vorbereitete Arbeitsbild als sicherer Fallback ausgeliefert.
+11. Wenn das Original benötigt wird, streamt `webdav-image.php` es serverseitig direkt aus Nextcloud. Zugangsdaten werden dem Browser nicht offengelegt.
 
 ### Piwigo-Synchronisierung
 
-Der produktive Lauf ist API-first:
+Der WebDAV-Pfad nutzt die vorhandene Piwigo-Synchronisationslogik mit einer verbindungseigenen Site.
 
-1. `bratonien.nc.syncProductive` für physische Alben und Bilder;
-2. `bratonien.nc.syncOrphans` für Root-Dateien;
-3. Benutzername/Passwort nur als optionaler Fallback.
+Nach dem Dateiabgleich laufen die vorhandenen Nacharbeiten, darunter:
 
-Die produktive direkte API-Synchronisierung ist aktuell ausdrücklich für **Piwigo 16.4.0** freigegeben. Bei einer anderen Piwigo-Version wird sie nicht stillschweigend als kompatibel angenommen.
+- Metadaten-Synchronisierung;
+- Bild- und Kategorieintegrität;
+- Uppercats/Kategoriestruktur;
+- globale Ränge;
+- Pfadpflege;
+- Rating-Score;
+- Benutzer-Cache-Invalidierung;
+- Orphan-Abgleich.
 
-Der direkte produktive Sync führt außerdem die für den normalen Piwigo-Import relevanten Nacharbeiten aus, darunter Albuminformationen, globale Ränge, Bildinformationen, Pfade und Cache-Invalidierung. Er ruft dafür keine Admin-Seite fernsteuernd auf.
+Die direkte produktive Synchronisierung ist aktuell ausdrücklich auf **Piwigo 16.4.0** abgestimmt.
+
+### Fallback-Zugang
+
+Piwigo wird API-first angesprochen. Ist für eine Verbindung keine API konfiguriert, kann Benutzername/Passwort als Fallback verwendet werden.
+
+Der Assistent prüft Fallback-Zugangsdaten vor dem Speichern. Eine fehlgeschlagene Prüfung schließt oder leert den Assistenten nicht.
+
+### Statusanzeige
+
+Die Administration zeigt den Laufzeitstatus regelmäßig im Hintergrund an. Dafür wird die Admin-Seite nicht neu geladen; offene Dialoge, Assistenten und aufgeklappte Bereiche bleiben erhalten.
+
+Fehler werden nach Prozessschritt getrennt dargestellt, unter anderem für WebDAV-Einlesen, Piwigo-Synchronisierung, Preview-Erzeugung und Derivat-Erzeugung.
+
+### Löschen einer Verbindung
+
+Seit **0.9.6.1** besitzt der WebDAV-Pfad einen vollständigen Lösch-Lebenszyklus:
+
+- Beim Löschen einer WebDAV-Verbindung werden ihre Piwigo-Site, Alben und Bilddatensätze entfernt.
+- Zugehörige Piwigo-Derivate werden entfernt.
+- Nextcloud-Originale bleiben unverändert.
+- Runtime-, Shadowtree-, Source-, Preview- und Statusdaten werden bereinigt.
+- `runtime/cleanup-webdav-piwigo.php` erkennt zusätzlich bereits verwaiste WebDAV-Piwigo-Sites, für die keine Connector-Verbindung mehr existiert, und bereinigt sie im gemeinsamen Runner nachträglich.
 
 ### Runtime
 
-Aktive Verbindungen werden über einen gemeinsamen systemd-Timer verarbeitet:
+Aktive Verbindungen werden über den gemeinsamen Runner verarbeitet:
 
 - `bratonien-nc-connector.timer`
 - `bratonien-nc-connector.service`
 - `runtime/run-all.sh`
-- `runtime/sync.sh`
 
 Verbindungsspezifische Konfigurationen liegen unter `/etc/bratonien-tools/nc-connector/`, State-Daten unter `/var/lib/bratonien-tools/nc-connector/connection-ID`.
 
-Der Shadow-Tree-Austausch besitzt einen Rollback: Scheitert der Wechsel auf den neuen Baum, wird der vorherige Galeriebaum wiederhergestellt.
+Die Reihenfolge des gemeinsamen Laufs ist:
 
-### Statusanzeige
-
-Die Administration zeigt letzten und nächsten Lauf. Der Status wird regelmäßig im Hintergrund abgefragt. Dafür wird die Admin-Seite **nicht** neu geladen; offene Dialoge, Assistenten und aufgeklappte Bereiche bleiben erhalten.
-
-### Bestehende Verbindungen
-
-Bestehende Verbindungen können:
-
-- umbenannt;
-- geprüft;
-- technisch bearbeitet, solange sie nicht aktiv sind;
-- deaktiviert und anschließend gelöscht werden.
-
-Das Löschen einer Connector-Verbindung entfernt keine Nextcloud-Originale und keine Piwigo-Bilder. Erreichbare Connector-eigene Status-/State-Daten der Verbindung werden bereinigt.
-
-### Legacy-Migration
-
-Für ältere Installationen mit dem früheren separaten `piwigo-sync` existieren weiterhin Migrations-/Cutover-Helfer. Neue Installationen sollen den nativen Connector-Weg verwenden.
+1. lokale Verbindungen reconciliieren;
+2. WebDAV-Verbindungen reconciliieren;
+3. verwaiste WebDAV-Piwigo-Inhalte bereinigen;
+4. allgemeine verwaiste Runtime-Dateien bereinigen;
+5. WebDAV-Verbindungen synchronisieren;
+6. lokale Verbindungen synchronisieren.
 
 ## Bildcache
 
+Bratonien Tools kann:
+
 - Piwigo-Bildderivate gezielt leeren;
 - vorhandene Bildgrößen neu erzeugen;
-- Cache-Aufbau als Worker-Prozess starten und abbrechen;
-- Worker-Zahl automatisch oder manuell konfigurieren;
-- Originalbilder bleiben unangetastet.
+- den Cache-Aufbau als Worker-Prozess starten und abbrechen;
+- die Worker-Zahl automatisch oder manuell konfigurieren.
+
+Originalbilder bleiben unangetastet.
 
 ## Wasserzeichenverwaltung
 
@@ -128,7 +146,7 @@ Für ältere Installationen mit dem früheren separaten `piwigo-sync` existieren
 - Album-Ausnahmen und Vererbung;
 - Position, Transparenz und Skalierung;
 - eigener Runtime-Filter für Piwigo-Derivate;
-- bisherige Piwigo-Wasserzeichenkonfiguration wird beim Aktivieren gesichert.
+- Sicherung der bisherigen Piwigo-Wasserzeichenkonfiguration beim Aktivieren.
 
 ## Bilddateien und Pfade
 
@@ -171,37 +189,34 @@ Die Piwigo-Bilddetailseite erhält responsive Navigationszonen für vorheriges B
 Der integrierte Updater:
 
 - liest den Zielstand aus GitHub;
-- bindet ein Update an einen konkreten Commit statt an einen während des Updates beweglichen Branch-Stand;
+- bindet ein Update an einen konkreten Commit;
 - prüft Version und SHA-256 des Zielstands;
 - erstellt vor dem Austausch ein Backup;
-- nutzt Post/Redirect/Get, damit ein Browser-Reload keine schreibende Aktion erneut ausführt;
+- nutzt Post/Redirect/Get;
 - verlangt Webmaster-Rechte, `ZipArchive` und ausreichende Schreibrechte.
 
-## Architektur
-
-Wichtige Dateien und Verzeichnisse:
+## Wichtige Dateien und Verzeichnisse
 
 - `main.inc.php` – Plugin-Einstieg und Runtime-Hooks
-- `admin.php` – zentraler Admin-Controller mit Post/Redirect/Get
-- `include/tool_registry.inc.php` – Registry administrativer Aktionen
+- `admin.php` – zentraler Admin-Controller
 - `include/nc_connector.inc.php` – Datenmodell und gemeinsame Connector-Funktionen
-- `include/nc_connector_wizard.inc.php` – Endnutzer-Assistent und Connection-Bearbeitung
-- `include/nc_connector_manage.inc.php` – Credential-Format, Storage-Mappings, Verifikation und Löschen
-- `include/nc_connector_create_api.inc.php` – API-first-Verbindungserstellung
-- `include/nc_connector_piwigo_api.inc.php` – API-Zugang und Fallback-Verwaltung
-- `include/nc_connector_system.inc.php` – Timer- und Laufzeitstatus
+- `include/nc_connector_wizard.inc.php` – Verbindungsassistent
+- `include/nc_connector_wizard_webdav_flow.inc.php` – WebDAV-first-Wizardablauf
+- `include/nc_connector_delete_safe.inc.php` – sicheres Löschen einschließlich WebDAV-Piwigo-Inhalten
 - `include/nc_productive_ws.inc.php` – produktiver Piwigo-Dateisync
 - `include/nc_orphan_ws.inc.php` – Orphan-Synchronisierung
-- `runtime/lib/activity_gate.py` – Activity Gate
-- `runtime/lib/build_manifest.py` – Auflösung der Nextcloud-Freigaben auf Storage-Mounts
-- `runtime/lib/shadow_tree.py` – atomarer Shadow Tree mit Rollback
-- `runtime/lib/piwigo-sync.php` – API-first-Piwigo-Sync mit Fallback
-- `runtime/run-all.sh` – Multi-Connection-Runner
-- `runtime/sync.sh` – Ablauf einer Verbindung
-- `nc-connector-install.php` – native Root-Aktivierung
-- `nc-connector-disable.php` – Deaktivierung
-- `nc-connector-normalize.php` – Normalisierung älterer aktiver Verbindungen
-- `nc-connector-*-cleanup/switch/cutover` – Legacy-Migrationshelfer
+- `include/webdav_image_runtime.inc.php` – WebDAV-Bildzuordnung, Preview-/Derivathilfen und URL-Filter
+- `webdav-image.php` – berechtigungsgeprüfter WebDAV-Bildstream
+- `runtime/reconcile-webdav.php` – WebDAV-Runtime-Reconcile
+- `runtime/cleanup-webdav-piwigo.php` – Bereinigung gelöschter/verwaister WebDAV-Verbindungen in Piwigo
+- `runtime/sync-webdav.sh` – Ablauf einer WebDAV-Verbindung
+- `runtime/run-all.sh` – gemeinsamer Multi-Connection-Runner
+- `runtime/lib/build_webdav_placeholder_source.py` – rekursiver WebDAV-Scan und Platzhalterquelle
+- `runtime/lib/precache-webdav-previews.php` – vorbereitete JPEG-/PNG-Arbeitsbilder
+- `runtime/lib/build-webdav-derivatives.php` – CLI-Derivat-Builder
+- `runtime/lib/shadow_tree.py` – atomarer Shadow Tree
+- `runtime/lib/piwigo-sync.php` – Piwigo-Sync mit API/Fallback
+- `main-cache-build.php` – allgemeiner Piwigo-Derivat-/Cache-Builder
 - `include/self_update.inc.php` – Self-Updater
 - `include/album_shares.inc.php` – geschützte Albumfreigaben
 - `include/public_selection.inc.php` – Fotoauswahl
@@ -214,15 +229,18 @@ Wichtige Dateien und Verzeichnisse:
 
 - administrative Schreibaktionen verwenden Piwigos CSRF-Schutz;
 - Connector-Zugangsdaten werden verschlüsselt gespeichert;
-- Wizard-Geheimnisse werden nicht in Browser-Web-Storage persistiert;
-- Storage-Mounts werden explizit zugeordnet und validiert;
+- Nextcloud-Zugangsdaten werden verbindungseigen gespeichert und nur serverseitig verwendet;
+- Wizard-Geheimnisse werden nicht im Browser-Web-Storage persistiert;
 - SQL-View-Namen werden vor Verwendung validiert;
-- gefährliche technische Pfade sind nicht Teil des normalen Wizard-Happy-Paths;
 - produktive Piwigo-API ist versionsgebunden;
 - Originalbilder werden vom Connector nicht gelöscht;
-- Update-Pakete werden an Commit und Hash gebunden;
-- Root-Helfer prüfen CLI-/Root-Ausführung, bevor sie Systemdienste oder `/etc`-/`/var/lib`-Daten verändern.
+- WebDAV-Originalbilder werden nicht dauerhaft lokal gespeichert;
+- Update-Pakete werden an Commit und Hash gebunden.
 
 ## Entwicklungsstand
 
-`0.9.4.x` ist der aktuelle Entwicklungsblock. Der lokale NC Connector ist End-to-End produktiv im Einsatz. Der Verbindungsassistent und die Verwaltung werden weiter aus Endnutzersicht konsolidiert. Ein vollständig entfernter Nextcloud-Adapter ohne direkten PostgreSQL-/Storage-Zugriff ist noch nicht umgesetzt.
+`0.9.6.x` ist die aktuelle Versionslinie.
+
+Mit **0.9.6.1** ist der WebDAV-Pfad einschließlich Piwigo-Registrierung, vorbereiteter Bildquelle, CLI-Derivatstrecke und Lösch-/Cleanup-Lebenszyklus im Repository umgesetzt. Der bestehende lokale Connector bleibt parallel erhalten.
+
+Der jeweils detaillierte Prüf- und Entwicklungsstand steht in [`CURRENT_STATUS.md`](CURRENT_STATUS.md).

admin.php

@@ -9,6 +9,74 @@ check_status(ACCESS_ADMINISTRATOR);
 require_once(BRATONIEN_TOOLS_PATH . 'include/tool_registry.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_system.inc.php');
 
+function bratonien_tools_nc_connector_admin_connections(array $connections)
+{
+  $by_id = array();
+  foreach ($connections as $connection)
+  {
+    $by_id[(int)$connection['id']] = $connection;
+  }
+
+  $hidden_legacy_ids = array();
+  $logical_remote = array();
+  foreach ($connections as $connection)
+  {
+    if ((string)($connection['adapter'] ?? '') !== 'remote') continue;
+    $migration = isset($connection['config']['migration']) && is_array($connection['config']['migration'])
+      ? $connection['config']['migration']
+      : array();
+    if ((string)($migration['role'] ?? '') !== 'webdav-primary-candidate') continue;
+
+    $legacy_id = (int)($migration['legacy_fallback_connection_id'] ?? 0);
+    if ($legacy_id < 1 || empty($by_id[$legacy_id]) || (string)$by_id[$legacy_id]['adapter'] !== 'local') continue;
+
+    $legacy = $by_id[$legacy_id];
+    $hidden_legacy_ids[$legacy_id] = true;
+    $connection['logical_connection'] = true;
+    $connection['legacy_fallback_connection_id'] = $legacy_id;
+    $connection['enabled'] = !empty($connection['enabled']) || !empty($legacy['enabled']);
+    if ($connection['enabled']) $connection['takeover_state'] = 'active';
+    $connection['fallback_stored'] = !empty($connection['fallback_stored']) || !empty($legacy['fallback_stored']);
+    if (trim((string)$connection['name']) === '') $connection['name'] = (string)$legacy['name'];
+    $logical_remote[(int)$connection['id']] = $connection;
+  }
+
+  $visible = array();
+  foreach ($connections as $connection)
+  {
+    $id = (int)$connection['id'];
+    if (isset($hidden_legacy_ids[$id])) continue;
+    if (isset($logical_remote[$id])) $connection = $logical_remote[$id];
+    $visible[] = $connection;
+  }
+
+  return $visible;
+}
+
+function bratonien_tools_nc_connector_admin_last_status(array $connection)
+{
+  $latest = bratonien_tools_nc_connector_connection_last_status($connection);
+  $legacy_id = (int)($connection['legacy_fallback_connection_id'] ?? 0);
+  if ($legacy_id < 1)
+  {
+    return $latest;
+  }
+
+  $legacy = bratonien_tools_nc_connector_connection($legacy_id, false);
+  if (!$legacy)
+  {
+    return $latest;
+  }
+
+  $legacy_status = bratonien_tools_nc_connector_connection_last_status($legacy);
+  if ((int)($legacy_status['timestamp'] ?? 0) > (int)($latest['timestamp'] ?? 0))
+  {
+    return $legacy_status;
+  }
+
+  return $latest;
+}
+
 $tools = bratonien_tools_get_tools();
 $messages = array();
 $errors = array();
@@ -94,6 +162,19 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['bratonien_tool']))
   );
 
   $redirect_url = get_root_url().'admin.php?page=plugin-'.BRATONIEN_TOOLS_ID;
+  $wizard_action = strpos($tool_id, 'nc_connector_wizard_') === 0
+    || $tool_id === 'nc_connector_migrate_start'
+    || $tool_id === 'nc_connector_edit_start';
+  if ($wizard_action)
+  {
+    $wizard_closed = $tool_id === 'nc_connector_wizard_reset'
+      || ($tool_id === 'nc_connector_wizard_finish' && empty($errors));
+    if (($tool_id === 'nc_connector_migrate_start' || $tool_id === 'nc_connector_edit_start') && !empty($errors))
+    {
+      $wizard_closed = true;
+    }
+    $redirect_url .= '&nc_wizard='.($wizard_closed ? 'closed' : 'open');
+  }
   if (!headers_sent())
   {
     header('Location: '.$redirect_url, true, 303);
@@ -115,9 +196,17 @@ $asset_environment = bratonien_tools_get_asset_environment();
 $album_shares = bratonien_tools_get_album_shares();
 $private_albums = bratonien_tools_get_private_albums();
 $nc_connector = bratonien_tools_nc_connector_status();
+$nc_connector_runtime_connections = $nc_connector['connections'];
+$nc_connector['connections'] = bratonien_tools_nc_connector_admin_connections($nc_connector_runtime_connections);
+$nc_connector['connection_count'] = count($nc_connector['connections']);
+$nc_connector['active_count'] = 0;
+foreach ($nc_connector['connections'] as $visible_connection)
+{
+  if (!empty($visible_connection['enabled'])) $nc_connector['active_count']++;
+}
 foreach ($nc_connector['connections'] as &$nc_connection)
 {
-  $nc_connection['last_sync'] = bratonien_tools_nc_connector_connection_last_status($nc_connection);
+  $nc_connection['last_sync'] = bratonien_tools_nc_connector_admin_last_status($nc_connection);
   $nc_connection['display_name'] = $nc_connection['name'];
 
   $storage_lines = array();
@@ -166,7 +255,7 @@ $nc_system_defaults = array(
 );
 $nc_connector['system'] = array_merge(
   $nc_system_defaults,
-  bratonien_tools_nc_connector_system_status($nc_connector['connections'])
+  bratonien_tools_nc_connector_system_status($nc_connector_runtime_connections)
 );
 $album_lock_page_number = isset($_GET['br_album_page']) ? max(1, (int)$_GET['br_album_page']) : 1;
 $album_lock_search = isset($_GET['br_album_search']) ? trim((string)$_GET['br_album_search']) : '';
@@ -292,4 +381,4 @@ $admin_content .= $template->parse('asset_manager_admin_content', true);
 $admin_content .= $template->parse('album_shares_admin_content', true);
 $admin_content .= $template->parse('nc_connector_admin_content', true);
 $admin_content .= $template->parse('system_admin_content', true);
-$template->assign('ADMIN_CONTENT', $admin_content);
+$template->assign('ADMIN_CONTENT', $admin_content);

include/nc_connector_connection_scope.inc.php

@@ -43,6 +43,8 @@ function bratonien_tools_nc_wizard_finish_connection_scoped()
   $_POST['nc_nextcloud_url']=(string)$state['base_url'];
   $_POST['nc_showcase_user']=(string)$state['showcase_user'];
   $_POST['nc_access_user']=(string)$state['username'];
+  $_POST['nc_nextcloud_user']=(string)$state['username'];
+  $_POST['nc_nextcloud_password']=(string)$state['_password'];
   $_POST['nc_product']=(string)$state['product'];
   $_POST['nc_version']=(string)$state['version'];
   $_POST['nc_api_validated']=$state['api_status']==='ok'?'1':'0';
@@ -121,12 +123,14 @@ function bratonien_tools_nc_connector_verify_connection_scoped()
   }
 
   $payload = json_encode(array(
-    'v'=>2,
+    'v'=>3,
     'db_password'=>$db_password,
     'piwigo_user'=>$fallback_user,
     'piwigo_password'=>$fallback_password,
     'api_key_id'=>$api_key_id,
     'api_key_secret'=>$api_key_secret,
+    'nextcloud_user'=>'',
+    'nextcloud_password'=>'',
   ), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
   if (!is_string($payload)) throw new RuntimeException('Verbindungsauthentifizierung konnte nicht migriert werden.');
 
@@ -148,33 +152,44 @@ function bratonien_tools_nc_connector_scoped_secret(array $connection)
   if (is_array($decoded) && array_key_exists('db_password', $decoded))
   {
     return array(
-      'v'=>2,
+      'v'=>3,
       'db_password'=>(string)($decoded['db_password'] ?? ''),
       'piwigo_user'=>(string)($decoded['piwigo_user'] ?? ''),
       'piwigo_password'=>(string)($decoded['piwigo_password'] ?? ''),
       'api_key_id'=>(string)($decoded['api_key_id'] ?? ''),
       'api_key_secret'=>(string)($decoded['api_key_secret'] ?? ''),
+      'nextcloud_user'=>(string)($decoded['nextcloud_user'] ?? ''),
+      'nextcloud_password'=>(string)($decoded['nextcloud_password'] ?? ''),
     );
   }
 
   return array(
-    'v'=>2,
+    'v'=>3,
     'db_password'=>(string)$plain,
     'piwigo_user'=>'',
     'piwigo_password'=>'',
     'api_key_id'=>'',
     'api_key_secret'=>'',
+    'nextcloud_user'=>'',
+    'nextcloud_password'=>'',
   );
 }
 
 function bratonien_tools_nc_connector_store_scoped_secret($id, array $connection, array $credentials)
 {
-  if (trim((string)($credentials['db_password'] ?? '')) === '') throw new RuntimeException('Das Datenbankpasswort der Verbindung fehlt.');
+  $config = is_array($connection['config'] ?? null) ? $connection['config'] : array();
+  $is_webdav = (string)($config['source_mode'] ?? '') === 'webdav-placeholder';
+  if (!$is_webdav && trim((string)($credentials['db_password'] ?? '')) === '') throw new RuntimeException('Das Datenbankpasswort der Verbindung fehlt.');
+  if ($is_webdav && (trim((string)($credentials['nextcloud_user'] ?? '')) === '' || (string)($credentials['nextcloud_password'] ?? '') === ''))
+  {
+    throw new RuntimeException('Die Nextcloud-Zugangsdaten der WebDAV-Verbindung fehlen.');
+  }
+
+  $credentials['v'] = 3;
   $payload = json_encode($credentials, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
   if (!is_string($payload)) throw new RuntimeException('Verbindungszugangsdaten konnten nicht serialisiert werden.');
   $blob = bratonien_tools_nc_connector_encrypt_secret($payload);
 
-  $config = is_array($connection['config'] ?? null) ? $connection['config'] : array();
   if (array_key_exists('api_enabled', $config))
   {
     $config['api_enabled'] = trim((string)($credentials['api_key_id'] ?? '')) !== '' && trim((string)($credentials['api_key_secret'] ?? '')) !== '';

include/nc_connector_create_api.inc.php

@@ -5,6 +5,11 @@ if (!defined('PHPWG_ROOT_PATH'))
 }
 
 function bratonien_tools_nc_connector_create_local_api_first()
+{
+  throw new RuntimeException('Neue Verbindungen über die alte lokale PostgreSQL-/Storage-Struktur sind ab 0.9.6.2 gesperrt. Bestehende lokale Verbindungen bleiben für die schrittweise Migration weiterhin aktiv. Neue Verbindungen müssen über den WebDAV-Assistenten angelegt werden.');
+}
+
+function bratonien_tools_nc_connector_create_local_api_first_legacy()
 {
   $required = array(
     'nc_name' => 'Name',
@@ -28,6 +33,13 @@ function bratonien_tools_nc_connector_create_local_api_first()
     throw new RuntimeException('Fallback-Benutzer und Fallback-Passwort muessen entweder beide angegeben oder beide leer gelassen werden.');
   }
 
+  $nextcloud_user = trim((string)($_POST['nc_nextcloud_user'] ?? $_POST['nc_access_user'] ?? ''));
+  $nextcloud_password = (string)($_POST['nc_nextcloud_password'] ?? '');
+  if (($nextcloud_user === '') !== ($nextcloud_password === ''))
+  {
+    throw new RuntimeException('Nextcloud-Benutzer und Nextcloud-Passwort muessen entweder beide vorhanden oder beide leer sein.');
+  }
+
   $wizard_auth_present = array_key_exists('nc_api_validated', $_POST);
   $validated_pending_api = (string)($_POST['nc_api_validated'] ?? '') === '1';
   $api_key_id = trim((string)($_POST['nc_connection_api_key_id'] ?? ''));
@@ -84,12 +96,14 @@ function bratonien_tools_nc_connector_create_local_api_first()
   bratonien_tools_nc_connector_view_name($config['activity_view']);
 
   $secret_payload = json_encode(array(
-    'v'=>2,
+    'v'=>3,
     'db_password'=>(string)$_POST['nc_db_password'],
     'piwigo_user'=>$fallback_user,
     'piwigo_password'=>$fallback_password,
     'api_key_id'=>$api_key_id,
     'api_key_secret'=>$api_key_secret,
+    'nextcloud_user'=>$nextcloud_user,
+    'nextcloud_password'=>$nextcloud_password,
   ), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
   if (!is_string($secret_payload)) throw new RuntimeException('Connector-Zugangsdaten konnten nicht serialisiert werden.');
   $secret_blob = bratonien_tools_nc_connector_encrypt_secret($secret_payload);

include/nc_connector_delete_safe.inc.php

@@ -0,0 +1,123 @@
+<?php
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die('Hacking attempt!');
+}
+
+function bratonien_tools_nc_connector_webdav_site_id(array $connection)
+{
+  $config = isset($connection['config']) && is_array($connection['config']) ? $connection['config'] : array();
+  if ((string)($connection['adapter'] ?? '') !== 'remote') return 0;
+  if ((string)($config['source_mode'] ?? '') !== 'webdav-placeholder') return 0;
+
+  $gallery_root = rtrim((string)($config['parallel_gallery_root'] ?? ''), '/');
+  $piwigo_root = rtrim(PHPWG_ROOT_PATH, '/');
+  if ($gallery_root === '' || strpos($gallery_root, $piwigo_root.'/') !== 0) return 0;
+
+  $relative = ltrim(substr($gallery_root, strlen($piwigo_root)), '/');
+  if ($relative === '') return 0;
+  $site_url = './'.rtrim($relative, '/').'/';
+
+  $result = pwg_query(
+    "SELECT id FROM ".SITES_TABLE.
+    " WHERE galleries_url='".pwg_db_real_escape_string($site_url)."' LIMIT 1"
+  );
+  if (!pwg_db_num_rows($result)) return 0;
+
+  $row = pwg_db_fetch_assoc($result);
+  return (int)$row['id'];
+}
+
+function bratonien_tools_nc_connector_remove_webdav_piwigo_content(array $connection)
+{
+  $site_id = bratonien_tools_nc_connector_webdav_site_id($connection);
+  if ($site_id < 1) return array('site_id'=>0, 'images'=>0);
+
+  include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
+
+  $image_rows = array();
+  $query = '\nSELECT DISTINCT i.id, i.path, i.representative_ext\n  FROM '.IMAGES_TABLE.' AS i\n  LEFT JOIN '.CATEGORIES_TABLE.' AS sc ON sc.id = i.storage_category_id\n  LEFT JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON ic.image_id = i.id\n  LEFT JOIN '.CATEGORIES_TABLE.' AS vc ON vc.id = ic.category_id\n  WHERE sc.site_id = '.$site_id.' OR vc.site_id = '.$site_id.'\n;';
+  $result = pwg_query($query);
+  while ($row = pwg_db_fetch_assoc($result))
+  {
+    $row['id'] = (int)$row['id'];
+    $image_rows[$row['id']] = $row;
+  }
+
+  foreach ($image_rows as $row)
+  {
+    try
+    {
+      delete_element_derivatives($row);
+    }
+    catch (Throwable $e)
+    {
+      error_log('Bratonien WebDAV delete derivative cleanup #'.(int)$row['id'].': '.$e->getMessage());
+    }
+  }
+
+  delete_site($site_id);
+
+  if ($image_rows)
+  {
+    $ids = array_keys($image_rows);
+    $remaining = query2array(
+      'SELECT id FROM '.IMAGES_TABLE.' WHERE id IN ('.implode(',', array_map('intval', $ids)).')',
+      null,
+      'id'
+    );
+    if ($remaining)
+    {
+      delete_elements(array_map('intval', $remaining), false);
+    }
+  }
+
+  invalidate_user_cache(true);
+  return array('site_id'=>$site_id, 'images'=>count($image_rows));
+}
+
+/**
+ * Delete exactly the connection selected by the user.
+ * No other connector record is implicitly removed.
+ */
+function bratonien_tools_nc_connector_delete_safe()
+{
+  $id = (int)($_POST['connection_id'] ?? 0);
+  $connection = bratonien_tools_nc_connector_connection($id, false);
+  if (!$connection)
+  {
+    throw new RuntimeException('Connector-Verbindung wurde nicht gefunden.');
+  }
+
+  $cleanup = array('site_id'=>0, 'images'=>0);
+  if (
+    (string)($connection['adapter'] ?? '') === 'remote'
+    && (string)($connection['config']['source_mode'] ?? '') === 'webdav-placeholder'
+  )
+  {
+    $cleanup = bratonien_tools_nc_connector_remove_webdav_piwigo_content($connection);
+  }
+
+  $table = bratonien_tools_nc_connector_table();
+  pwg_query("DELETE FROM `$table` WHERE id=".$id." LIMIT 1");
+
+  $status_dir = rtrim(PHPWG_ROOT_PATH, '/').'/_data/bratonien-tools/nc-connector-status';
+  $public_status = $status_dir.'/connection-'.$id.'.json';
+  if (is_file($public_status)) @unlink($public_status);
+
+  if (is_dir($status_dir) || @mkdir($status_dir, 0755, true))
+  {
+    @file_put_contents($status_dir.'/deleted-'.$id, date('c')."\n", LOCK_EX);
+  }
+
+  if ((int)$cleanup['site_id'] > 0)
+  {
+    return array(
+      'message'=>'Verbindung wurde gelöscht. Die zugehörigen Piwigo-Alben und '.(int)$cleanup['images'].' Bilder wurden aus Piwigo entfernt. Nextcloud-Dateien blieben unverändert.',
+    );
+  }
+
+  return array(
+    'message'=>'Verbindung wurde gelöscht. Verbliebene Laufzeitdaten werden automatisch bereinigt. Quelldateien blieben unverändert.',
+  );
+}

include/nc_connector_edit.inc.php

@@ -0,0 +1,348 @@
+<?php
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die('Hacking attempt!');
+}
+
+function bratonien_tools_nc_connector_migration_state(array $connection)
+{
+  $config = isset($connection['config']) && is_array($connection['config']) ? $connection['config'] : array();
+  $credentials = bratonien_tools_nc_connector_scoped_secret($connection);
+  $missing = array();
+
+  if (trim((string)($config['nextcloud_url'] ?? '')) === '') $missing[] = 'Nextcloud-Adresse';
+  if (trim((string)($credentials['nextcloud_user'] ?? '')) === '') $missing[] = 'Nextcloud-Benutzer';
+  if ((string)($credentials['nextcloud_password'] ?? '') === '') $missing[] = 'Nextcloud-Passwort';
+
+  $api_id = trim((string)($credentials['api_key_id'] ?? ''));
+  $api_secret = trim((string)($credentials['api_key_secret'] ?? ''));
+  $fallback_user = trim((string)($credentials['piwigo_user'] ?? ''));
+  $fallback_password = (string)($credentials['piwigo_password'] ?? '');
+  $api_complete = $api_id !== '' && $api_secret !== '';
+  $fallback_complete = $fallback_user !== '' && $fallback_password !== '';
+
+  if (($api_id === '') !== ($api_secret === '')) $missing[] = 'vollstaendiger Piwigo-API-Zugang';
+  if (!$api_complete && !$fallback_complete) $missing[] = 'Piwigo-API oder Benutzer/Passwort-Fallback';
+
+  return array(
+    'ready'=>!$missing,
+    'missing'=>$missing,
+    'api_available'=>$api_complete,
+    'fallback_available'=>$fallback_complete,
+  );
+}
+
+function bratonien_tools_nc_connector_validate_nextcloud_access($base_url, $username, $password)
+{
+  $base_url = bratonien_tools_nc_wizard_normalize_url($base_url);
+  $username = trim((string)$username);
+  $password = (string)$password;
+  if ($username === '' || $password === '') throw new RuntimeException('Nextcloud-Benutzer und Passwort werden benoetigt.');
+
+  $status_response = bratonien_tools_nc_wizard_http($base_url.'/status.php');
+  if ($status_response['status'] < 200 || $status_response['status'] >= 300)
+  {
+    throw new RuntimeException('Die Nextcloud-Adresse konnte nicht bestaetigt werden.');
+  }
+  $status = json_decode((string)$status_response['body'], true);
+  if (!is_array($status) || empty($status['installed']))
+  {
+    throw new RuntimeException('Unter dieser Adresse wurde keine installierte Nextcloud erkannt.');
+  }
+
+  $user_response = bratonien_tools_nc_wizard_http(
+    $base_url.'/ocs/v2.php/cloud/user?format=json',
+    $username,
+    $password,
+    array('OCS-APIRequest: true')
+  );
+  if ($user_response['status'] === 401 || $user_response['status'] === 403)
+  {
+    throw new RuntimeException('Nextcloud hat Benutzername oder Passwort abgelehnt.');
+  }
+  if ($user_response['status'] < 200 || $user_response['status'] >= 300)
+  {
+    throw new RuntimeException('Nextcloud ist erreichbar, aber der Benutzerzugang konnte nicht geprueft werden.');
+  }
+  $user_data = bratonien_tools_nc_wizard_ocs_data($user_response['body']);
+  $resolved = trim((string)($user_data['id'] ?? $username));
+
+  return array(
+    'base_url'=>$base_url,
+    'username'=>$resolved !== '' ? $resolved : $username,
+  );
+}
+
+function bratonien_tools_nc_connector_validate_scoped_api($api_key_id, $api_key_secret)
+{
+  $api_key_id = trim((string)$api_key_id);
+  $api_key_secret = trim((string)$api_key_secret);
+  if ($api_key_id === '' || $api_key_secret === '')
+  {
+    throw new RuntimeException('Piwigo-API-Schluessel-ID und API-Geheimnis werden benoetigt.');
+  }
+
+  $status = bratonien_tools_nc_connector_piwigo_api_request($api_key_id, $api_key_secret, 'pwg.session.getStatus');
+  if (!is_array($status)) throw new RuntimeException('Piwigo hat keinen auswertbaren API-Benutzerstatus geliefert.');
+  $role = strtolower(trim((string)($status['status'] ?? '')));
+  if (!in_array($role, array('admin','webmaster'), true))
+  {
+    throw new RuntimeException('Der API-Key funktioniert, gehoert aber keinem Piwigo-Administrator/Webmaster.');
+  }
+
+  $method_result = bratonien_tools_nc_connector_piwigo_api_request($api_key_id, $api_key_secret, 'reflection.getMethodList');
+  $method_map = array();
+  bratonien_tools_nc_connector_collect_method_names($method_result, $method_map);
+  $required = array('bratonien.nc.syncProductive', 'bratonien.nc.syncOrphans');
+  $missing = array_values(array_diff($required, array_keys($method_map)));
+  if ($missing)
+  {
+    throw new RuntimeException('Der API-Key ist gueltig, aber benoetigte Bratonien-Sync-Methoden fehlen: '.implode(', ', $missing).'.');
+  }
+}
+
+function bratonien_tools_nc_connector_prepare_webdav_wizard_from_connection(array $connection, $mode)
+{
+  $id = (int)$connection['id'];
+  $config = isset($connection['config']) && is_array($connection['config']) ? $connection['config'] : array();
+  $credentials = bratonien_tools_nc_connector_scoped_secret($connection);
+
+  $base_url = trim((string)($config['nextcloud_url'] ?? ''));
+  $username = trim((string)($credentials['nextcloud_user'] ?? ''));
+  if ($username === '')
+  {
+    $username = trim((string)($config['nextcloud_access_user'] ?? $config['access_user'] ?? ''));
+  }
+  $password = (string)($credentials['nextcloud_password'] ?? '');
+
+  $roots = isset($config['roots']) && is_array($config['roots']) ? array_values($config['roots']) : array();
+  $selected = array();
+  $selected_ids = array();
+  foreach ($roots as $root)
+  {
+    $path = trim((string)($root['webdav_path'] ?? ''), '/');
+    $fileid = (int)($root['fileid'] ?? 0);
+    if ($fileid < 1) continue;
+    $selected[] = $path;
+    $selected_ids[$path] = $fileid;
+  }
+
+  $state = bratonien_tools_nc_wizard_state();
+  $state = array_merge($state, array(
+    'editing_connection_id'=>$id,
+    'editing_adapter'=>(string)$connection['adapter'],
+    'editing_mode'=>(string)$mode,
+    'connection_name'=>(string)$connection['name'],
+    'host_input'=>$base_url,
+    'base_url'=>$base_url,
+    'username'=>$username,
+    '_password'=>$password,
+    '_fallback_user'=>(string)($credentials['piwigo_user'] ?? ''),
+    '_fallback_password'=>(string)($credentials['piwigo_password'] ?? ''),
+    '_api_key_id'=>(string)($credentials['api_key_id'] ?? ''),
+    '_api_key_secret'=>(string)($credentials['api_key_secret'] ?? ''),
+    'api_status'=>trim((string)($credentials['api_key_id'] ?? '')) !== '' && trim((string)($credentials['api_key_secret'] ?? '')) !== '' ? 'ok' : 'pending',
+    'roots'=>$roots,
+    'directory_selected'=>$selected,
+    'directory_selected_fileids'=>$selected_ids,
+    'source_mode'=>'webdav-placeholder',
+    'transport'=>'webdav',
+  ));
+
+  if ($base_url !== '' && $username !== '' && $password !== '')
+  {
+    $state['step'] = 2;
+    $state['scan_ok'] = true;
+    $state['technical_stage'] = 'mounts';
+    $state['technical_source'] = 'WebDAV';
+    $state['technical_error'] = '';
+    $state['technical_complete'] = false;
+    $state['directory_selection_ready'] = true;
+    $state['directory_path'] = '';
+    $state['directory_parent'] = '';
+    $state['directory_children'] = array();
+    $state['directory_current_fileid'] = 0;
+
+    try
+    {
+      bratonien_tools_nc_wizard_refresh_directory_state($state, '');
+    }
+    catch (Throwable $e)
+    {
+      $state['step'] = 1;
+      $state['scan_ok'] = false;
+      $state['technical_error'] = $e->getMessage();
+    }
+  }
+  else
+  {
+    $state['step'] = 1;
+    $state['scan_ok'] = false;
+  }
+
+  bratonien_tools_nc_wizard_store($state);
+}
+
+function bratonien_tools_nc_connector_edit_start()
+{
+  $id = (int)($_POST['connection_id'] ?? 0);
+  $connection = bratonien_tools_nc_connector_connection($id, true);
+  if (!$connection) throw new RuntimeException('Connector-Verbindung wurde nicht gefunden.');
+
+  $config = isset($connection['config']) && is_array($connection['config']) ? $connection['config'] : array();
+  $is_webdav = (string)$connection['adapter'] === 'remote'
+    && (string)($config['source_mode'] ?? '') === 'webdav-placeholder';
+  if (!$is_webdav)
+  {
+    throw new RuntimeException('Diese Legacy-Verbindung wird direkt bearbeitet. Eine WebDAV-Migration ist eine separate Aktion.');
+  }
+
+  bratonien_tools_nc_connector_prepare_webdav_wizard_from_connection($connection, 'update');
+  return array('message'=>'Verbindung #'.$id.' wurde zum Bearbeiten geoeffnet.');
+}
+
+function bratonien_tools_nc_connector_migrate_start()
+{
+  $id = (int)($_POST['connection_id'] ?? 0);
+  $connection = bratonien_tools_nc_connector_connection($id, true);
+  if (!$connection) throw new RuntimeException('Connector-Verbindung wurde nicht gefunden.');
+  if ((string)$connection['adapter'] !== 'local')
+  {
+    throw new RuntimeException('Nur eine Legacy-Verbindung kann auf WebDAV migriert werden.');
+  }
+
+  $migration = bratonien_tools_nc_connector_migration_state($connection);
+  if (empty($migration['ready']))
+  {
+    throw new RuntimeException('Die WebDAV-Migration ist noch nicht bereit. Unter Bearbeiten fehlen: '.implode(', ', $migration['missing']).'.');
+  }
+
+  bratonien_tools_nc_connector_prepare_webdav_wizard_from_connection($connection, 'migrate');
+  return array('message'=>'Die WebDAV-Migration fuer Verbindung #'.$id.' wurde geoeffnet. Die bestehende Legacy-Verbindung bleibt bis zum erfolgreichen Umstieg unveraendert.');
+}
+
+function bratonien_tools_nc_connector_update_local_friendly()
+{
+  $id = (int)($_POST['connection_id'] ?? 0);
+  $connection = bratonien_tools_nc_connector_connection($id, true);
+  if (!$connection) throw new RuntimeException('Connector-Verbindung wurde nicht gefunden.');
+  if ((string)$connection['adapter'] !== 'local') throw new RuntimeException('Diese Bearbeitung ist nur fuer Legacy-Verbindungen vorgesehen.');
+
+  $name = trim((string)($_POST['connection_name'] ?? ''));
+  if ($name === '') throw new RuntimeException('Bitte einen Namen fuer die Verbindung angeben.');
+
+  $config = isset($connection['config']) && is_array($connection['config']) ? $connection['config'] : array();
+  $host = trim((string)($_POST['nc_host'] ?? ''));
+  $port = (int)($_POST['nc_port'] ?? 5432);
+  $database = trim((string)($_POST['nc_database'] ?? ''));
+  $user = trim((string)($_POST['nc_user'] ?? ''));
+  $gallery_root = rtrim(trim((string)($_POST['nc_gallery_root'] ?? '')), '/');
+  $source_view = trim((string)($_POST['nc_source_view'] ?? ''));
+  $activity_view = trim((string)($_POST['nc_activity_view'] ?? ''));
+
+  if ($host === '') throw new RuntimeException('Datenbank-Server fehlt.');
+  if ($port < 1 || $port > 65535) throw new RuntimeException('Der Datenbank-Port ist ungueltig.');
+  if ($database === '') throw new RuntimeException('Datenbankname fehlt.');
+  if ($user === '') throw new RuntimeException('Reader-Benutzer fehlt.');
+  if ($gallery_root === '' || $gallery_root[0] !== '/') throw new RuntimeException('Der Piwigo-Galerieordner muss ein absoluter Pfad sein.');
+  if ($source_view === '' || $activity_view === '') throw new RuntimeException('Die gespeicherten Datenbankansichten duerfen nicht leer sein.');
+  bratonien_tools_nc_connector_view_name($source_view);
+  bratonien_tools_nc_connector_view_name($activity_view);
+
+  $storage_ids = isset($_POST['nc_storage_id']) && is_array($_POST['nc_storage_id']) ? $_POST['nc_storage_id'] : array();
+  $storage_prefixes = isset($_POST['nc_source_prefix']) && is_array($_POST['nc_source_prefix']) ? $_POST['nc_source_prefix'] : array();
+  $storage_mounts = isset($_POST['nc_local_mount']) && is_array($_POST['nc_local_mount']) ? $_POST['nc_local_mount'] : array();
+  $storages = array();
+  $count = max(count($storage_ids), count($storage_prefixes), count($storage_mounts));
+  for ($index = 0; $index < $count; $index++)
+  {
+    $storage_id = trim((string)($storage_ids[$index] ?? ''));
+    $prefix = trim((string)($storage_prefixes[$index] ?? ''), '/');
+    $mount = rtrim(trim((string)($storage_mounts[$index] ?? '')), '/');
+    if ($storage_id === '' && $prefix === '' && $mount === '') continue;
+    if ($storage_id === '') throw new RuntimeException('Bei einem Speicherort fehlt die Storage-ID.');
+    if ($mount === '' || $mount[0] !== '/') throw new RuntimeException('Bei einem Speicherort fehlt ein gueltiger lokaler Pfad.');
+    $storages[] = array('storage_id'=>$storage_id, 'source_prefix'=>$prefix, 'local_mount'=>$mount);
+  }
+  if (!$storages) throw new RuntimeException('Mindestens ein Speicherort muss vorhanden sein.');
+
+  $credentials = bratonien_tools_nc_connector_scoped_secret($connection);
+  $new_db_password = (string)($_POST['nc_db_password'] ?? '');
+  if ($new_db_password !== '') $credentials['db_password'] = $new_db_password;
+  if (trim((string)($credentials['db_password'] ?? '')) === '') throw new RuntimeException('Fuer die Legacy-Verbindung ist kein Datenbankpasswort gespeichert.');
+
+  $nextcloud_url = trim((string)($_POST['nc_nextcloud_url'] ?? ($config['nextcloud_url'] ?? '')));
+  $nextcloud_user = trim((string)($_POST['nc_nextcloud_user'] ?? ($credentials['nextcloud_user'] ?? '')));
+  $new_nextcloud_password = (string)($_POST['nc_nextcloud_password'] ?? '');
+  if ($new_nextcloud_password !== '') $credentials['nextcloud_password'] = $new_nextcloud_password;
+  $nextcloud_password = (string)($credentials['nextcloud_password'] ?? '');
+
+  $api_key_id = trim((string)($_POST['nc_connection_api_key_id'] ?? ($credentials['api_key_id'] ?? '')));
+  $new_api_secret = trim((string)($_POST['nc_connection_api_key_secret'] ?? ''));
+  $old_api_id = trim((string)($credentials['api_key_id'] ?? ''));
+  if ($api_key_id !== $old_api_id && $new_api_secret === '')
+  {
+    throw new RuntimeException('Wenn die API-Schluessel-ID geaendert wird, muss auch das API-Geheimnis neu eingegeben werden.');
+  }
+  if ($new_api_secret !== '') $credentials['api_key_secret'] = $new_api_secret;
+  $api_key_secret = trim((string)($credentials['api_key_secret'] ?? ''));
+
+  if (($nextcloud_url === '' || $nextcloud_user === '' || $nextcloud_password === '') && ($nextcloud_url !== '' || $nextcloud_user !== '' || $nextcloud_password !== ''))
+  {
+    throw new RuntimeException('Nextcloud-Adresse, Nextcloud-Benutzer und Nextcloud-Passwort muessen fuer WebDAV gemeinsam vollstaendig sein.');
+  }
+  if (($api_key_id === '') !== ($api_key_secret === ''))
+  {
+    throw new RuntimeException('Piwigo-API-Schluessel-ID und API-Geheimnis muessen gemeinsam vollstaendig sein.');
+  }
+
+  if ($nextcloud_url !== '')
+  {
+    $validated_nc = bratonien_tools_nc_connector_validate_nextcloud_access($nextcloud_url, $nextcloud_user, $nextcloud_password);
+    $nextcloud_url = $validated_nc['base_url'];
+    $nextcloud_user = $validated_nc['username'];
+    $credentials['nextcloud_user'] = $nextcloud_user;
+  }
+  if ($api_key_id !== '')
+  {
+    bratonien_tools_nc_connector_validate_scoped_api($api_key_id, $api_key_secret);
+    $credentials['api_key_id'] = $api_key_id;
+  }
+
+  $config['host'] = $host;
+  $config['port'] = (string)$port;
+  $config['database'] = $database;
+  $config['user'] = $user;
+  $config['source_view'] = $source_view;
+  $config['activity_view'] = $activity_view;
+  $config['gallery_root'] = $gallery_root;
+  $config['quiet_seconds'] = max(0, (int)($_POST['nc_quiet_seconds'] ?? ($config['quiet_seconds'] ?? 120)));
+  $config['max_wait_seconds'] = max(60, (int)($_POST['nc_max_wait_seconds'] ?? ($config['max_wait_seconds'] ?? 900)));
+  $config['full_sync_seconds'] = max(300, (int)($_POST['nc_full_sync_seconds'] ?? ($config['full_sync_seconds'] ?? 86400)));
+  $config['storages'] = $storages;
+  if ($nextcloud_url !== '')
+  {
+    $config['nextcloud_url'] = $nextcloud_url;
+    $config['access_user'] = $nextcloud_user;
+    $config['nextcloud_access_user'] = $nextcloud_user;
+  }
+  $config['piwigo_auth'] = 'connection-scoped';
+  $config['api_enabled'] = $api_key_id !== '' && $api_key_secret !== '';
+  unset($config['verification']);
+
+  $config_json = json_encode($config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+  if (!is_string($config_json)) throw new RuntimeException('Connector-Konfiguration konnte nicht serialisiert werden.');
+  $secret_payload = json_encode($credentials, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+  if (!is_string($secret_payload)) throw new RuntimeException('Connector-Zugangsdaten konnten nicht serialisiert werden.');
+  $secret_blob = bratonien_tools_nc_connector_encrypt_secret($secret_payload);
+
+  $table = bratonien_tools_nc_connector_table();
+  $now = date('Y-m-d H:i:s');
+  pwg_query("UPDATE `$table` SET name='".pwg_db_real_escape_string($name)."', config_json='".pwg_db_real_escape_string($config_json)."', secret_blob='".pwg_db_real_escape_string($secret_blob)."', updated='".pwg_db_real_escape_string($now)."' WHERE id=".$id." LIMIT 1");
+
+  $updated = bratonien_tools_nc_connector_connection($id, true);
+  $migration = $updated ? bratonien_tools_nc_connector_migration_state($updated) : array('ready'=>false);
+  return array(
+    'message'=>'Verbindung #'.$id.' wurde gespeichert. '.(!empty($migration['ready']) ? 'Die WebDAV-Migration ist jetzt bereit.' : 'Die WebDAV-Migration ist noch nicht vollstaendig vorbereitet.'),
+  );
+}

include/nc_connector_generic_scope.inc.php

@@ -54,6 +54,8 @@ function bratonien_tools_nc_wizard_finish_generic_scope()
   $_POST['nc_piwigo_password']=$fallback_password;
   $_POST['nc_nextcloud_url']=(string)$state['base_url'];
   $_POST['nc_access_user']=(string)$state['username'];
+  $_POST['nc_nextcloud_user']=(string)$state['username'];
+  $_POST['nc_nextcloud_password']=(string)$state['_password'];
   $_POST['nc_product']=(string)$state['product'];
   $_POST['nc_version']=(string)$state['version'];
   $_POST['nc_api_validated']=($state['api_status'] ?? '')==='ok'?'1':'0';

include/nc_connector_piwigo_api.inc.php

@@ -179,6 +179,76 @@ function bratonien_tools_nc_connector_piwigo_api_request($api_key_id, $api_key_s
   return bratonien_tools_nc_connector_api_payload($decoded);
 }
 
+function bratonien_tools_nc_connector_validate_fallback_credentials($username, $password)
+{
+  if (!function_exists('curl_init'))
+  {
+    throw new RuntimeException('cURL ist in PHP nicht verfuegbar. Der Piwigo-Fallback kann nicht geprueft werden.');
+  }
+
+  $username = trim((string)$username);
+  $password = (string)$password;
+  if ($username === '' || $password === '')
+  {
+    throw new RuntimeException('Piwigo-Benutzername und Passwort muessen angegeben werden.');
+  }
+
+  $cookie_file = tempnam(sys_get_temp_dir(), 'br-pwg-auth-');
+  if ($cookie_file === false)
+  {
+    throw new RuntimeException('Temporare Piwigo-Sitzung konnte nicht angelegt werden.');
+  }
+
+  try
+  {
+    $url = rtrim(get_absolute_root_url(true), '/').'/ws.php?format=json';
+    $request = function(array $fields) use ($url, $cookie_file)
+    {
+      $ch = curl_init($url);
+      curl_setopt_array($ch, array(
+        CURLOPT_RETURNTRANSFER=>true,
+        CURLOPT_POST=>true,
+        CURLOPT_POSTFIELDS=>http_build_query($fields),
+        CURLOPT_COOKIEJAR=>$cookie_file,
+        CURLOPT_COOKIEFILE=>$cookie_file,
+        CURLOPT_CONNECTTIMEOUT=>10,
+        CURLOPT_TIMEOUT=>20,
+        CURLOPT_FOLLOWLOCATION=>false,
+        CURLOPT_USERAGENT=>'Bratonien-Tools-NC-Connector/'.(function_exists('bratonien_tools_current_version') ? bratonien_tools_current_version() : 'dev'),
+      ));
+      $body = curl_exec($ch);
+      $errno = curl_errno($ch);
+      $error = curl_error($ch);
+      $http = (int)curl_getinfo($ch, CURLINFO_HTTP_CODE);
+      $type = (string)curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
+      curl_close($ch);
+      if ($body === false || $errno !== 0) throw new RuntimeException('Piwigo-Fallback konnte nicht geprueft werden: '.$error);
+      if ($http < 200 || $http >= 300) throw new RuntimeException('Piwigo-Fallback-Pruefung antwortete mit HTTP '.$http.'.');
+      $decoded = bratonien_tools_nc_connector_decode_api_response((string)$body, $type);
+      if (($decoded['stat'] ?? '') !== 'ok')
+      {
+        $message = trim((string)($decoded['message'] ?? $decoded['err'] ?? 'Piwigo hat die Anmeldung abgelehnt.'));
+        throw new RuntimeException($message !== '' ? $message : 'Piwigo hat die Anmeldung abgelehnt.');
+      }
+      return bratonien_tools_nc_connector_api_payload($decoded);
+    };
+
+    $request(array('method'=>'pwg.session.login', 'username'=>$username, 'password'=>$password));
+    $status = $request(array('method'=>'pwg.session.getStatus'));
+    if (!is_array($status)) throw new RuntimeException('Piwigo hat keinen auswertbaren Benutzerstatus geliefert.');
+    $role = strtolower(trim((string)($status['status'] ?? '')));
+    if (!in_array($role, array('admin','webmaster'), true))
+    {
+      throw new RuntimeException('Der Piwigo-Fallback funktioniert, gehoert aber keinem Administrator/Webmaster.');
+    }
+    return array('username'=>(string)($status['username'] ?? $username), 'status'=>$role);
+  }
+  finally
+  {
+    @unlink($cookie_file);
+  }
+}
+
 function bratonien_tools_nc_connector_piwigo_api_test()
 {
   $api_key_id = trim((string)($_POST['nc_piwigo_api_key_id'] ?? ''));

include/nc_connector_scheduler.inc.php

@@ -0,0 +1,210 @@
+<?php
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die('Hacking attempt!');
+}
+
+function bratonien_tools_nc_scheduler_paths()
+{
+  $base = rtrim(PHPWG_ROOT_PATH, '/').'/_data/bratonien-tools';
+  return array(
+    'base'=>$base,
+    'runtime'=>$base.'/nc-connector-runtime',
+    'state_root'=>$base.'/nc-connector-state',
+    'scheduler'=>$base.'/nc-connector-scheduler',
+    'state'=>$base.'/nc-connector-scheduler/state.json',
+    'trigger_lock'=>$base.'/nc-connector-scheduler/trigger.lock',
+    'worker_lock'=>$base.'/nc-connector-scheduler/worker.lock',
+    'log'=>$base.'/nc-connector-scheduler/last-worker.log',
+    'status_root'=>$base.'/nc-connector-status',
+  );
+}
+
+function bratonien_tools_nc_scheduler_interval()
+{
+  global $conf;
+  $interval = isset($conf['bratonien_nc_scheduler_interval']) ? (int)$conf['bratonien_nc_scheduler_interval'] : 60;
+  return max(60, $interval);
+}
+
+function bratonien_tools_nc_scheduler_ensure_dirs()
+{
+  foreach (bratonien_tools_nc_scheduler_paths() as $key=>$path)
+  {
+    if (in_array($key, array('state','trigger_lock','worker_lock','log'), true)) continue;
+    if (!is_dir($path) && !@mkdir($path, 0750, true) && !is_dir($path))
+    {
+      return false;
+    }
+  }
+  return true;
+}
+
+function bratonien_tools_nc_scheduler_read_state()
+{
+  $paths = bratonien_tools_nc_scheduler_paths();
+  if (!is_readable($paths['state'])) return array();
+  $decoded = json_decode((string)@file_get_contents($paths['state']), true);
+  return is_array($decoded) ? $decoded : array();
+}
+
+function bratonien_tools_nc_scheduler_write_state(array $state)
+{
+  $paths = bratonien_tools_nc_scheduler_paths();
+  if (!bratonien_tools_nc_scheduler_ensure_dirs()) return false;
+  $json = json_encode($state, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT);
+  if (!is_string($json)) return false;
+  $tmp = $paths['state'].'.tmp';
+  if (@file_put_contents($tmp, $json."\n", LOCK_EX) === false) return false;
+  @chmod($tmp, 0640);
+  return @rename($tmp, $paths['state']);
+}
+
+function bratonien_tools_nc_scheduler_write_connection_status($connection_id, $state, $message)
+{
+  $connection_id = (int)$connection_id;
+  if ($connection_id < 1) return false;
+  $paths = bratonien_tools_nc_scheduler_paths();
+  if (!bratonien_tools_nc_scheduler_ensure_dirs()) return false;
+  $target = $paths['status_root'].'/connection-'.$connection_id.'.json';
+  $existing = array();
+  if (is_readable($target))
+  {
+    $decoded = json_decode((string)@file_get_contents($target), true);
+    if (is_array($decoded)) $existing = $decoded;
+  }
+  $existing['state'] = (string)$state;
+  $existing['message'] = (string)$message;
+  $existing['timestamp'] = time();
+  $existing['connection_id'] = $connection_id;
+  $json = json_encode($existing, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT);
+  if (!is_string($json)) return false;
+  $tmp = $target.'.tmp';
+  if (@file_put_contents($tmp, $json."\n", LOCK_EX) === false) return false;
+  @chmod($tmp, 0644);
+  return @rename($tmp, $target);
+}
+
+function bratonien_tools_nc_scheduler_install()
+{
+  if (!bratonien_tools_nc_scheduler_ensure_dirs()) return false;
+  $state = bratonien_tools_nc_scheduler_read_state();
+  if (empty($state['next_due']))
+  {
+    $state['next_due'] = time();
+    $state['enabled'] = true;
+    $state['mode'] = 'piwigo-native';
+    bratonien_tools_nc_scheduler_write_state($state);
+  }
+  return true;
+}
+
+function bratonien_tools_nc_scheduler_php_binary()
+{
+  foreach (array('/usr/bin/php', '/usr/local/bin/php', PHP_BINARY) as $candidate)
+  {
+    if (is_string($candidate) && $candidate !== '' && is_executable($candidate)) return $candidate;
+  }
+  return '';
+}
+
+function bratonien_tools_nc_scheduler_spawn($force = false, $connection_id = 0)
+{
+  $connection_id = max(0, (int)$connection_id);
+  $paths = bratonien_tools_nc_scheduler_paths();
+  if (!bratonien_tools_nc_scheduler_ensure_dirs())
+  {
+    throw new RuntimeException('Der native NC-Scheduler kann sein Laufzeitverzeichnis nicht anlegen.');
+  }
+
+  $lock = @fopen($paths['trigger_lock'], 'c+');
+  if (!is_resource($lock) || !@flock($lock, LOCK_EX | LOCK_NB))
+  {
+    if (is_resource($lock)) fclose($lock);
+    return array('started'=>false, 'message'=>'Ein NC-Abgleich wird bereits vorbereitet.');
+  }
+
+  $state = bratonien_tools_nc_scheduler_read_state();
+  $now = time();
+  $next_due = (int)($state['next_due'] ?? 0);
+  if (!$force && $next_due > $now)
+  {
+    @flock($lock, LOCK_UN);
+    fclose($lock);
+    return array('started'=>false, 'message'=>'Der nächste NC-Abgleich ist noch nicht fällig.');
+  }
+
+  $php = bratonien_tools_nc_scheduler_php_binary();
+  if ($php === '')
+  {
+    @flock($lock, LOCK_UN);
+    fclose($lock);
+    throw new RuntimeException('Kein ausführbares PHP-CLI für den nativen NC-Scheduler gefunden.');
+  }
+
+  $state['enabled'] = true;
+  $state['mode'] = 'piwigo-native';
+  $state['state'] = 'queued';
+  $state['message'] = $connection_id > 0 ? 'NC-Abgleich für Verbindung #'.$connection_id.' wurde angefordert.' : 'NC-Abgleich für alle Verbindungen wurde angefordert.';
+  $state['queued_at'] = $now;
+  $state['timestamp'] = $now;
+  $state['connection_id'] = $connection_id;
+  $state['next_due'] = $now + bratonien_tools_nc_scheduler_interval();
+  bratonien_tools_nc_scheduler_write_state($state);
+  if ($connection_id > 0)
+  {
+    bratonien_tools_nc_scheduler_write_connection_status($connection_id, 'queued', 'Abgleich wurde angefordert.');
+  }
+
+  $runner = BRATONIEN_TOOLS_PATH.'runtime/native-runner.php';
+  $runner_args = $connection_id > 0 ? ' --connection-id='.escapeshellarg((string)$connection_id) : '';
+  $command = escapeshellarg($php).' '.escapeshellarg($runner).$runner_args.' >> '.escapeshellarg($paths['log']).' 2>&1 &';
+  $spec = array(
+    0=>array('file','/dev/null','r'),
+    1=>array('file','/dev/null','a'),
+    2=>array('file','/dev/null','a'),
+  );
+  $process = function_exists('proc_open') ? @proc_open(array('/bin/sh','-c',$command), $spec, $pipes) : false;
+  $exit = is_resource($process) ? proc_close($process) : 1;
+
+  @flock($lock, LOCK_UN);
+  fclose($lock);
+
+  if ($exit !== 0)
+  {
+    $state = bratonien_tools_nc_scheduler_read_state();
+    $state['state'] = 'error';
+    $state['message'] = 'Der native NC-Abgleich konnte nicht gestartet werden.';
+    $state['timestamp'] = time();
+    bratonien_tools_nc_scheduler_write_state($state);
+    if ($connection_id > 0)
+    {
+      bratonien_tools_nc_scheduler_write_connection_status($connection_id, 'error', 'Abgleich konnte nicht gestartet werden.');
+    }
+    throw new RuntimeException('Der native NC-Abgleich konnte nicht gestartet werden.');
+  }
+
+  return array('started'=>true, 'message'=>$connection_id > 0 ? 'Abgleich für Verbindung #'.$connection_id.' wurde angefordert.' : 'Abgleich für alle Verbindungen wurde angefordert.');
+}
+
+function bratonien_tools_nc_scheduler_tick()
+{
+  $state = bratonien_tools_nc_scheduler_read_state();
+  if (isset($state['enabled']) && !$state['enabled']) return;
+  $next_due = (int)($state['next_due'] ?? 0);
+  if ($next_due > time()) return;
+
+  try
+  {
+    bratonien_tools_nc_scheduler_spawn(false, 0);
+  }
+  catch (Throwable $e)
+  {
+    $state = bratonien_tools_nc_scheduler_read_state();
+    $state['state'] = 'error';
+    $state['message'] = $e->getMessage();
+    $state['timestamp'] = time();
+    $state['next_due'] = time() + bratonien_tools_nc_scheduler_interval();
+    bratonien_tools_nc_scheduler_write_state($state);
+  }
+}

include/nc_connector_system.inc.php

@@ -4,109 +4,13 @@ if (!defined('PHPWG_ROOT_PATH'))
   die('Hacking attempt!');
 }
 
-function bratonien_tools_nc_connector_systemctl_value(array $args)
-{
-  if (!function_exists('proc_open'))
-  {
-    return '';
-  }
-
-  $command = array_merge(array('/usr/bin/systemctl'), $args);
-  $spec = array(
-    0 => array('file', '/dev/null', 'r'),
-    1 => array('pipe', 'w'),
-    2 => array('pipe', 'w'),
-  );
-  $environment = array_merge($_ENV, array('LC_ALL'=>'C', 'LANG'=>'C'));
-  $process = @proc_open($command, $spec, $pipes, null, $environment);
-  if (!is_resource($process))
-  {
-    return '';
-  }
-  $stdout = stream_get_contents($pipes[1]);
-  stream_get_contents($pipes[2]);
-  fclose($pipes[1]);
-  fclose($pipes[2]);
-  $exit = proc_close($process);
-  return $exit === 0 ? trim((string)$stdout) : '';
-}
-
-function bratonien_tools_nc_connector_parse_systemd_time($value)
-{
-  $value = trim((string)$value);
-  if ($value === '' || strtolower($value) === 'n/a')
-  {
-    return 0;
-  }
-  $parsed = strtotime($value);
-  return $parsed === false ? 0 : (int)$parsed;
-}
-
-function bratonien_tools_nc_connector_monotonic_to_timestamp($value)
-{
-  $value = trim((string)$value);
-  if ($value === '' || $value === '0' || strtolower($value) === 'n/a')
-  {
-    return 0;
-  }
-
-  if (preg_match('/^([0-9]+)(?:us)?$/', $value, $matches))
-  {
-    $next_boot_seconds = ((float)$matches[1]) / 1000000;
-  }
-  else
-  {
-    return 0;
-  }
-
-  $uptime_raw = @file_get_contents('/proc/uptime');
-  if (!is_string($uptime_raw) || !preg_match('/^([0-9]+(?:\.[0-9]+)?)/', trim($uptime_raw), $uptime_match))
-  {
-    return 0;
-  }
-
-  $remaining = $next_boot_seconds - (float)$uptime_match[1];
-  if ($remaining < -1)
-  {
-    return 0;
-  }
-
-  return (int)round(time() + max(0, $remaining));
-}
-
-function bratonien_tools_nc_connector_next_from_timer_list($timer)
-{
-  $line = bratonien_tools_nc_connector_systemctl_value(array(
-    'list-timers', '--all', '--no-pager', '--no-legend', $timer,
-  ));
-  if ($line === '')
-  {
-    return 0;
-  }
-
-  $first_line = trim((string)strtok($line, "\n"));
-  if (preg_match('/^(\S+\s+\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\s+\S+)/', $first_line, $matches))
-  {
-    $parsed = strtotime($matches[1]);
-    return $parsed === false ? 0 : (int)$parsed;
-  }
-
-  return 0;
-}
+require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_scheduler.inc.php');
 
 function bratonien_tools_nc_connector_connection_last_status(array $connection)
 {
   $empty = array(
-    'timestamp'=>0,
-    'label'=>'Nicht verfügbar',
-    'state'=>'',
-    'message'=>'',
-    'auth_mode'=>'',
-    'api_state'=>'',
-    'api_message'=>'',
-    'fallback_state'=>'',
-    'fallback_message'=>'',
-    'error_detail'=>'',
+    'timestamp'=>0,'label'=>'Nicht verfügbar','state'=>'','message'=>'','auth_mode'=>'',
+    'api_state'=>'','api_message'=>'','fallback_state'=>'','fallback_message'=>'','error_detail'=>'',
   );
 
   $connection_id = (int)($connection['id'] ?? 0);
@@ -114,42 +18,25 @@ function bratonien_tools_nc_connector_connection_last_status(array $connection)
   if ($connection_id > 0)
   {
     $candidates[] = rtrim(PHPWG_ROOT_PATH, '/').'/_data/bratonien-tools/nc-connector-status/connection-'.$connection_id.'.json';
+    $candidates[] = rtrim(PHPWG_ROOT_PATH, '/').'/_data/bratonien-tools/nc-connector-state/connection-'.$connection_id.'/connector-status.json';
   }
 
   $config = isset($connection['config']) && is_array($connection['config']) ? $connection['config'] : array();
   $state_dir = rtrim((string)($config['state_dir'] ?? ''), '/');
-  if ($state_dir === '' && $connection_id > 0)
-  {
-    $state_dir = '/var/lib/bratonien-tools/nc-connector/connection-'.$connection_id;
-  }
-  if ($state_dir !== '')
-  {
-    $candidates[] = $state_dir.'/connector-status.json';
-  }
+  if ($state_dir !== '') $candidates[] = $state_dir.'/connector-status.json';
 
   $decoded = null;
-  foreach ($candidates as $candidate)
+  foreach (array_unique($candidates) as $candidate)
   {
-    if (!is_readable($candidate))
-    {
-      continue;
-    }
+    if (!is_readable($candidate)) continue;
     $value = json_decode((string)@file_get_contents($candidate), true);
-    if (is_array($value))
-    {
-      $decoded = $value;
-      break;
-    }
-  }
-  if (!is_array($decoded))
-  {
-    return $empty;
+    if (is_array($value)) { $decoded = $value; break; }
   }
+  if (!is_array($decoded)) return $empty;
 
   $timestamp = (int)($decoded['timestamp'] ?? 0);
   $api = isset($decoded['api']) && is_array($decoded['api']) ? $decoded['api'] : array();
   $fallback = isset($decoded['fallback']) && is_array($decoded['fallback']) ? $decoded['fallback'] : array();
-
   return array(
     'timestamp'=>$timestamp,
     'label'=>$timestamp > 0 ? date('d.m.Y H:i:s', $timestamp) : 'Nicht verfügbar',
@@ -166,73 +53,88 @@ function bratonien_tools_nc_connector_connection_last_status(array $connection)
 
 function bratonien_tools_nc_connector_last_status(array $connections)
 {
-  $latest = array('timestamp'=>0, 'state'=>'', 'message'=>'', 'auth_mode'=>'', 'api_state'=>'', 'api_message'=>'', 'fallback_state'=>'', 'fallback_message'=>'', 'error_detail'=>'');
-
+  $latest = array('timestamp'=>0,'state'=>'','message'=>'','auth_mode'=>'','api_state'=>'','api_message'=>'','fallback_state'=>'','fallback_message'=>'','error_detail'=>'');
   foreach ($connections as $connection)
   {
-    if (empty($connection['enabled']) || (string)($connection['takeover_state'] ?? '') !== 'active')
-    {
-      continue;
-    }
-
+    if (empty($connection['enabled'])) continue;
     $status = bratonien_tools_nc_connector_connection_last_status($connection);
-    if ((int)$status['timestamp'] >= (int)$latest['timestamp'])
-    {
-      $latest = $status;
-    }
+    if ((int)$status['timestamp'] >= (int)$latest['timestamp']) $latest = $status;
   }
-
   return $latest;
 }
 
 function bratonien_tools_nc_connector_system_status(array $connections = array())
 {
-  $timer = 'bratonien-nc-connector.timer';
-  $service = 'bratonien-nc-connector.service';
-
-  $next_realtime_raw = bratonien_tools_nc_connector_systemctl_value(array('show', $timer, '--property=NextElapseUSecRealtime', '--value'));
-  $next_timestamp = bratonien_tools_nc_connector_parse_systemd_time($next_realtime_raw);
-
-  if ($next_timestamp <= 0)
-  {
-    $next_monotonic_raw = bratonien_tools_nc_connector_systemctl_value(array('show', $timer, '--property=NextElapseUSecMonotonic', '--value'));
-    $next_timestamp = bratonien_tools_nc_connector_monotonic_to_timestamp($next_monotonic_raw);
-  }
-
-  if ($next_timestamp <= 0)
-  {
-    $next_timestamp = bratonien_tools_nc_connector_next_from_timer_list($timer);
-  }
-
-  $active = bratonien_tools_nc_connector_systemctl_value(array('is-active', $timer));
-  $enabled = bratonien_tools_nc_connector_systemctl_value(array('is-enabled', $timer));
-
+  $scheduler = bratonien_tools_nc_scheduler_read_state();
+  $enabled = !isset($scheduler['enabled']) || !empty($scheduler['enabled']);
+  $scheduler_state = (string)($scheduler['state'] ?? '');
+  $running = $scheduler_state === 'running';
+  $queued = $scheduler_state === 'queued';
+  $started = (int)($scheduler['started_at'] ?? 0);
+  $next = (int)($scheduler['next_due'] ?? 0);
   $last = bratonien_tools_nc_connector_last_status($connections);
-  if ($last['timestamp'] <= 0)
+
+  if ($next > 0)
   {
-    $last_raw = bratonien_tools_nc_connector_systemctl_value(array('show', $service, '--property=ExecMainExitTimestamp', '--value'));
-    $last['timestamp'] = bratonien_tools_nc_connector_parse_systemd_time($last_raw);
+    $next_label = date('d.m.Y H:i:s', $next).' (beim nächsten Piwigo-Aufruf)';
   }
+  else
+  {
+    $next_label = 'Beim nächsten Piwigo-Aufruf';
+  }
+
+  $scheduler_timestamp = (int)($scheduler['timestamp'] ?? 0);
+  if ($scheduler_timestamp > (int)$last['timestamp'])
+  {
+    $last['timestamp'] = $scheduler_timestamp;
+    $last['state'] = $scheduler_state;
+    $last['message'] = (string)($scheduler['message'] ?? '');
+    if ($scheduler_state === 'error')
+    {
+      $detail = trim((string)($scheduler['stderr'] ?? ''));
+      if ($detail === '') $detail = trim((string)($scheduler['stdout'] ?? ''));
+      $last['error_detail'] = $detail;
+    }
+  }
+  elseif ((int)$last['timestamp'] <= 0 && !empty($scheduler['finished_at']))
+  {
+    $last['timestamp'] = (int)$scheduler['finished_at'];
+    $last['state'] = $scheduler_state;
+    $last['message'] = (string)($scheduler['message'] ?? '');
+    if ((string)$last['state'] === 'error')
+    {
+      $detail = trim((string)($scheduler['stderr'] ?? ''));
+      if ($detail === '') $detail = trim((string)($scheduler['stdout'] ?? ''));
+      $last['error_detail'] = $detail;
+    }
+  }
+
+  $current_label = 'Kein Lauf aktiv';
+  if ($queued) $current_label = 'Abgleich angefordert';
+  if ($running) $current_label = $started > 0 ? 'Läuft seit '.date('d.m.Y H:i:s', $started) : 'Läuft gerade';
 
   return array(
-    'timer_name' => $timer,
-    'timer_active' => $active === 'active',
-    'timer_enabled' => $enabled === 'enabled',
-    'last_run_timestamp' => (int)$last['timestamp'],
-    'last_run_label' => $last['timestamp'] > 0 ? date('d.m.Y H:i:s', (int)$last['timestamp']) : 'Nicht verfügbar',
-    'last_run_state' => (string)$last['state'],
-    'last_run_message' => (string)$last['message'],
-    'last_run_auth_mode' => (string)$last['auth_mode'],
-    'last_run_api_state' => (string)$last['api_state'],
-    'last_run_api_message' => (string)$last['api_message'],
-    'last_run_fallback_state' => (string)$last['fallback_state'],
-    'last_run_fallback_message' => (string)$last['fallback_message'],
-    'last_run_error_detail' => (string)$last['error_detail'],
-    'next_run_timestamp' => $next_timestamp,
-    'next_run_label' => $next_timestamp > 0 ? date('d.m.Y H:i:s', $next_timestamp) : 'Nicht verfügbar',
-    'legacy_runtime_exists' => is_dir('/opt/piwigo-sync'),
-    'legacy_config_exists' => is_dir('/etc/piwigo-sync'),
-    'legacy_service_exists' => is_file('/etc/systemd/system/piwigo-sync.service'),
-    'legacy_timer_exists' => is_file('/etc/systemd/system/piwigo-sync.timer'),
+    'timer_name'=>'Piwigo nativer NC-Scheduler',
+    'timer_active'=>$enabled,
+    'timer_enabled'=>$enabled,
+    'service_active'=>$running || $queued,
+    'current_run_timestamp'=>$queued ? (int)($scheduler['queued_at'] ?? 0) : $started,
+    'current_run_label'=>$current_label,
+    'last_run_timestamp'=>(int)$last['timestamp'],
+    'last_run_label'=>(int)$last['timestamp'] > 0 ? date('d.m.Y H:i:s', (int)$last['timestamp']) : 'Nicht verfügbar',
+    'last_run_state'=>(string)$last['state'],
+    'last_run_message'=>(string)$last['message'],
+    'last_run_auth_mode'=>(string)$last['auth_mode'],
+    'last_run_api_state'=>(string)$last['api_state'],
+    'last_run_api_message'=>(string)$last['api_message'],
+    'last_run_fallback_state'=>(string)$last['fallback_state'],
+    'last_run_fallback_message'=>(string)$last['fallback_message'],
+    'last_run_error_detail'=>(string)$last['error_detail'],
+    'next_run_timestamp'=>$next,
+    'next_run_label'=>$next_label,
+    'legacy_runtime_exists'=>is_dir('/opt/piwigo-sync'),
+    'legacy_config_exists'=>is_dir('/etc/piwigo-sync'),
+    'legacy_service_exists'=>is_file('/etc/systemd/system/piwigo-sync.service'),
+    'legacy_timer_exists'=>is_file('/etc/systemd/system/piwigo-sync.timer'),
   );
 }

include/nc_connector_takeover.inc.php

@@ -1,135 +0,0 @@
-<?php
-if (!defined('PHPWG_ROOT_PATH'))
-{
-  die('Hacking attempt!');
-}
-
-/**
- * Controlled handover preparation for verified NC Connector connections.
- *
- * This phase intentionally does not stop, disable or modify the legacy
- * piwigo-sync service. It only marks a verified Connector connection as ready
- * for a later controlled takeover. The marker can be rolled back at any time.
- */
-
-function bratonien_tools_nc_connector_ensure_takeover_state()
-{
-  bratonien_tools_nc_connector_ensure_table();
-  $table = bratonien_tools_nc_connector_table();
-  pwg_query("ALTER TABLE `$table` MODIFY takeover_state enum('imported','verified','ready','active','disabled') NOT NULL DEFAULT 'imported'");
-}
-
-function bratonien_tools_nc_connector_prepare_takeover()
-{
-  $id = isset($_POST['connection_id']) ? (int)$_POST['connection_id'] : 0;
-  $connection = bratonien_tools_nc_connector_connection($id, false);
-  if (!$connection)
-  {
-    throw new RuntimeException('Connector-Verbindung wurde nicht gefunden.');
-  }
-  if ($connection['takeover_state'] !== 'verified')
-  {
-    throw new RuntimeException('Nur eine erfolgreich verifizierte Verbindung kann fuer die Uebergabe vorbereitet werden.');
-  }
-
-  $config = $connection['config'];
-  $verification = isset($config['verification']) && is_array($config['verification'])
-    ? $config['verification']
-    : array();
-  if (empty($verification['ok']))
-  {
-    throw new RuntimeException('Die gespeicherte Verifikation ist nicht erfolgreich. Bitte die Verbindung erneut pruefen.');
-  }
-
-  $config['takeover'] = array(
-    'prepared_at' => date('Y-m-d H:i:s'),
-    'legacy_sync_untouched' => true,
-    'connector_enabled' => false,
-    'first_run' => array(
-      'status' => 'pending',
-      'finished_at' => null,
-      'detail' => '',
-    ),
-  );
-  $config_json = json_encode($config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
-  if (!is_string($config_json))
-  {
-    throw new RuntimeException('Uebergabestatus konnte nicht gespeichert werden.');
-  }
-
-  bratonien_tools_nc_connector_ensure_takeover_state();
-  $table = bratonien_tools_nc_connector_table();
-  $now = date('Y-m-d H:i:s');
-  pwg_query("UPDATE `$table` SET
-    takeover_state = 'ready',
-    enabled = 0,
-    config_json = '".pwg_db_real_escape_string($config_json)."',
-    updated = '".pwg_db_real_escape_string($now)."'
-    WHERE id = ".(int)$connection['id']);
-
-  return array(
-    'message' => 'Die verifizierte Nextcloud-Verbindung ist jetzt fuer die kontrollierte Uebergabe vorbereitet. Der Connector wurde noch nicht aktiviert und der Legacy-Sync bleibt unveraendert Produktionsverbindung.',
-  );
-}
-
-function bratonien_tools_nc_connector_cancel_takeover()
-{
-  $id = isset($_POST['connection_id']) ? (int)$_POST['connection_id'] : 0;
-  $connection = bratonien_tools_nc_connector_connection($id, false);
-  if (!$connection)
-  {
-    throw new RuntimeException('Connector-Verbindung wurde nicht gefunden.');
-  }
-  if ($connection['takeover_state'] !== 'ready')
-  {
-    throw new RuntimeException('Diese Verbindung befindet sich nicht in der Uebergabevorbereitung.');
-  }
-
-  $config = $connection['config'];
-  if (isset($config['takeover']))
-  {
-    unset($config['takeover']);
-  }
-  $config_json = json_encode($config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
-  if (!is_string($config_json))
-  {
-    throw new RuntimeException('Uebergabestatus konnte nicht zurueckgesetzt werden.');
-  }
-
-  bratonien_tools_nc_connector_ensure_takeover_state();
-  $table = bratonien_tools_nc_connector_table();
-  $now = date('Y-m-d H:i:s');
-  pwg_query("UPDATE `$table` SET
-    takeover_state = 'verified',
-    enabled = 0,
-    config_json = '".pwg_db_real_escape_string($config_json)."',
-    updated = '".pwg_db_real_escape_string($now)."'
-    WHERE id = ".(int)$connection['id']);
-
-  return array(
-    'message' => 'Die Uebergabevorbereitung wurde zurueckgenommen. Die Verbindung bleibt verifiziert und deaktiviert; der Legacy-Sync bleibt unveraendert aktiv.',
-  );
-}
-
-/**
- * Normalize the outcome of a Connector sync run during takeover.
- *
- * Both "changed" and "no_changes" are successful results. Only "error"
- * represents a failed run and may trigger rollback of a controlled handover.
- */
-function bratonien_tools_nc_connector_takeover_result($status, $detail = '')
-{
-  $status = trim((string)$status);
-  if (!in_array($status, array('changed', 'no_changes', 'error'), true))
-  {
-    throw new RuntimeException('Unbekannter Connector-Laufstatus: '.$status);
-  }
-
-  return array(
-    'status' => $status,
-    'success' => $status !== 'error',
-    'changed' => $status === 'changed',
-    'finished_at' => date('Y-m-d H:i:s'),
-    'detail' => (string)$detail,
-  );
-}

include/nc_connector_webdav.inc.php

@@ -0,0 +1,179 @@
+<?php
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die('Hacking attempt!');
+}
+
+/**
+ * Create or update one independent WebDAV connector connection.
+ * No migration pair, successor or implicit legacy fallback is created.
+ */
+function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
+{
+  $state = bratonien_tools_nc_wizard_state();
+
+  if (empty($state['scan_ok']) || empty($state['technical_complete']))
+  {
+    throw new RuntimeException('Die WebDAV-Verbindung wurde im Assistenten noch nicht vollstaendig vorbereitet.');
+  }
+
+  $base_url = rtrim(trim((string)($state['base_url'] ?? '')), '/');
+  $username = trim((string)($state['username'] ?? ''));
+  $password = (string)($state['_password'] ?? '');
+  if ($base_url === '' || $username === '' || $password === '')
+  {
+    throw new RuntimeException('Fuer den WebDAV-Zugang fehlen Nextcloud-Adresse oder Zugangsdaten.');
+  }
+
+  $selected = isset($state['directory_selected']) && is_array($state['directory_selected'])
+    ? array_values(array_unique(array_map(function($path) { return trim((string)$path, '/'); }, $state['directory_selected'])))
+    : array();
+  $selected_ids = isset($state['directory_selected_fileids']) && is_array($state['directory_selected_fileids'])
+    ? $state['directory_selected_fileids']
+    : array();
+
+  if (!$selected)
+  {
+    $selected = array('');
+  }
+
+  $roots = array();
+  foreach ($selected as $path)
+  {
+    $fileid = isset($selected_ids[$path]) ? (int)$selected_ids[$path] : 0;
+    if ($fileid < 1)
+    {
+      throw new RuntimeException('Fuer ein ausgewaehltes Nextcloud-Verzeichnis fehlt die eindeutige Datei-ID.');
+    }
+    $display_name = $path === ''
+      ? (trim((string)($state['display_name'] ?? '')) !== '' ? trim((string)$state['display_name']) : $username)
+      : basename($path);
+    $roots[] = array(
+      'fileid'=>$fileid,
+      'display_name'=>$display_name,
+      'webdav_path'=>$path,
+    );
+  }
+
+  $name = trim((string)($state['connection_name'] ?? ''));
+  if ($name === '') $name = 'Nextcloud WebDAV';
+  $gallery_root = rtrim(trim((string)($state['gallery_root'] ?? '')), '/');
+  if ($gallery_root === '') $gallery_root = rtrim(PHPWG_ROOT_PATH, '/').'/galleries';
+
+  $api_key_id = ($state['api_status'] ?? '') === 'ok' ? trim((string)($state['_api_key_id'] ?? '')) : '';
+  $api_key_secret = ($state['api_status'] ?? '') === 'ok' ? trim((string)($state['_api_key_secret'] ?? '')) : '';
+  $fallback_user = trim((string)($state['_fallback_user'] ?? ''));
+  $fallback_password = (string)($state['_fallback_password'] ?? '');
+  $api_enabled = $api_key_id !== '' && $api_key_secret !== '';
+
+  $editing_id = (int)($state['editing_connection_id'] ?? 0);
+  $editing_mode = (string)($state['editing_mode'] ?? '');
+  $editing_connection = $editing_id > 0 ? bratonien_tools_nc_connector_connection($editing_id, false) : null;
+  $editing_remote = $editing_connection
+    && (string)$editing_connection['adapter'] === 'remote'
+    && (string)($editing_connection['config']['source_mode'] ?? '') === 'webdav-placeholder'
+    && $editing_mode === 'update';
+
+  if ($editing_mode === 'migrate')
+  {
+    throw new RuntimeException('Die Migrationsfunktion wurde entfernt. Bitte eine normale WebDAV-Verbindung anlegen.');
+  }
+
+  $config = array(
+    'origin'=>'native',
+    'source_mode'=>'webdav-placeholder',
+    'transport'=>'webdav',
+    'nextcloud_url'=>$base_url,
+    'access_user'=>$username,
+    'nextcloud_access_user'=>$username,
+    'gallery_root'=>$gallery_root,
+    'roots'=>$roots,
+    'state_dir'=>'',
+    'status_file'=>'',
+    'quiet_seconds'=>120,
+    'max_wait_seconds'=>900,
+    'full_sync_seconds'=>86400,
+    'piwigo_auth'=>'connection-scoped',
+    'api_enabled'=>$api_enabled,
+  );
+
+  if ($editing_remote)
+  {
+    $old_config = is_array($editing_connection['config'] ?? null) ? $editing_connection['config'] : array();
+    foreach (array('state_dir','status_file','parallel_gallery_root','source_fingerprint','runtime') as $preserve)
+    {
+      if (array_key_exists($preserve, $old_config)) $config[$preserve] = $old_config[$preserve];
+    }
+    foreach (array('quiet_seconds','max_wait_seconds','full_sync_seconds') as $preserve)
+    {
+      if (isset($old_config[$preserve])) $config[$preserve] = (int)$old_config[$preserve];
+    }
+  }
+
+  foreach (array('product'=>'nextcloud_product', 'version'=>'nextcloud_version') as $state_key=>$config_key)
+  {
+    $value = trim((string)($state[$state_key] ?? ''));
+    if ($value !== '') $config[$config_key] = $value;
+  }
+
+  $secret_payload = json_encode(array(
+    'v'=>3,
+    'db_password'=>'',
+    'piwigo_user'=>$fallback_user,
+    'piwigo_password'=>$fallback_password,
+    'api_key_id'=>$api_key_id,
+    'api_key_secret'=>$api_key_secret,
+    'nextcloud_user'=>$username,
+    'nextcloud_password'=>$password,
+  ), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+  if (!is_string($secret_payload)) throw new RuntimeException('WebDAV-Zugangsdaten konnten nicht serialisiert werden.');
+
+  bratonien_tools_nc_connector_ensure_table();
+  $table = bratonien_tools_nc_connector_table();
+  $now = date('Y-m-d H:i:s');
+  $secret_blob = bratonien_tools_nc_connector_encrypt_secret($secret_payload);
+
+  if ($editing_remote)
+  {
+    $config['state_dir'] = trim((string)($config['state_dir'] ?? '')) !== '' ? $config['state_dir'] : '/var/lib/bratonien-tools/nc-connector/connection-'.$editing_id;
+    $config['status_file'] = trim((string)($config['status_file'] ?? '')) !== '' ? $config['status_file'] : $config['state_dir'].'/connector-status.json';
+    $config_json = json_encode($config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+    if (!is_string($config_json)) throw new RuntimeException('WebDAV-Konfiguration konnte nicht serialisiert werden.');
+
+    pwg_query("UPDATE `$table` SET name='".pwg_db_real_escape_string($name)."', config_json='".pwg_db_real_escape_string($config_json)."', secret_blob='".pwg_db_real_escape_string($secret_blob)."', updated='".pwg_db_real_escape_string($now)."' WHERE id=".$editing_id." AND adapter='remote' LIMIT 1");
+    unset($_SESSION['bratonien_nc_wizard']);
+
+    return array(
+      'connection_id'=>$editing_id,
+      'message'=>'WebDAV-Verbindung wurde gespeichert.',
+    );
+  }
+
+  $config_json = json_encode($config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+  if (!is_string($config_json)) throw new RuntimeException('WebDAV-Konfiguration konnte nicht serialisiert werden.');
+
+  $connection_key = 'webdav-'.bin2hex(random_bytes(12));
+  pwg_query("INSERT INTO `$table` (connection_key,name,adapter,enabled,takeover_state,config_json,secret_blob,created,updated) VALUES ('"
+    .pwg_db_real_escape_string($connection_key)."','"
+    .pwg_db_real_escape_string($name)."','remote',0,'disabled','"
+    .pwg_db_real_escape_string($config_json)."','"
+    .pwg_db_real_escape_string($secret_blob)."','"
+    .pwg_db_real_escape_string($now)."','"
+    .pwg_db_real_escape_string($now)."')");
+
+  $id = (int)pwg_db_insert_id();
+  if ($id < 1) throw new RuntimeException('Die WebDAV-Verbindung konnte nicht eindeutig angelegt werden.');
+
+  $config['state_dir'] = '/var/lib/bratonien-tools/nc-connector/connection-'.$id;
+  $config['status_file'] = $config['state_dir'].'/connector-status.json';
+  $config_json = json_encode($config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+  if (!is_string($config_json)) throw new RuntimeException('WebDAV-Konfiguration konnte nach dem Anlegen nicht serialisiert werden.');
+  pwg_query("UPDATE `$table` SET config_json='".pwg_db_real_escape_string($config_json)."' WHERE id=".$id." AND adapter='remote' LIMIT 1");
+
+  unset($_SESSION['bratonien_nc_wizard']);
+
+  return array(
+    'connection_id'=>$id,
+    'message'=>'WebDAV-Verbindung wurde angelegt.',
+  );
+}

include/nc_connector_wizard_webdav_flow.inc.php

@@ -0,0 +1,235 @@
+<?php
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die('Hacking attempt!');
+}
+
+function bratonien_tools_nc_wizard_scan_webdav_first()
+{
+  $state = bratonien_tools_nc_wizard_state();
+  $host_input = trim((string)($_POST['nc_wizard_host'] ?? $state['host_input']));
+  $username = trim((string)($_POST['nc_wizard_user'] ?? $state['username']));
+  $password = array_key_exists('nc_wizard_password', $_POST) ? (string)$_POST['nc_wizard_password'] : (string)$state['_password'];
+
+  $state['step'] = 1;
+  $state['host_input'] = $host_input;
+  $state['username'] = $username;
+  $state['_password'] = $password;
+  bratonien_tools_nc_wizard_store($state);
+
+  if ($username === '' || $password === '')
+  {
+    throw new RuntimeException('Nextcloud-Benutzer und Passwort werden für den Scan benötigt.');
+  }
+
+  $base_url = '';
+  $status_data = null;
+  foreach (bratonien_tools_nc_wizard_candidate_urls($host_input) as $candidate_url)
+  {
+    try
+    {
+      $response = bratonien_tools_nc_transport_http($candidate_url.'/status.php');
+      if ($response['status'] < 200 || $response['status'] >= 300) continue;
+      $candidate_status = json_decode($response['body'], true);
+      if (!is_array($candidate_status) || empty($candidate_status['installed'])) continue;
+      $base_url = $candidate_url;
+      $status_data = $candidate_status;
+      break;
+    }
+    catch (Throwable $ignored) {}
+  }
+
+  if ($base_url === '' || !is_array($status_data))
+  {
+    throw new RuntimeException('Unter dieser Adresse konnte keine Nextcloud erreicht werden. HTTP und HTTPS wurden automatisch geprüft.');
+  }
+
+  $user_response = bratonien_tools_nc_transport_http(
+    $base_url.'/ocs/v2.php/cloud/user?format=json',
+    $username,
+    $password,
+    array('OCS-APIRequest: true')
+  );
+  if ($user_response['status'] === 401 || $user_response['status'] === 403)
+  {
+    throw new RuntimeException('Nextcloud hat Benutzername oder Passwort abgelehnt.');
+  }
+  if ($user_response['status'] < 200 || $user_response['status'] >= 300)
+  {
+    throw new RuntimeException('Nextcloud ist erreichbar, aber die Anmeldung konnte nicht geprüft werden.');
+  }
+
+  $user_data = bratonien_tools_nc_wizard_ocs_data($user_response['body']);
+  $resolved_username = trim((string)($user_data['id'] ?? $username));
+  if ($resolved_username === '') $resolved_username = $username;
+  $url_host = (string)parse_url($base_url, PHP_URL_HOST);
+
+  $state = array_merge($state, array(
+    'step'=>2,
+    'scan_ok'=>true,
+    'base_url'=>$base_url,
+    'host_input'=>$host_input,
+    'username'=>$resolved_username,
+    'display_name'=>(string)($user_data['display-name'] ?? $user_data['displayname'] ?? ''),
+    'version'=>(string)($status_data['versionstring'] ?? $status_data['version'] ?? ''),
+    'product'=>(string)($status_data['productname'] ?? 'Nextcloud'),
+    'users'=>array(),
+    'can_list_users'=>false,
+    'showcase_user'=>$resolved_username,
+    'connection_name'=>$url_host !== '' ? $url_host : 'Nextcloud WebDAV',
+    'scan_message'=>'Nextcloud und WebDAV-Zugriff wurden bestätigt.',
+    '_password'=>$password,
+    'source_mode'=>'webdav-placeholder',
+    'transport'=>'webdav',
+    'gallery_root'=>rtrim(PHPWG_ROOT_PATH, '/').'/galleries',
+    'storages'=>array(),
+    'storage_candidates'=>array(),
+    'roots'=>array(),
+    'technical_stage'=>'mounts',
+    'technical_source'=>'WebDAV',
+    'technical_error'=>'',
+    'technical_complete'=>false,
+    'directory_selection_ready'=>true,
+    'directory_path'=>'',
+    'directory_parent'=>'',
+    'directory_children'=>array(),
+    'directory_current_fileid'=>0,
+    'directory_fileids'=>array(),
+    'directory_selected'=>array(),
+    'directory_selected_fileids'=>array(),
+    'database_prompted'=>false,
+    'mount_prompted'=>false,
+    'api_status'=>'pending',
+    'api_username'=>'',
+    'api_error'=>'',
+  ));
+
+  bratonien_tools_nc_transport_refresh_directory_state($state, '');
+  bratonien_tools_nc_wizard_store($state);
+
+  return array('message'=>'Nextcloud und WebDAV wurden bestätigt. Jetzt können die Verzeichnisse des angemeldeten Benutzers ausgewählt werden.');
+}
+
+function bratonien_tools_nc_wizard_save_sources_dispatch()
+{
+  $state = bratonien_tools_nc_wizard_state();
+  if ((string)($state['source_mode'] ?? '') !== 'webdav-placeholder')
+  {
+    return bratonien_tools_nc_wizard_save_mounts_server_side();
+  }
+
+  if ((int)($state['step'] ?? 0) !== 2 || empty($state['directory_selection_ready']))
+  {
+    throw new RuntimeException('Die Verzeichnisauswahl ist in diesem Fenster nicht verfügbar.');
+  }
+
+  $selected = isset($state['directory_selected']) && is_array($state['directory_selected'])
+    ? array_values(array_unique(array_map(function($path) { return trim((string)$path, '/'); }, $state['directory_selected'])))
+    : array();
+  if (!$selected)
+  {
+    throw new RuntimeException('Bitte mindestens ein Nextcloud-Verzeichnis auswählen.');
+  }
+
+  $selected_ids = isset($state['directory_selected_fileids']) && is_array($state['directory_selected_fileids'])
+    ? $state['directory_selected_fileids']
+    : array();
+  $roots = array();
+  foreach ($selected as $path)
+  {
+    $fileid = (int)($selected_ids[$path] ?? 0);
+    if ($fileid < 1)
+    {
+      throw new RuntimeException('Für eine Auswahl fehlt die eindeutige Nextcloud-Datei-ID. Bitte das Verzeichnis erneut auswählen.');
+    }
+    $display_name = $path === ''
+      ? (trim((string)($state['display_name'] ?? '')) !== '' ? trim((string)$state['display_name']) : (string)$state['username'])
+      : basename($path);
+    $roots[] = array(
+      'fileid'=>$fileid,
+      'display_name'=>$display_name,
+      'webdav_path'=>$path,
+    );
+  }
+
+  $state['roots'] = $roots;
+  $state['technical_complete'] = true;
+  $state['technical_stage'] = 'ready';
+  $state['technical_source'] = 'WebDAV-Verzeichnisse ausgewählt';
+  $state['technical_error'] = '';
+  $state['directory_selection_ready'] = false;
+
+  if ((string)($state['editing_mode'] ?? '') === 'migrate')
+  {
+    $editing_id = (int)($state['editing_connection_id'] ?? 0);
+    $connection = $editing_id > 0 ? bratonien_tools_nc_connector_connection($editing_id, true) : null;
+    if (!$connection || (string)$connection['adapter'] !== 'local')
+    {
+      throw new RuntimeException('Die zu migrierende Legacy-Verbindung ist nicht mehr verfügbar.');
+    }
+
+    $migration = bratonien_tools_nc_connector_migration_state($connection);
+    if (empty($migration['ready']))
+    {
+      throw new RuntimeException('Die WebDAV-Migration kann noch nicht abgeschlossen werden. Es fehlen: '.implode(', ', $migration['missing']).'.');
+    }
+
+    $credentials = bratonien_tools_nc_connector_scoped_secret($connection);
+    $state['_api_key_id'] = (string)($credentials['api_key_id'] ?? '');
+    $state['_api_key_secret'] = (string)($credentials['api_key_secret'] ?? '');
+    $state['api_status'] = !empty($migration['api_available']) ? 'ok' : 'skipped';
+    $state['api_error'] = '';
+    $state['step'] = 4;
+    bratonien_tools_nc_wizard_store($state);
+
+    return array('message'=>'WebDAV-Quelle wurde übernommen. Mit „Migration starten“ wird jetzt der WebDAV-Nachfolger angelegt; die Legacy-Verbindung bleibt als Fallback erhalten.');
+  }
+
+  bratonien_tools_nc_wizard_store($state);
+  return array('message'=>'WebDAV-Verzeichnisse wurden übernommen. Die Verbindung ist für den nächsten Einrichtungsschritt vorbereitet.');
+}
+
+function bratonien_tools_nc_wizard_finish_dispatch()
+{
+  $state = bratonien_tools_nc_wizard_state();
+  if ((string)($state['source_mode'] ?? '') !== 'webdav-placeholder')
+  {
+    return bratonien_tools_nc_wizard_finish_generic_scope();
+  }
+
+  if ((int)($state['step'] ?? 0) !== 4 || empty($state['technical_complete']))
+  {
+    throw new RuntimeException('Der Assistent ist noch nicht vollständig.');
+  }
+
+  if (array_key_exists('nc_wizard_fallback_user', $_POST)) $state['_fallback_user'] = trim((string)$_POST['nc_wizard_fallback_user']);
+  if (array_key_exists('nc_wizard_fallback_password', $_POST)) $state['_fallback_password'] = (string)$_POST['nc_wizard_fallback_password'];
+  bratonien_tools_nc_wizard_store($state);
+
+  $fallback_user = trim((string)($state['_fallback_user'] ?? ''));
+  $fallback_password = (string)($state['_fallback_password'] ?? '');
+  if (($fallback_user === '') !== ($fallback_password === ''))
+  {
+    throw new RuntimeException('Fallback-Benutzer und Fallback-Passwort müssen entweder beide angegeben oder beide leer gelassen werden.');
+  }
+  if (($state['api_status'] ?? '') !== 'ok' && $fallback_user === '')
+  {
+    throw new RuntimeException('Da die Piwigo-API übersprungen wurde, ist für diese Verbindung ein Fallback-Zugang erforderlich.');
+  }
+
+  if ($fallback_user !== '')
+  {
+    try
+    {
+      bratonien_tools_nc_connector_validate_fallback_credentials($fallback_user, $fallback_password);
+    }
+    catch (Throwable $e)
+    {
+      throw new RuntimeException('Der Piwigo-Fallback wurde nicht gespeichert: '.$e->getMessage());
+    }
+  }
+
+  $result = bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard();
+  unset($_SESSION['bratonien_nc_wizard']);
+  return $result;
+}

include/nc_legacy_reset.inc.php

@@ -0,0 +1,115 @@
+<?php
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die('Hacking attempt!');
+}
+
+function bratonien_tools_nc_legacy_remove_tree($path, $allowed_root)
+{
+  $path = rtrim(str_replace('\\', '/', (string)$path), '/');
+  $allowed_root = rtrim(str_replace('\\', '/', (string)$allowed_root), '/');
+  if ($path === '' || $allowed_root === '' || $path === $allowed_root || strpos($path, $allowed_root.'/') !== 0)
+  {
+    return 0;
+  }
+  if (!file_exists($path) && !is_link($path)) return 0;
+
+  if (is_link($path) || is_file($path))
+  {
+    return @unlink($path) ? 1 : 0;
+  }
+
+  $removed = 0;
+  $items = @scandir($path);
+  if (is_array($items))
+  {
+    foreach ($items as $item)
+    {
+      if ($item === '.' || $item === '..') continue;
+      $removed += bratonien_tools_nc_legacy_remove_tree($path.'/'.$item, $allowed_root);
+    }
+  }
+  if (@rmdir($path)) $removed++;
+  return $removed;
+}
+
+function bratonien_tools_nc_legacy_remove_state_files($state_root)
+{
+  $removed = 0;
+  foreach (glob(rtrim($state_root, '/').'/connection-*') ?: array() as $connection_dir)
+  {
+    if (!is_dir($connection_dir)) continue;
+    foreach (array('webdav-map.json', 'webdav-manifest.tsv', 'webdav-shadow-map.json') as $name)
+    {
+      $path = $connection_dir.'/'.$name;
+      if (is_file($path) && @unlink($path)) $removed++;
+    }
+  }
+  return $removed;
+}
+
+function bratonien_tools_nc_reset_legacy_imports()
+{
+  include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
+
+  $ids = array();
+  $result = pwg_query(
+    "SELECT id FROM ".IMAGES_TABLE.
+    " WHERE path LIKE '%nc-webdav-source/connection-%'"
+  );
+  while ($row = pwg_db_fetch_assoc($result))
+  {
+    $ids[] = (int)$row['id'];
+  }
+
+  if ($ids)
+  {
+    delete_elements($ids, false);
+  }
+
+  $data_root = rtrim(PHPWG_ROOT_PATH, '/').'/_data';
+  $tool_root = $data_root.'/bratonien-tools';
+  $removed_files = 0;
+  foreach (array(
+    $tool_root.'/nc-webdav-source',
+    $tool_root.'/nc-webdav-preview',
+    $tool_root.'/nc-webdav-gallery',
+  ) as $generated_root)
+  {
+    $removed_files += bratonien_tools_nc_legacy_remove_tree($generated_root, $data_root);
+  }
+
+  if (defined('PWG_DERIVATIVE_DIR'))
+  {
+    $derivative_root = rtrim(PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR, '/');
+    foreach (array(
+      $derivative_root.'/_data/bratonien-tools/nc-webdav-source',
+      $derivative_root.'/_data/bratonien-tools/nc-webdav-gallery',
+    ) as $generated_derivative_root)
+    {
+      $removed_files += bratonien_tools_nc_legacy_remove_tree($generated_derivative_root, $derivative_root);
+    }
+  }
+
+  $removed_state_files = bratonien_tools_nc_legacy_remove_state_files($tool_root.'/nc-connector-state');
+
+  if ($ids)
+  {
+    update_category('all');
+    invalidate_user_cache(true);
+  }
+
+  $result = array(
+    'timestamp'=>time(),
+    'removed_image_records'=>count($ids),
+    'removed_generated_entries'=>$removed_files,
+    'removed_state_files'=>$removed_state_files,
+  );
+
+  if (function_exists('conf_update_param'))
+  {
+    conf_update_param('bratonien_nc_legacy_reset_0977', json_encode($result));
+  }
+
+  return $result;
+}

include/nc_productive_ws.inc.php

@@ -18,7 +18,7 @@ function bratonien_tools_register_nc_productive_ws_methods($arr)
         'info' => 'Piwigo storage site to synchronize. Default: 1.',
       ),
     ),
-    'Runs the approved direct Bratonien filesystem synchronization for the NC Connector.',
+    'Synchronizes the NC Connector into the existing Piwigo album hierarchy.',
     null,
     array(
       'admin_only' => true,
@@ -35,6 +35,97 @@ function bratonien_tools_nc_productive_error(&$errors, $path, $type)
   );
 }
 
+function bratonien_tools_nc_relative_path($basedir, $path)
+{
+  $basedir = rtrim(str_replace('\\', '/', (string)$basedir), '/');
+  $path = str_replace('\\', '/', (string)$path);
+  if ($path === $basedir) return '';
+  if (strpos($path, $basedir.'/') !== 0)
+  {
+    throw new RuntimeException('WebDAV-Pfad liegt ausserhalb der Connector-Wurzel: '.$path);
+  }
+  return trim(substr($path, strlen($basedir)), '/');
+}
+
+function bratonien_tools_nc_find_album($parent_id, $dir, $name, $excluded_site_id)
+{
+  $where_parent = $parent_id === null ? 'id_uppercat IS NULL' : 'id_uppercat='.(int)$parent_id;
+  $dir_sql = pwg_db_real_escape_string((string)$dir);
+  $name_sql = pwg_db_real_escape_string((string)$name);
+  $query = '
+SELECT id, dir, name
+  FROM '.CATEGORIES_TABLE.'
+  WHERE '.$where_parent.'
+    AND (
+      dir = \''.$dir_sql.'\'
+      OR LOWER(name) = LOWER(\''.$name_sql.'\')
+    )
+  ORDER BY CASE WHEN dir = \''.$dir_sql.'\' THEN 0 ELSE 1 END, id
+  LIMIT 1
+;';
+  $result = pwg_query($query);
+  if (!pwg_db_num_rows($result)) return null;
+  $row = pwg_db_fetch_assoc($result);
+  return (int)$row['id'];
+}
+
+function bratonien_tools_nc_ensure_album_path($relative_dir, $excluded_site_id, array &$cache, array &$created_ids)
+{
+  $relative_dir = trim((string)$relative_dir, '/');
+  if ($relative_dir === '') return null;
+  if (isset($cache[$relative_dir])) return $cache[$relative_dir];
+
+  $parts = explode('/', $relative_dir);
+  $parent_id = null;
+  $path = '';
+  foreach ($parts as $part)
+  {
+    if ($part === '') continue;
+    $path = $path === '' ? $part : $path.'/'.$part;
+    if (isset($cache[$path]))
+    {
+      $parent_id = $cache[$path];
+      continue;
+    }
+
+    $display_name = str_replace('_', ' ', $part);
+    $album_id = bratonien_tools_nc_find_album($parent_id, $part, $display_name, $excluded_site_id);
+    if ($album_id === null)
+    {
+      $created = create_virtual_category($display_name, $parent_id);
+      if (!is_array($created) || empty($created['id']))
+      {
+        $detail = is_array($created) && !empty($created['error']) ? (string)$created['error'] : 'unbekannter Fehler';
+        throw new RuntimeException('Album "'.$display_name.'" konnte nicht angelegt werden: '.$detail);
+      }
+      $album_id = (int)$created['id'];
+      pwg_query('UPDATE '.CATEGORIES_TABLE." SET status='private' WHERE id=".$album_id.' LIMIT 1');
+      add_permission_on_category(array($album_id), get_admins());
+      $created_ids[] = $album_id;
+    }
+
+    $cache[$path] = $album_id;
+    $parent_id = $album_id;
+  }
+
+  return $parent_id;
+}
+
+function bratonien_tools_nc_managed_images($basedir)
+{
+  $prefix = rtrim((string)$basedir, '/').'/';
+  $escaped = pwg_db_real_escape_string(addcslashes($prefix, '_%\\'));
+  $query = "SELECT id, path FROM ".IMAGES_TABLE." WHERE path LIKE '".$escaped."%' ESCAPE '\\\\'";
+  return simple_hash_from_query($query, 'id', 'path');
+}
+
+function bratonien_tools_nc_remove_storage_categories($site_id)
+{
+  // Bestehende Piwigo-Alben gehoeren nicht automatisch dem Connector.
+  // Ohne eindeutige Connector-Eigentumsmarkierung darf hier nichts geloescht werden.
+  return 0;
+}
+
 function bratonien_tools_ws_nc_sync_productive($params, &$service)
 {
   global $conf, $user;
@@ -42,181 +133,94 @@ function bratonien_tools_ws_nc_sync_productive($params, &$service)
   $piwigo_version = defined('PHPWG_VERSION') ? (string)PHPWG_VERSION : '';
   if ($piwigo_version !== '16.4.0')
   {
-    return new PwgError(
-      409,
-      'Bratonien API synchronization is not approved for Piwigo '.$piwigo_version.'. Use the administrator fallback until this Piwigo version has been verified.'
-    );
+    return new PwgError(409, 'Bratonien API synchronization is not approved for Piwigo '.$piwigo_version.'.');
   }
-
   if (empty($conf['enable_synchronization']))
   {
     return new PwgError(403, 'Piwigo filesystem synchronization is disabled.');
   }
 
   $site_id = isset($params['site_id']) ? (int)$params['site_id'] : 1;
-  if ($site_id < 1)
-  {
-    return new PwgError(400, 'Invalid site_id.');
-  }
+  if ($site_id < 1) return new PwgError(400, 'Invalid site_id.');
 
   include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
   include_once(PHPWG_ROOT_PATH.'admin/site_reader_local.php');
 
-  $query = 'SELECT galleries_url FROM '.SITES_TABLE.' WHERE id = '.$site_id.' LIMIT 1';
-  $result = pwg_query($query);
-  if (!pwg_db_num_rows($result))
-  {
-    return new PwgError(404, 'Piwigo site does not exist.');
-  }
-
+  $result = pwg_query('SELECT galleries_url FROM '.SITES_TABLE.' WHERE id='.$site_id.' LIMIT 1');
+  if (!pwg_db_num_rows($result)) return new PwgError(404, 'Piwigo site does not exist.');
   list($site_url) = pwg_db_fetch_row($result);
-  if (url_is_remote($site_url))
-  {
-    return new PwgError(400, 'Remote Piwigo sites are not supported by this synchronization method.');
-  }
+  if (url_is_remote($site_url)) return new PwgError(400, 'Remote Piwigo sites are not supported.');
 
   $site_reader = new LocalSiteReader($site_url);
-  if (!$site_reader->open())
-  {
-    return new PwgError(500, 'Piwigo could not open the configured local site.');
-  }
+  if (!$site_reader->open()) return new PwgError(500, 'Piwigo could not open the configured local site.');
 
-  list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW()'));
+  $basedir = preg_replace('#/*$#', '', (string)$site_url);
   $errors = array();
   $counts = array(
-    'new_categories' => 0,
-    'del_categories' => 0,
-    'new_elements' => 0,
-    'del_elements' => 0,
-    'upd_elements' => 0,
-    'new_formats' => 0,
-    'del_formats' => 0,
-    'metadata_candidates' => 0,
-    'metadata_updated' => 0,
+    'reused_categories'=>0,
+    'new_categories'=>0,
+    'removed_duplicate_categories'=>0,
+    'new_elements'=>0,
+    'del_elements'=>0,
+    'upd_elements'=>0,
   );
 
   try
   {
-    $query = 'SELECT id, id_uppercat, uppercats, global_rank, status, visible FROM '.CATEGORIES_TABLE.' WHERE dir IS NOT NULL AND site_id = '.$site_id;
-    $db_categories = hash_from_query($query, 'id');
-    $db_fulldirs = get_fulldirs(array_keys($db_categories));
-    $basedir = preg_replace('#/*$#', '', $site_url);
-    $db_fulldirs = array_flip($db_fulldirs);
-    $fs_fulldirs = $site_reader->get_full_directories($basedir);
-
-    $next_rank = array('NULL'=>1);
-    $result = pwg_query('SELECT id FROM '.CATEGORIES_TABLE);
-    while ($row = pwg_db_fetch_assoc($result))
+    list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW()'));
+    $fs_dirs = $site_reader->get_full_directories($basedir);
+    usort($fs_dirs, function($a, $b)
     {
-      $next_rank[$row['id']] = 1;
-    }
-    $result = pwg_query('SELECT id_uppercat, MAX(`rank`)+1 AS next_rank FROM '.CATEGORIES_TABLE.' GROUP BY id_uppercat');
-    while ($row = pwg_db_fetch_assoc($result))
-    {
-      $key = empty($row['id_uppercat']) ? 'NULL' : $row['id_uppercat'];
-      $next_rank[$key] = (int)$row['next_rank'];
-    }
+      return substr_count((string)$a, '/') <=> substr_count((string)$b, '/');
+    });
 
-    $next_id = pwg_db_nextval('id', CATEGORIES_TABLE);
-    $category_inserts = array();
-
-    foreach (array_diff($fs_fulldirs, array_keys($db_fulldirs)) as $fulldir)
+    $album_cache = array();
+    $created_ids = array();
+    $dir_to_album = array();
+    foreach ($fs_dirs as $full_dir)
     {
-      $dir = basename($fulldir);
-      if (!preg_match($conf['sync_chars_regex'], $dir))
+      $relative = bratonien_tools_nc_relative_path($basedir, $full_dir);
+      if ($relative === '') continue;
+      $before = count($created_ids);
+      $album_id = bratonien_tools_nc_ensure_album_path($relative, $site_id, $album_cache, $created_ids);
+      if ($album_id !== null)
       {
-        bratonien_tools_nc_productive_error($errors, $fulldir, 'PWG-UPDATE-1');
-        continue;
+        $dir_to_album[$full_dir] = $album_id;
+        if (count($created_ids) === $before) $counts['reused_categories']++;
       }
-
-      $insert = array(
-        'id' => $next_id++,
-        'dir' => $dir,
-        'name' => str_replace('_', ' ', $dir),
-        'site_id' => $site_id,
-        'commentable' => boolean_to_string($conf['newcat_default_commentable']),
-        'status' => 'private',
-        'visible' => boolean_to_string($conf['newcat_default_visible']),
-      );
-
-      $parent_path = dirname($fulldir);
-      if (isset($db_fulldirs[$parent_path]))
-      {
-        $parent = $db_fulldirs[$parent_path];
-        $insert['id_uppercat'] = $parent;
-        $insert['uppercats'] = $db_categories[$parent]['uppercats'].','.$insert['id'];
-        $insert['rank'] = $next_rank[$parent]++;
-        $insert['global_rank'] = $db_categories[$parent]['global_rank'].'.'.$insert['rank'];
-        if ((string)$db_categories[$parent]['visible'] === 'false')
-        {
-          $insert['visible'] = 'false';
-        }
-      }
-      else
-      {
-        $insert['uppercats'] = (string)$insert['id'];
-        $insert['rank'] = $next_rank['NULL']++;
-        $insert['global_rank'] = (string)$insert['rank'];
-      }
-
-      $category_inserts[] = $insert;
-      $db_categories[$insert['id']] = array(
-        'id' => $insert['id'],
-        'id_uppercat' => $insert['id_uppercat'] ?? null,
-        'uppercats' => $insert['uppercats'],
-        'global_rank' => $insert['global_rank'],
-        'status' => 'private',
-        'visible' => $insert['visible'],
-      );
-      $db_fulldirs[$fulldir] = $insert['id'];
-      $next_rank[$insert['id']] = 1;
-    }
-
-    if ($category_inserts)
-    {
-      mass_inserts(
-        CATEGORIES_TABLE,
-        array('id','dir','name','site_id','id_uppercat','uppercats','commentable','visible','status','rank','global_rank'),
-        $category_inserts
-      );
-      $category_ids = array_map(function ($row) { return (int)$row['id']; }, $category_inserts);
-      pwg_activity('album', $category_ids, 'add', array('sync'=>true));
-      add_permission_on_category($category_ids, get_admins());
-      $counts['new_categories'] = count($category_ids);
-    }
-
-    $to_delete_categories = array();
-    foreach (array_diff(array_keys($db_fulldirs), $fs_fulldirs) as $fulldir)
-    {
-      $to_delete_categories[] = (int)$db_fulldirs[$fulldir];
-      unset($db_fulldirs[$fulldir]);
-    }
-    if ($to_delete_categories)
-    {
-      delete_categories($to_delete_categories);
-      $counts['del_categories'] = count($to_delete_categories);
     }
+    $counts['new_categories'] = count($created_ids);
 
     $fs = $site_reader->get_elements($basedir);
-    $cat_ids = array_diff(array_keys($db_categories), $to_delete_categories);
-    $db_elements = array();
-    if ($cat_ids)
-    {
-      $query = 'SELECT id, path FROM '.IMAGES_TABLE.' WHERE storage_category_id IN ('.implode(',', array_map('intval', $cat_ids)).')';
-      $db_elements = simple_hash_from_query($query, 'id', 'path');
-    }
+    $db_elements = bratonien_tools_nc_managed_images($basedir);
+    $db_by_path = array_flip($db_elements);
+
+    // Nicht-destruktiver Schutz: Bestehende Piwigo-Bilder werden niemals allein
+    // deshalb geloescht, weil sie im aktuellen WebDAV-Scan nicht vorkommen.
+    // Das Entfernen ist erst wieder zulaessig, wenn Connector-Eigentum eindeutig
+    // und verbindungsbezogen gespeichert wird.
 
     $next_element_id = pwg_db_nextval('id', IMAGES_TABLE);
     $image_inserts = array();
     $image_links = array();
-    $format_inserts = array();
-    $new_image_ids = array();
+    $new_ids = array();
+    $all_ids = array();
 
-    foreach (array_diff(array_keys($fs), $db_elements) as $path)
+    foreach ($fs as $path=>$file_info)
     {
       $dirname = dirname($path);
-      if (!isset($db_fulldirs[$dirname]))
+      $relative_dir = bratonien_tools_nc_relative_path($basedir, $dirname);
+      $category_id = null;
+      if ($relative_dir !== '')
       {
+        $category_id = $dir_to_album[$dirname] ?? bratonien_tools_nc_ensure_album_path($relative_dir, $site_id, $album_cache, $created_ids);
+      }
+
+      if (isset($db_by_path[$path]))
+      {
+        // Altbestand niemals umhaengen. Vorhandene Bild-Album-Zuordnungen bleiben
+        // exakt bestehen; der Connector darf nur neue Datensaetze ergaenzen.
+        $all_ids[] = (int)$db_by_path[$path];
         continue;
       }
 
@@ -229,116 +233,42 @@ function bratonien_tools_ws_nc_sync_productive($params, &$service)
 
       $id = $next_element_id++;
       $image_inserts[] = array(
-        'id' => $id,
-        'file' => $filename,
-        'name' => get_name_from_file($filename),
-        'date_available' => $dbnow,
-        'path' => $path,
-        'representative_ext' => $fs[$path]['representative_ext'],
-        'storage_category_id' => $db_fulldirs[$dirname],
-        'added_by' => (int)$user['id'],
+        'id'=>$id,
+        'file'=>$filename,
+        'name'=>get_name_from_file($filename),
+        'date_available'=>$dbnow,
+        'path'=>$path,
+        'representative_ext'=>$file_info['representative_ext'],
+        'storage_category_id'=>null,
+        'added_by'=>(int)$user['id'],
       );
-      $image_links[] = array('image_id'=>$id, 'category_id'=>$db_fulldirs[$dirname]);
-      $new_image_ids[] = $id;
-
-      if (!empty($conf['enable_formats']) && !empty($fs[$path]['formats']))
+      if ($category_id !== null)
       {
-        foreach ($fs[$path]['formats'] as $ext => $filesize)
-        {
-          $format_inserts[] = array('image_id'=>$id, 'ext'=>$ext, 'filesize'=>$filesize);
-        }
+        $image_links[] = array('image_id'=>$id, 'category_id'=>$category_id);
       }
+      $new_ids[] = $id;
+      $all_ids[] = $id;
     }
 
     if ($image_inserts)
     {
       mass_inserts(IMAGES_TABLE, array_keys($image_inserts[0]), $image_inserts);
-      mass_inserts(IMAGE_CATEGORY_TABLE, array_keys($image_links[0]), $image_links);
-      pwg_activity('photo', $new_image_ids, 'add', array('sync'=>true));
-      $counts['new_elements'] = count($image_inserts);
-    }
-    if ($format_inserts)
-    {
-      mass_inserts(IMAGE_FORMAT_TABLE, array_keys($format_inserts[0]), $format_inserts);
-      $counts['new_formats'] += count($format_inserts);
+      if ($image_links) mass_inserts(IMAGE_CATEGORY_TABLE, array_keys($image_links[0]), $image_links);
+      pwg_activity('photo', $new_ids, 'add', array('sync'=>true));
+      $counts['new_elements'] = count($new_ids);
     }
 
-    if (!empty($conf['enable_formats']) && $db_elements)
-    {
-      $db_elements_flip = array_flip($db_elements);
-      $existing_ids = array();
-      foreach (array_intersect_key($fs, $db_elements_flip) as $path => $unused)
-      {
-        $existing_ids[] = (int)$db_elements_flip[$path];
-      }
-
-      if ($existing_ids)
-      {
-        $db_formats = array();
-        $result = pwg_query('SELECT * FROM '.IMAGE_FORMAT_TABLE.' WHERE image_id IN ('.implode(',', $existing_ids).')');
-        while ($row = pwg_db_fetch_assoc($result))
-        {
-          $db_formats[$row['image_id']][$row['ext']] = $row['format_id'];
-        }
-
-        $formats_to_delete = array();
-        $formats_to_insert = array();
-        foreach ($existing_ids as $image_id)
-        {
-          $path = $db_elements[$image_id];
-          $known = $db_formats[$image_id] ?? array();
-          $present = $fs[$path]['formats'] ?? array();
-          foreach (array_diff_key($known, $present) as $format_id)
-          {
-            $formats_to_delete[] = (int)$format_id;
-          }
-          foreach (array_diff_key($present, $known) as $ext => $filesize)
-          {
-            $formats_to_insert[] = array('image_id'=>$image_id, 'ext'=>$ext, 'filesize'=>$filesize);
-          }
-        }
-
-        if ($formats_to_delete)
-        {
-          pwg_query('DELETE FROM '.IMAGE_FORMAT_TABLE.' WHERE format_id IN ('.implode(',', $formats_to_delete).')');
-          $counts['del_formats'] = count($formats_to_delete);
-        }
-        if ($formats_to_insert)
-        {
-          mass_inserts(IMAGE_FORMAT_TABLE, array_keys($formats_to_insert[0]), $formats_to_insert);
-          $counts['new_formats'] += count($formats_to_insert);
-        }
-      }
-    }
-
-    $to_delete_elements = array();
-    foreach (array_diff($db_elements, array_keys($fs)) as $path)
-    {
-      $id = array_search($path, $db_elements, true);
-      if ($id !== false)
-      {
-        $to_delete_elements[] = (int)$id;
-      }
-    }
-    if ($to_delete_elements)
-    {
-      delete_elements($to_delete_elements);
-      $counts['del_elements'] = count($to_delete_elements);
-    }
-
-    update_category('all');
-    update_global_rank();
-
-    $files = get_filelist('', $site_id, true, false);
+    // Bestehende Bilder werden nicht durch den Connector aktualisiert. Nur neu
+    // angelegte Connector-Bilder erhalten die aus der Quelle ermittelten Attribute.
     $updates = array();
-    foreach ($files as $id => $file)
+    foreach ($new_ids as $id)
     {
-      $data = $site_reader->get_element_update_attributes($file['path']);
-      if (!is_array($data))
-      {
-        continue;
-      }
-      $data['id'] = $id;
+      $path_result = pwg_query('SELECT path FROM '.IMAGES_TABLE.' WHERE id='.(int)$id.' LIMIT 1');
+      if (!pwg_db_num_rows($path_result)) continue;
+      list($path) = pwg_db_fetch_row($path_result);
+      $data = $site_reader->get_element_update_attributes($path);
+      if (!is_array($data)) continue;
+      $data['id'] = (int)$id;
       $updates[] = $data;
     }
     if ($updates)
@@ -351,94 +281,25 @@ function bratonien_tools_ws_nc_sync_productive($params, &$service)
     }
     $counts['upd_elements'] = count($updates);
 
-    $metadata_files = get_filelist('', $site_id, true, true);
-    $counts['metadata_candidates'] = count($metadata_files);
-    $metadata_updates = array();
-    $tags_of = array();
-
-    foreach ($metadata_files as $id => $element_infos)
-    {
-      $data = $site_reader->get_element_metadata($element_infos);
-      if (!is_array($data))
-      {
-        bratonien_tools_nc_productive_error($errors, $element_infos['path'], 'PWG-ERROR-NO-FS');
-        continue;
-      }
-
-      $data['date_metadata_update'] = $dbnow;
-      $data['id'] = $id;
-      $metadata_updates[] = $data;
-
-      foreach (array('keywords','tags') as $key)
-      {
-        if (!isset($data[$key]))
-        {
-          continue;
-        }
-        $tags_of[$id] = $tags_of[$id] ?? array();
-        foreach (explode(',', $data[$key]) as $tag_name)
-        {
-          $tags_of[$id][] = tag_id_from_tag_name($tag_name);
-        }
-      }
-    }
-
-    if ($metadata_updates)
-    {
-      mass_updates(
-        IMAGES_TABLE,
-        array(
-          'primary'=>array('id'),
-          'update'=>array_unique(array_merge(
-            array_diff($site_reader->get_metadata_attributes(), array('keywords','tags')),
-            array('date_metadata_update')
-          )),
-        ),
-        $metadata_updates,
-        MASS_UPDATES_SKIP_EMPTY
-      );
-    }
-    if ($tags_of)
-    {
-      set_tags_of($tags_of);
-    }
-    $counts['metadata_updated'] = count($metadata_updates);
-
-    // Mirror Piwigo 16.4.0 Maintenance -> "Update albums informations".
-    // This repairs the derived album hierarchy and counters that the direct
-    // API sync otherwise bypasses when no admin maintenance page is invoked.
     images_integrity();
     categories_integrity();
     update_uppercats();
     update_category('all');
     update_global_rank();
-    invalidate_user_cache(true);
-
-    // Mirror Piwigo 16.4.0 Maintenance -> "Update photos information".
-    // This finalizes physical paths, ratings and derived photo information.
-    images_integrity();
-    update_path();
-    include_once(PHPWG_ROOT_PATH.'include/functions_rate.inc.php');
-    update_rating_score();
     invalidate_user_cache();
-  }
-  catch (Throwable $e)
-  {
-    return new PwgError(500, 'Bratonien direct synchronization failed: '.$e->getMessage());
-  }
 
-  return array(
-    'mode' => 'productive',
-    'engine' => 'bratonien-direct',
-    'approved_piwigo_version' => '16.4.0',
-    'piwigo_version' => $piwigo_version,
-    'site_id' => $site_id,
-    'site_url' => $site_url,
-    'counts' => $counts,
-    'errors' => $errors,
-    'error_count' => count($errors),
-    'database_writes' => true,
-    'username' => isset($user['username']) ? (string)$user['username'] : '',
-    'status' => isset($user['status']) ? (string)$user['status'] : '',
-  );
+    return array(
+      'mode'=>'productive',
+      'piwigo_version'=>$piwigo_version,
+      'site_id'=>$site_id,
+      'site_url'=>$site_url,
+      'counts'=>$counts,
+      'errors'=>$errors,
+      'database_writes'=>array_sum($counts) > 0,
+    );
+  }
+  catch (Throwable $error)
+  {
+    return new PwgError(500, 'Bratonien NC synchronization failed: '.$error->getMessage());
+  }
 }

include/nc_transport.inc.php

@@ -0,0 +1,340 @@
+<?php
+
+function bratonien_tools_nc_transport_host($url)
+{
+  $host = trim((string)parse_url((string)$url, PHP_URL_HOST));
+  if ($host === '') throw new RuntimeException('Die Nextcloud-Adresse enthält keinen gültigen Hostnamen oder keine IP-Adresse.');
+  return trim($host, '[]');
+}
+
+function bratonien_tools_nc_transport_scheme($url)
+{
+  $scheme = strtolower(trim((string)parse_url((string)$url, PHP_URL_SCHEME)));
+  if (!in_array($scheme, array('http','https'), true)) throw new RuntimeException('Nextcloud muss per HTTP oder HTTPS angesprochen werden.');
+  return $scheme;
+}
+
+function bratonien_tools_nc_transport_is_ip($host)
+{
+  return filter_var(trim((string)$host, '[]'), FILTER_VALIDATE_IP) !== false;
+}
+
+function bratonien_tools_nc_transport_public_ip($host)
+{
+  static $cache = array();
+
+  $host = strtolower(trim((string)$host, '[]'));
+  if ($host === '') throw new RuntimeException('Für die Nextcloud-Verbindung fehlt der Hostname.');
+  if (bratonien_tools_nc_transport_is_ip($host)) return $host;
+  if (isset($cache[$host])) return $cache[$host];
+  if (!function_exists('curl_init')) throw new RuntimeException('Der öffentliche DNS-Abgleich benötigt PHP-cURL.');
+
+  $providers = array(
+    array('host'=>'dns.google', 'ips'=>array('8.8.8.8','8.8.4.4'), 'url'=>'https://dns.google/resolve?name='.rawurlencode($host).'&type=A'),
+    array('host'=>'cloudflare-dns.com', 'ips'=>array('1.1.1.1','1.0.0.1'), 'url'=>'https://cloudflare-dns.com/dns-query?name='.rawurlencode($host).'&type=A'),
+  );
+
+  foreach ($providers as $provider)
+  {
+    foreach ($provider['ips'] as $resolver_ip)
+    {
+      $ch = curl_init($provider['url']);
+      $options = array(
+        CURLOPT_RETURNTRANSFER=>true,
+        CURLOPT_FOLLOWLOCATION=>false,
+        CURLOPT_CONNECTTIMEOUT=>5,
+        CURLOPT_TIMEOUT=>10,
+        CURLOPT_HTTPHEADER=>array('Accept: application/dns-json'),
+        CURLOPT_USERAGENT=>'Bratonien-Tools-DNS/0.9.7.1',
+      );
+      if (defined('CURLOPT_RESOLVE'))
+      {
+        $options[CURLOPT_RESOLVE] = array($provider['host'].':443:'.$resolver_ip);
+      }
+      curl_setopt_array($ch, $options);
+      $body = curl_exec($ch);
+      $errno = curl_errno($ch);
+      $status = (int)curl_getinfo($ch, CURLINFO_HTTP_CODE);
+      curl_close($ch);
+      if ($body === false || $errno !== 0 || $status < 200 || $status >= 300) continue;
+
+      $decoded = json_decode((string)$body, true);
+      if (!is_array($decoded) || !isset($decoded['Answer']) || !is_array($decoded['Answer'])) continue;
+      foreach ($decoded['Answer'] as $answer)
+      {
+        if ((int)($answer['type'] ?? 0) !== 1) continue;
+        $ip = trim((string)($answer['data'] ?? ''));
+        if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) === false) continue;
+        return $cache[$host] = $ip;
+      }
+    }
+  }
+
+  throw new RuntimeException('Für '.$host.' konnte keine öffentliche IPv4-Adresse ermittelt werden.');
+}
+
+function bratonien_tools_nc_transport_resolve_entry($url)
+{
+  $scheme = bratonien_tools_nc_transport_scheme($url);
+  $host = bratonien_tools_nc_transport_host($url);
+  if (bratonien_tools_nc_transport_is_ip($host)) return null;
+
+  $port = (int)parse_url((string)$url, PHP_URL_PORT);
+  if ($port < 1) $port = $scheme === 'https' ? 443 : 80;
+  $ip = bratonien_tools_nc_transport_public_ip($host);
+  return $host.':'.$port.':'.$ip;
+}
+
+function bratonien_tools_nc_transport_apply_curl(array &$options, $url)
+{
+  $entry = bratonien_tools_nc_transport_resolve_entry($url);
+  if ($entry !== null)
+  {
+    if (!defined('CURLOPT_RESOLVE')) throw new RuntimeException('Diese cURL-Version unterstützt keine direkte Host-zu-IP-Zuordnung.');
+    $options[CURLOPT_RESOLVE] = array($entry);
+  }
+}
+
+function bratonien_tools_nc_transport_http($url, $username = '', $password = '', array $headers = array())
+{
+  if (!function_exists('curl_init')) throw new RuntimeException('Der Server kann Nextcloud derzeit nicht per HTTP prüfen.');
+
+  $ch = curl_init($url);
+  $options = array(
+    CURLOPT_RETURNTRANSFER=>true,
+    CURLOPT_FOLLOWLOCATION=>true,
+    CURLOPT_MAXREDIRS=>3,
+    CURLOPT_CONNECTTIMEOUT=>8,
+    CURLOPT_TIMEOUT=>15,
+    CURLOPT_HTTPHEADER=>array_merge(array('Accept: application/json'), $headers),
+    CURLOPT_USERAGENT=>'Bratonien-Tools-NC-Wizard/0.9.7.1',
+  );
+  bratonien_tools_nc_transport_apply_curl($options, $url);
+
+  if ($username !== '')
+  {
+    $options[CURLOPT_HTTPAUTH] = CURLAUTH_BASIC;
+    $options[CURLOPT_USERPWD] = $username.':'.$password;
+  }
+
+  curl_setopt_array($ch, $options);
+  $body = curl_exec($ch);
+  $errno = curl_errno($ch);
+  $error = curl_error($ch);
+  $status = (int)curl_getinfo($ch, CURLINFO_HTTP_CODE);
+  curl_close($ch);
+
+  if ($body === false || $errno !== 0)
+  {
+    throw new RuntimeException('Verbindung fehlgeschlagen'.($error !== '' ? ': '.$error : '.'));
+  }
+
+  return array('status'=>$status, 'body'=>(string)$body);
+}
+
+function bratonien_tools_nc_transport_webdav_list(array $state, $path = '')
+{
+  if (empty($state['scan_ok']) || trim((string)$state['base_url']) === '' || trim((string)$state['username']) === '' || (string)$state['_password'] === '')
+  {
+    throw new RuntimeException('Die Nextcloud-Sitzung des Assistenten ist nicht vollständig.');
+  }
+  if (!function_exists('curl_init')) throw new RuntimeException('cURL ist für die Verzeichnisauswahl nicht verfügbar.');
+
+  $path = trim((string)$path, '/');
+  if ($path !== '' && preg_match('#(^|/)\.\.(/|$)#', $path)) throw new RuntimeException('Ungültiger Verzeichnispfad.');
+
+  $segments = $path === '' ? array() : array_map('rawurlencode', explode('/', $path));
+  $user = rawurlencode((string)$state['username']);
+  $url = rtrim((string)$state['base_url'], '/').'/remote.php/dav/files/'.$user.'/'.implode('/', $segments);
+  if (substr($url, -1) !== '/') $url .= '/';
+
+  $body = '<?xml version="1.0"?><d:propfind xmlns:d="DAV:" xmlns:oc="http://owncloud.org/ns"><d:prop><d:resourcetype/><d:displayname/><oc:fileid/></d:prop></d:propfind>';
+  $ch = curl_init($url);
+  $options = array(
+    CURLOPT_RETURNTRANSFER=>true,
+    CURLOPT_CUSTOMREQUEST=>'PROPFIND',
+    CURLOPT_POSTFIELDS=>$body,
+    CURLOPT_HTTPHEADER=>array('Depth: 1','Content-Type: application/xml; charset=utf-8'),
+    CURLOPT_HTTPAUTH=>CURLAUTH_BASIC,
+    CURLOPT_USERPWD=>(string)$state['username'].':'.(string)$state['_password'],
+    CURLOPT_CONNECTTIMEOUT=>8,
+    CURLOPT_TIMEOUT=>20,
+  );
+  bratonien_tools_nc_transport_apply_curl($options, $url);
+  curl_setopt_array($ch, $options);
+  $response = curl_exec($ch);
+  $errno = curl_errno($ch);
+  $error = curl_error($ch);
+  $status = (int)curl_getinfo($ch, CURLINFO_HTTP_CODE);
+  curl_close($ch);
+
+  if ($response === false || $errno !== 0) throw new RuntimeException('Nextcloud-Verzeichnisse konnten nicht geladen werden'.($error !== '' ? ': '.$error : '.'));
+  if ($status === 401 || $status === 403) throw new RuntimeException('Nextcloud hat den Zugriff auf dieses Verzeichnis abgelehnt.');
+  if ($status !== 207) throw new RuntimeException('Nextcloud-Verzeichnisabfrage antwortete mit HTTP '.$status.'.');
+
+  libxml_use_internal_errors(true);
+  $xml = simplexml_load_string((string)$response);
+  if ($xml === false) throw new RuntimeException('Nextcloud hat eine ungültige WebDAV-Antwort geliefert.');
+  $xml->registerXPathNamespace('d', 'DAV:');
+  $xml->registerXPathNamespace('oc', 'http://owncloud.org/ns');
+
+  $children = array();
+  $fileids = array();
+  $current_fileid = 0;
+  $base_path = (string)parse_url($url, PHP_URL_PATH);
+
+  foreach ($xml->xpath('//d:response') as $item)
+  {
+    $item->registerXPathNamespace('d', 'DAV:');
+    $item->registerXPathNamespace('oc', 'http://owncloud.org/ns');
+    $hrefs = $item->xpath('d:href');
+    $collections = $item->xpath('d:propstat/d:prop/d:resourcetype/d:collection');
+    $ids = $item->xpath('d:propstat/d:prop/oc:fileid');
+    if (!$hrefs || !$collections || !$ids) continue;
+
+    $fileid = (int)trim((string)$ids[0]);
+    if ($fileid < 1) continue;
+    $href = rawurldecode((string)$hrefs[0]);
+    $href_path = (string)parse_url($href, PHP_URL_PATH);
+
+    if (rtrim($href_path, '/') === rtrim($base_path, '/'))
+    {
+      $current_fileid = $fileid;
+      continue;
+    }
+
+    $name = basename(rtrim($href_path, '/'));
+    if ($name === '') continue;
+    $child_path = $path === '' ? $name : $path.'/'.$name;
+    $children[$child_path] = $name;
+    $fileids[$child_path] = $fileid;
+  }
+  natcasesort($children);
+
+  if ($current_fileid < 1) throw new RuntimeException('Nextcloud hat für das aktuelle Verzeichnis keine eindeutige Datei-ID geliefert.');
+
+  $parent = '';
+  if ($path !== '')
+  {
+    $parts = explode('/', $path);
+    array_pop($parts);
+    $parent = implode('/', $parts);
+  }
+
+  return array(
+    'current'=>$path,
+    'parent'=>$parent,
+    'children'=>$children,
+    'current_fileid'=>$current_fileid,
+    'fileids'=>$fileids,
+  );
+}
+
+function bratonien_tools_nc_transport_refresh_directory_state(array &$state, $path = null)
+{
+  if ($path === null) $path = (string)($state['directory_path'] ?? '');
+  $listing = bratonien_tools_nc_transport_webdav_list($state, $path);
+  $state['directory_path'] = (string)$listing['current'];
+  $state['directory_parent'] = (string)$listing['parent'];
+  $state['directory_children'] = (array)$listing['children'];
+  $state['directory_current_fileid'] = (int)$listing['current_fileid'];
+  $state['directory_fileids'] = (array)$listing['fileids'];
+  if (!isset($state['directory_selected']) || !is_array($state['directory_selected'])) $state['directory_selected'] = array();
+  if (!isset($state['directory_selected_fileids']) || !is_array($state['directory_selected_fileids'])) $state['directory_selected_fileids'] = array();
+}
+
+function bratonien_tools_nc_transport_wizard_directory_browse()
+{
+  $state = bratonien_tools_nc_wizard_state();
+  if ((int)$state['step'] !== 2 || (string)$state['technical_stage'] !== 'mounts' || empty($state['directory_selection_ready'])) throw new RuntimeException('Die Verzeichnisauswahl ist in diesem Fenster nicht verfügbar.');
+  $path = trim((string)($_POST['nc_wizard_directory_path'] ?? ''), '/');
+  bratonien_tools_nc_transport_refresh_directory_state($state, $path);
+  bratonien_tools_nc_wizard_store($state);
+  return array('message'=>'Verzeichnis geöffnet.');
+}
+
+function bratonien_tools_nc_transport_edit_start()
+{
+  $id = (int)($_POST['connection_id'] ?? 0);
+  $connection = bratonien_tools_nc_connector_connection($id, true);
+  if (!$connection) throw new RuntimeException('Connector-Verbindung wurde nicht gefunden.');
+
+  $config = isset($connection['config']) && is_array($connection['config']) ? $connection['config'] : array();
+  $is_webdav = (string)$connection['adapter'] === 'remote'
+    && (string)($config['source_mode'] ?? '') === 'webdav-placeholder';
+  if (!$is_webdav) return bratonien_tools_nc_connector_edit_start();
+
+  $credentials = bratonien_tools_nc_connector_scoped_secret($connection);
+  $base_url = trim((string)($config['nextcloud_url'] ?? ''));
+  $username = trim((string)($credentials['nextcloud_user'] ?? ''));
+  if ($username === '') $username = trim((string)($config['nextcloud_access_user'] ?? $config['access_user'] ?? ''));
+  $password = (string)($credentials['nextcloud_password'] ?? '');
+
+  $roots = isset($config['roots']) && is_array($config['roots']) ? array_values($config['roots']) : array();
+  $selected = array();
+  $selected_ids = array();
+  foreach ($roots as $root)
+  {
+    $path = trim((string)($root['webdav_path'] ?? ''), '/');
+    $fileid = (int)($root['fileid'] ?? 0);
+    if ($fileid < 1) continue;
+    $selected[] = $path;
+    $selected_ids[$path] = $fileid;
+  }
+
+  $state = bratonien_tools_nc_wizard_state();
+  $state = array_merge($state, array(
+    'editing_connection_id'=>$id,
+    'editing_adapter'=>(string)$connection['adapter'],
+    'editing_mode'=>'update',
+    'connection_name'=>(string)$connection['name'],
+    'host_input'=>$base_url,
+    'base_url'=>$base_url,
+    'username'=>$username,
+    '_password'=>$password,
+    '_fallback_user'=>(string)($credentials['piwigo_user'] ?? ''),
+    '_fallback_password'=>(string)($credentials['piwigo_password'] ?? ''),
+    '_api_key_id'=>(string)($credentials['api_key_id'] ?? ''),
+    '_api_key_secret'=>(string)($credentials['api_key_secret'] ?? ''),
+    'api_status'=>trim((string)($credentials['api_key_id'] ?? '')) !== '' && trim((string)($credentials['api_key_secret'] ?? '')) !== '' ? 'ok' : 'pending',
+    'roots'=>$roots,
+    'directory_selected'=>$selected,
+    'directory_selected_fileids'=>$selected_ids,
+    'source_mode'=>'webdav-placeholder',
+    'transport'=>'webdav',
+  ));
+
+  if ($base_url !== '' && $username !== '' && $password !== '')
+  {
+    $state['step'] = 2;
+    $state['scan_ok'] = true;
+    $state['technical_stage'] = 'mounts';
+    $state['technical_source'] = 'WebDAV';
+    $state['technical_error'] = '';
+    $state['technical_complete'] = false;
+    $state['directory_selection_ready'] = true;
+    $state['directory_path'] = '';
+    $state['directory_parent'] = '';
+    $state['directory_children'] = array();
+    $state['directory_current_fileid'] = 0;
+
+    try
+    {
+      bratonien_tools_nc_transport_refresh_directory_state($state, '');
+    }
+    catch (Throwable $e)
+    {
+      $state['step'] = 1;
+      $state['scan_ok'] = false;
+      $state['technical_error'] = $e->getMessage();
+    }
+  }
+  else
+  {
+    $state['step'] = 1;
+    $state['scan_ok'] = false;
+  }
+
+  bratonien_tools_nc_wizard_store($state);
+  return array('message'=>'Verbindung #'.$id.' wurde zum Bearbeiten geöffnet.');
+}

include/tool_registry.inc.php

@@ -4,6 +4,17 @@ if (!defined('PHPWG_ROOT_PATH'))
   die('Hacking attempt!');
 }
 
+if (isset($GLOBALS['template']) && is_object($GLOBALS['template']) && method_exists($GLOBALS['template'], 'func_combine_script'))
+{
+  $script_version = function_exists('bratonien_tools_current_version') ? bratonien_tools_current_version() : '0.9.7.1';
+  $GLOBALS['template']->func_combine_script(array(
+    'id'=>'bratonien_nc_connector_edit_v2',
+    'path'=>BRATONIEN_TOOLS_PATH.'js/nc_connector_edit_v2.js',
+    'load'=>'footer',
+    'version'=>$script_version,
+  ));
+}
+
 require_once(BRATONIEN_TOOLS_PATH . 'tools/image_cache.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'tools/watermark.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'tools/watermark_profiles.inc.php');
@@ -17,7 +28,6 @@ require_once(BRATONIEN_TOOLS_PATH . 'include/album_shares.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/album_lock.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_manage.inc.php');
-require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_takeover.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_auth.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_create_api.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_piwigo_api.inc.php');
@@ -27,6 +37,28 @@ require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_wizard_user_scope.inc.
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_wizard_flow.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_connection_scope.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_generic_scope.inc.php');
+require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_delete_safe.inc.php');
+require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_webdav.inc.php');
+require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_wizard_webdav_flow.inc.php');
+require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_edit.inc.php');
+require_once(BRATONIEN_TOOLS_PATH . 'include/nc_transport.inc.php');
+require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_scheduler.inc.php');
+require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_system.inc.php');
+
+function bratonien_tools_nc_connector_run_now()
+{
+  $connection_id = isset($_POST['connection_id']) ? max(0, (int)$_POST['connection_id']) : 0;
+  if ($connection_id > 0)
+  {
+    $connection = bratonien_tools_nc_connector_connection($connection_id, false);
+    if (!$connection)
+    {
+      throw new RuntimeException('Die ausgewählte Verbindung existiert nicht.');
+    }
+  }
+  $result = bratonien_tools_nc_scheduler_spawn(true, $connection_id);
+  return array('message'=>(string)($result['message'] ?? ($connection_id > 0 ? 'Abgleich wurde gestartet.' : 'Abgleich für alle Verbindungen wurde gestartet.')));
+}
 
 function bratonien_tools_get_tools()
 {
@@ -51,26 +83,26 @@ function bratonien_tools_get_tools()
     'album_share_create' => array('handler' => 'bratonien_tools_create_album_share'),
     'album_share_regenerate_link' => array('handler' => 'bratonien_tools_regenerate_album_share_link'),
     'album_share_revoke' => array('handler' => 'bratonien_tools_revoke_album_share'),
-    'nc_connector_create_local' => array('handler' => 'bratonien_tools_nc_connector_create_local_api_first'),
-    'nc_connector_delete' => array('handler' => 'bratonien_tools_nc_connector_delete_any'),
+    'nc_connector_create_webdav_parallel' => array('handler' => 'bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard'),
+    'nc_connector_edit_start' => array('handler' => 'bratonien_tools_nc_transport_edit_start'),
+    'nc_connector_update_local' => array('handler' => 'bratonien_tools_nc_connector_update_local_friendly'),
+    'nc_connector_delete' => array('handler' => 'bratonien_tools_nc_connector_delete_safe'),
     'nc_connector_update_name' => array('handler' => 'bratonien_tools_nc_connector_update_name'),
     'nc_connector_update_technical' => array('handler' => 'bratonien_tools_nc_connector_update_technical'),
-    'nc_connector_wizard_scan' => array('handler' => 'bratonien_tools_nc_wizard_scan_user_scoped'),
+    'nc_connector_run_now' => array('handler' => 'bratonien_tools_nc_connector_run_now'),
+    'nc_connector_wizard_scan' => array('handler' => 'bratonien_tools_nc_wizard_scan_webdav_first'),
     'nc_connector_wizard_save_technical' => array('handler' => 'bratonien_tools_nc_wizard_save_technical_flow'),
-    'nc_connector_wizard_directory_browse' => array('handler' => 'bratonien_tools_nc_wizard_directory_browse'),
+    'nc_connector_wizard_directory_browse' => array('handler' => 'bratonien_tools_nc_transport_wizard_directory_browse'),
     'nc_connector_wizard_directory_add' => array('handler' => 'bratonien_tools_nc_wizard_directory_add'),
     'nc_connector_wizard_directory_remove' => array('handler' => 'bratonien_tools_nc_wizard_directory_remove'),
-    'nc_connector_wizard_save_mounts' => array('handler' => 'bratonien_tools_nc_wizard_save_mounts_server_side'),
+    'nc_connector_wizard_save_mounts' => array('handler' => 'bratonien_tools_nc_wizard_save_sources_dispatch'),
     'nc_connector_wizard_select_user' => array('handler' => 'bratonien_tools_nc_wizard_select_current_user'),
     'nc_connector_wizard_api_test' => array('handler' => 'bratonien_tools_nc_wizard_api_test'),
     'nc_connector_wizard_api_skip' => array('handler' => 'bratonien_tools_nc_wizard_api_skip'),
-    'nc_connector_wizard_finish' => array('handler' => 'bratonien_tools_nc_wizard_finish_generic_scope'),
+    'nc_connector_wizard_finish' => array('handler' => 'bratonien_tools_nc_wizard_finish_dispatch'),
     'nc_connector_wizard_back' => array('handler' => 'bratonien_tools_nc_wizard_back'),
     'nc_connector_wizard_reset' => array('handler' => 'bratonien_tools_nc_wizard_reset'),
-    'nc_connector_import_legacy' => array('handler' => 'bratonien_tools_nc_connector_import_legacy'),
     'nc_connector_verify' => array('handler' => 'bratonien_tools_nc_connector_verify_connection_scoped'),
-    'nc_connector_prepare_takeover' => array('handler' => 'bratonien_tools_nc_connector_prepare_takeover'),
-    'nc_connector_cancel_takeover' => array('handler' => 'bratonien_tools_nc_connector_cancel_takeover'),
     'nc_connector_piwigo_api_test' => array('handler' => 'bratonien_tools_nc_connector_piwigo_api_test'),
     'nc_connector_piwigo_api_delete' => array('handler' => 'bratonien_tools_nc_connector_api_delete'),
     'nc_connector_fallback_save' => array('handler' => 'bratonien_tools_nc_connector_fallback_save_scoped'),

include/watermark_engine.inc.php

@@ -8,12 +8,22 @@ require_once(BRATONIEN_TOOLS_PATH . 'include/watermark_base.inc.php');
 
 function bratonien_tools_watermark_engine_enabled()
 {
+  static $initialized = false;
+  static $enabled = false;
+
+  if ($initialized)
+  {
+    return $enabled;
+  }
+
   $config = bratonien_tools_get_watermark_engine_config();
   $enabled = !empty($config['enabled']);
+  $initialized = true;
 
   // Piwigo recalculates use_watermark for custom derivatives from the native
   // watermark file itself. Therefore an active Bratonien engine must keep the
   // native watermark file empty, not only the stored use_watermark flags false.
+  // This initialization is required only once per PHP request.
   if ($enabled)
   {
     bratonien_tools_disable_piwigo_watermarks();

include/watermark_runtime.inc.php

@@ -27,6 +27,72 @@ function bratonien_tools_runtime_category_id()
   return 0;
 }
 
+function bratonien_tools_watermark_album_cover_category($src_image, $category_id=null)
+{
+  static $map = null;
+
+  if ($map === null)
+  {
+    $map = new SplObjectStorage();
+  }
+
+  if (!is_object($src_image))
+  {
+    return 0;
+  }
+
+  if ($category_id !== null)
+  {
+    $category_id = (int)$category_id;
+    if ($category_id > 0)
+    {
+      $map[$src_image] = $category_id;
+    }
+    return $category_id;
+  }
+
+  return $map->contains($src_image) ? (int)$map[$src_image] : 0;
+}
+
+function bratonien_tools_watermark_prepare_album_overview($thumbnails)
+{
+  if (!is_array($thumbnails))
+  {
+    return $thumbnails;
+  }
+
+  foreach ($thumbnails as &$thumbnail)
+  {
+    $category_id = (int)($thumbnail['id'] ?? $thumbnail['ID'] ?? 0);
+    if ($category_id < 1 || empty($thumbnail['representative']['src_image']) || !is_object($thumbnail['representative']['src_image']))
+    {
+      continue;
+    }
+
+    // Ein Repraesentantenbild kann fuer mehrere Alben verwendet werden. Piwigo
+    // reicht in der Albumuebersicht aber nur das SrcImage an get_derivative_url
+    // weiter. Deshalb bekommt jedes Album-Cover eine eigene SrcImage-Instanz,
+    // damit seine konkrete Albumregel erhalten bleibt.
+    $src_image = clone $thumbnail['representative']['src_image'];
+    $thumbnail['representative']['src_image'] = $src_image;
+    bratonien_tools_watermark_album_cover_category($src_image, $category_id);
+  }
+  unset($thumbnail);
+
+  return $thumbnails;
+}
+
+function bratonien_tools_runtime_derivative_category_id($src_image)
+{
+  $category_id = bratonien_tools_runtime_category_id();
+  if ($category_id > 0)
+  {
+    return $category_id;
+  }
+
+  return bratonien_tools_watermark_album_cover_category($src_image);
+}
+
 function bratonien_tools_runtime_effective_rule($category_id)
 {
   static $categories = null;
@@ -230,7 +296,7 @@ function bratonien_tools_filter_derivative_url($url, $params, $src_image, $rel_u
     return $url;
   }
 
-  $rule = bratonien_tools_runtime_effective_rule(bratonien_tools_runtime_category_id());
+  $rule = bratonien_tools_runtime_effective_rule(bratonien_tools_runtime_derivative_category_id($src_image));
   if ($rule['mode'] !== 'profile' || empty($rule['profile_id']))
   {
     return $url;

include/webdav_image_runtime.inc.php

@@ -0,0 +1,467 @@
+<?php
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die('Hacking attempt!');
+}
+
+function bratonien_tools_webdav_image_source_info($image_id)
+{
+  static $cache = array();
+  static $connection_cache = array();
+  static $mapping_cache = array();
+
+  $image_id = (int)$image_id;
+  if ($image_id < 1) return null;
+  if (array_key_exists($image_id, $cache)) return $cache[$image_id];
+
+  $result = pwg_query('SELECT path, coi FROM '.IMAGES_TABLE.' WHERE id='.$image_id.' LIMIT 1');
+  if (!pwg_db_num_rows($result)) return $cache[$image_id] = null;
+  $row = pwg_db_fetch_assoc($result);
+  $path = (string)($row['path'] ?? '');
+  if ($path === '') return $cache[$image_id] = null;
+
+  $absolute = $path;
+  if (strpos($absolute, '/') !== 0)
+  {
+    $absolute = PHPWG_ROOT_PATH.ltrim(preg_replace('#^\\./#', '', $absolute), '/');
+  }
+  $resolved = realpath($absolute);
+  if ($resolved === false) return $cache[$image_id] = null;
+
+  $normalized = str_replace('\\\\', '/', $resolved);
+  if (!preg_match('#/nc-webdav-source/connection-([0-9]+)/root-([0-9]+)/(.*)$#', $normalized, $match))
+  {
+    return $cache[$image_id] = null;
+  }
+
+  $connection_id = (int)$match[1];
+  $root_fileid = (int)$match[2];
+  $relative_path = trim((string)$match[3], '/');
+  if ($relative_path === '') return $cache[$image_id] = null;
+
+  if (!array_key_exists($connection_id, $connection_cache))
+  {
+    $table = defined('BRATONIEN_TOOLS_NC_CONNECTIONS_TABLE')
+      ? BRATONIEN_TOOLS_NC_CONNECTIONS_TABLE
+      : $GLOBALS['prefixeTable'].'bratonien_tools_nc_connections';
+    $connection_result = pwg_query('SELECT config_json FROM `'.$table.'` WHERE id='.$connection_id.' LIMIT 1');
+    if (!pwg_db_num_rows($connection_result))
+    {
+      $connection_cache[$connection_id] = null;
+    }
+    else
+    {
+      $connection_row = pwg_db_fetch_assoc($connection_result);
+      $decoded = json_decode((string)$connection_row['config_json'], true);
+      $connection_cache[$connection_id] = is_array($decoded) ? $decoded : null;
+    }
+  }
+
+  $config = $connection_cache[$connection_id];
+  if (!is_array($config) || (string)($config['source_mode'] ?? '') !== 'webdav-placeholder')
+  {
+    return $cache[$image_id] = null;
+  }
+
+  $root_path = '';
+  $root_found = false;
+  $roots = isset($config['roots']) && is_array($config['roots']) ? $config['roots'] : array();
+  foreach ($roots as $root)
+  {
+    if ((int)($root['fileid'] ?? 0) === $root_fileid)
+    {
+      $root_path = trim((string)($root['webdav_path'] ?? ''), '/');
+      $root_found = true;
+      break;
+    }
+  }
+  if (!$root_found) return $cache[$image_id] = null;
+
+  $root_is_base = $root_path === '';
+  $webdav_path = $root_is_base ? $relative_path : $root_path.'/'.$relative_path;
+  $content_type = '';
+  $size = 0;
+  $etag = '';
+
+  if (!array_key_exists($connection_id, $mapping_cache))
+  {
+    $mapping_cache[$connection_id] = array();
+    $state_dir = rtrim((string)($config['state_dir'] ?? ''), '/');
+    if ($state_dir !== '')
+    {
+      $mapping_file = $state_dir.'/webdav-map.json';
+      if (is_readable($mapping_file))
+      {
+        $mapping = json_decode((string)file_get_contents($mapping_file), true);
+        if (is_array($mapping) && isset($mapping['files']) && is_array($mapping['files']))
+        {
+          $mapping_cache[$connection_id] = $mapping['files'];
+        }
+      }
+    }
+  }
+
+  $entry = $mapping_cache[$connection_id][$resolved] ?? $mapping_cache[$connection_id][$normalized] ?? null;
+  if (is_array($entry) && (string)($entry['kind'] ?? '') === 'file')
+  {
+    $webdav_path = trim((string)($entry['webdav_path'] ?? $webdav_path), '/');
+    $content_type = (string)($entry['content_type'] ?? '');
+    $size = (int)($entry['size'] ?? 0);
+    $etag = (string)($entry['etag'] ?? '');
+  }
+
+  return $cache[$image_id] = array(
+    'image_id'=>$image_id,
+    'connection_id'=>$connection_id,
+    'webdav_path'=>$webdav_path,
+    'root_is_base'=>$root_is_base,
+    'content_type'=>$content_type,
+    'size'=>$size,
+    'etag'=>$etag,
+    'coi'=>$row['coi'] ?? null,
+  );
+}
+
+function bratonien_tools_webdav_image_url($image_id, $preview=false)
+{
+  $info = bratonien_tools_webdav_image_source_info($image_id);
+  if (!$info) return null;
+
+  $url = get_root_url().'plugins/'.BRATONIEN_TOOLS_ID.'/webdav-image.php?id='.(int)$image_id;
+  if ($preview) $url .= '&preview=1';
+  if ($info['etag'] !== '') $url .= '&v='.rawurlencode(substr(sha1($info['etag']), 0, 12));
+  return $url;
+}
+
+function bratonien_tools_webdav_preview_path(array $info)
+{
+  $connection_id = (int)($info['connection_id'] ?? 0);
+  $webdav_path = trim((string)($info['webdav_path'] ?? ''), '/');
+  if ($connection_id < 1 || $webdav_path === '') return null;
+
+  $base = PHPWG_ROOT_PATH.'_data/bratonien-tools/nc-webdav-preview/connection-'.$connection_id.'/'.sha1($webdav_path);
+  foreach (array('jpg', 'png', 'webp') as $ext)
+  {
+    $path = $base.'.'.$ext;
+    if (is_file($path) && is_readable($path)) return $path;
+  }
+  return null;
+}
+
+function bratonien_tools_webdav_preview_content_type($path)
+{
+  $ext = strtolower(pathinfo((string)$path, PATHINFO_EXTENSION));
+  if ($ext === 'png') return 'image/png';
+  if ($ext === 'webp') return 'image/webp';
+  return 'image/jpeg';
+}
+
+function bratonien_tools_webdav_custom_derivative_params($key)
+{
+  if (!class_exists('DerivativeParams') || !class_exists('SizingParams')) return null;
+  $tokens = explode('_', (string)$key);
+  if (!$tokens) return null;
+
+  $token = array_shift($tokens);
+  $crop = 0;
+  $min_size = null;
+  $parse_size = function($value)
+  {
+    $parts = explode('x', (string)$value, 2);
+    if (count($parts) === 1)
+    {
+      $size = max(1, (int)$parts[0]);
+      return array($size, $size);
+    }
+    return array(max(1, (int)$parts[0]), max(1, (int)$parts[1]));
+  };
+
+  if (isset($token[0]) && $token[0] === 's')
+  {
+    $size = $parse_size(substr($token, 1));
+  }
+  elseif (isset($token[0]) && $token[0] === 'e')
+  {
+    $crop = 1;
+    $size = $min_size = $parse_size(substr($token, 1));
+  }
+  else
+  {
+    if (count($tokens) < 2) return null;
+    $size = $parse_size($token);
+    $crop_token = array_shift($tokens);
+    $min_size = $parse_size(array_shift($tokens));
+    $crop = function_exists('char_to_fraction') ? char_to_fraction($crop_token) : 0;
+  }
+
+  $params = new DerivativeParams(new SizingParams($size, $crop, $min_size));
+  if (class_exists('ImageStdParams')) ImageStdParams::apply_global($params);
+  return $params;
+}
+
+function bratonien_tools_webdav_derivative_variants()
+{
+  $variants = array();
+  if (!class_exists('ImageStdParams')) return $variants;
+
+  foreach (ImageStdParams::get_defined_type_map() as $type => $params)
+  {
+    $variants['standard:'.$type] = $params;
+  }
+  foreach (ImageStdParams::$custom as $custom_key => $last_used)
+  {
+    $params = bratonien_tools_webdav_custom_derivative_params($custom_key);
+    if ($params) $variants['custom:'.$custom_key] = $params;
+  }
+  return $variants;
+}
+
+function bratonien_tools_webdav_generate_derivative($params, $src_image, &$detail=null)
+{
+  global $conf;
+
+  $detail = '';
+  if (!is_object($src_image) || empty($src_image->id))
+  {
+    $detail = 'SrcImage fehlt.';
+    return false;
+  }
+
+  $info = bratonien_tools_webdav_image_source_info((int)$src_image->id);
+  if (!$info)
+  {
+    $detail = 'WebDAV-Quellzuordnung fehlt.';
+    return false;
+  }
+
+  $preview = bratonien_tools_webdav_preview_path($info);
+  if (!$preview)
+  {
+    $detail = 'Vorbereitetes WebDAV-Preview fehlt.';
+    return false;
+  }
+
+  $preview_ext = strtolower(pathinfo($preview, PATHINFO_EXTENSION));
+  if (!in_array($preview_ext, array('jpg', 'jpeg', 'png', 'gif'), true))
+  {
+    $detail = 'Preview-Format '.$preview_ext.' ist für die Piwigo-Bildbibliothek nicht sicher nutzbar.';
+    return false;
+  }
+
+  if (!class_exists('DerivativeImage')) require_once(PHPWG_ROOT_PATH.'include/derivative.inc.php');
+  if (!class_exists('pwg_image')) require_once(PHPWG_ROOT_PATH.'admin/include/image.class.php');
+
+  $derivative = new DerivativeImage($params, $src_image);
+  if ($derivative->same_as_source())
+  {
+    $detail = 'Identisch mit Quelle; kein eigenes Derivat erforderlich.';
+    return true;
+  }
+
+  $target = $derivative->get_path();
+  $derivative_root = PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR;
+  if ($target === '' || strpos($target, $derivative_root) !== 0)
+  {
+    $detail = 'Ungültiger Derivat-Zielpfad: '.$target;
+    return false;
+  }
+
+  $preview_mtime = @filemtime($preview) ?: 0;
+  if (is_file($target) && is_readable($target) && (@filemtime($target) ?: 0) >= max($preview_mtime, (int)($params->last_mod_time ?? 0)))
+  {
+    $detail = 'Bereits vorhanden.';
+    return true;
+  }
+
+  $directory = dirname($target);
+  $dir_ok = function_exists('mkgetdir') ? mkgetdir($directory) : (is_dir($directory) || @mkdir($directory, 0755, true));
+  if (!$dir_ok || !is_dir($directory))
+  {
+    $detail = 'Derivat-Verzeichnis konnte nicht angelegt werden: '.$directory;
+    return false;
+  }
+
+  $image = null;
+  try
+  {
+    $image = new pwg_image($preview);
+    $original_size = array((int)$image->get_width(), (int)$image->get_height());
+    if ($original_size[0] < 1 || $original_size[1] < 1)
+    {
+      $detail = 'Preview-Abmessungen sind ungültig.';
+      return false;
+    }
+
+    $crop_rect = null;
+    $scaled_size = null;
+    $params->sizing->compute($original_size, $info['coi'] ?? null, $crop_rect, $scaled_size);
+
+    if ($crop_rect)
+    {
+      if (!$image->crop($crop_rect->width(), $crop_rect->height(), $crop_rect->l, $crop_rect->t))
+      {
+        $detail = 'Crop fehlgeschlagen.';
+        return false;
+      }
+    }
+
+    $final_size = $original_size;
+    if ($crop_rect)
+    {
+      $final_size = array($crop_rect->width(), $crop_rect->height());
+    }
+    if ($scaled_size)
+    {
+      if (!$image->resize($scaled_size[0], $scaled_size[1]))
+      {
+        $detail = 'Resize fehlgeschlagen.';
+        return false;
+      }
+      $final_size = array((int)$scaled_size[0], (int)$scaled_size[1]);
+    }
+
+    if (!empty($params->sharpen) && !$image->sharpen($params->sharpen))
+    {
+      $detail = 'Sharpen fehlgeschlagen.';
+      return false;
+    }
+
+    if ($params->will_watermark($final_size))
+    {
+      $wm = ImageStdParams::get_watermark();
+      if (!empty($wm->file))
+      {
+        $wm_path = PHPWG_ROOT_PATH.$wm->file;
+        if (!is_file($wm_path) || !is_readable($wm_path))
+        {
+          $detail = 'Wasserzeichen-Datei fehlt: '.$wm_path;
+          return false;
+        }
+
+        $wm_image = new pwg_image($wm_path);
+        try
+        {
+          $wm_size = array((int)$wm_image->get_width(), (int)$wm_image->get_height());
+          if ($final_size[0] < $wm_size[0] || $final_size[1] < $wm_size[1])
+          {
+            $wm_scaling = SizingParams::classic($final_size[0], $final_size[1]);
+            $tmp = null;
+            $wm_scaled = null;
+            $wm_scaling->compute($wm_size, null, $tmp, $wm_scaled);
+            if ($wm_scaled)
+            {
+              $wm_image->resize($wm_scaled[0], $wm_scaled[1]);
+              $wm_size = array((int)$wm_scaled[0], (int)$wm_scaled[1]);
+            }
+          }
+
+          $x = (int)round(($wm->xpos / 100) * ($final_size[0] - $wm_size[0]));
+          $y = (int)round(($wm->ypos / 100) * ($final_size[1] - $wm_size[1]));
+          $image->compose($wm_image, $x, $y, $wm->opacity);
+
+          if ($wm->xrepeat || $wm->yrepeat)
+          {
+            $xpad = $wm_size[0] + max(30, (int)round($wm_size[0] / 4));
+            $ypad = $wm_size[1] + max(30, (int)round($wm_size[1] / 4));
+            for ($i = -$wm->xrepeat; $i <= $wm->xrepeat; $i++)
+            {
+              for ($j = -$wm->yrepeat; $j <= $wm->yrepeat; $j++)
+              {
+                if (!$i && !$j) continue;
+                $x2 = $x + $i * $xpad;
+                $y2 = $y + $j * $ypad;
+                if ($x2 >= 0 && $x2 + $wm_size[0] < $final_size[0] && $y2 >= 0 && $y2 + $wm_size[1] < $final_size[1])
+                {
+                  $image->compose($wm_image, $x2, $y2, $wm->opacity);
+                }
+              }
+            }
+          }
+        }
+        finally
+        {
+          $wm_image->destroy();
+        }
+      }
+    }
+
+    if (isset($conf['derivatives_strip_metadata_threshold']) && $final_size[0] * $final_size[1] < (int)$conf['derivatives_strip_metadata_threshold'])
+    {
+      $image->strip();
+    }
+
+    $quality = (int)ImageStdParams::$quality;
+    if (isset($params->type) && in_array($params->type, array(IMG_3XLARGE, IMG_4XLARGE), true))
+    {
+      $quality = min($quality, 75);
+    }
+    $image->set_compression_quality($quality);
+
+    $written = $image->write($target);
+    if ($written === false)
+    {
+      $detail = 'Bildbibliothek konnte das Derivat nicht schreiben.';
+      return false;
+    }
+  }
+  catch (Throwable $e)
+  {
+    $detail = get_class($e).': '.$e->getMessage();
+    return false;
+  }
+  finally
+  {
+    if (is_object($image)) $image->destroy();
+  }
+
+  @chmod($target, 0644);
+  clearstatcache(true, $target);
+  $size = @getimagesize($target);
+  if (!is_file($target) || !is_readable($target) || !is_array($size) || empty($size[0]) || empty($size[1]))
+  {
+    $detail = 'Derivatdatei wurde nicht gültig erzeugt: '.$target;
+    return false;
+  }
+
+  $detail = 'Erzeugt: '.$target.' ('.$size[0].'x'.$size[1].').';
+  return true;
+}
+
+function bratonien_tools_filter_webdav_src_url($url, $src_image)
+{
+  if (!is_object($src_image) || empty($src_image->id)) return $url;
+  $webdav_url = bratonien_tools_webdav_image_url((int)$src_image->id, false);
+  return $webdav_url ?: $url;
+}
+
+function bratonien_tools_filter_webdav_derivative_url($url, $params, $src_image, $rel_url)
+{
+  if (!is_object($src_image) || empty($src_image->id)) return $url;
+
+  // Hotpath: Bei einem bereits vorbereiteten WebDAV-Derivat keinerlei
+  // Connection-DB oder Mapping-Datei mehr anfassen. Der reale Quellpfad
+  // reicht aus, um Connector-Bilder sicher zu erkennen.
+  $source_path = $src_image->get_path();
+  $resolved_source = $source_path !== '' ? realpath($source_path) : false;
+  if ($resolved_source === false || !preg_match('#/nc-webdav-source/connection-[0-9]+/root-[0-9]+/#', str_replace('\\\\', '/', $resolved_source)))
+  {
+    return $url;
+  }
+
+  try
+  {
+    $derivative = new DerivativeImage($params, $src_image);
+    if (!$derivative->same_as_source())
+    {
+      $path = $derivative->get_path();
+      if ($path !== '' && is_file($path) && is_readable($path)) return $url;
+    }
+  }
+  catch (Throwable $e)
+  {
+    error_log('Bratonien WebDAV derivative lookup #'.(int)$src_image->id.': '.$e->getMessage());
+  }
+
+  $preview_url = bratonien_tools_webdav_image_url((int)$src_image->id, true);
+  return $preview_url ?: $url;
+}

js/admin_tabs.js

@@ -1,6 +1,94 @@
 (function () {
   'use strict';
 
+  function initNcRouteStatus() {
+    var section = document.getElementById('nc-connector');
+    if (!section) return;
+
+    var statusCard = section.querySelector('.bratonien-grid .bratonien-card');
+    if (!statusCard) return;
+
+    var grid = statusCard.querySelector('.bratonien-form-grid');
+    if (!grid) return;
+
+    var routeLabel = document.createElement('span');
+    routeLabel.className = 'bratonien-label';
+    routeLabel.textContent = 'Aktiver Datenweg';
+
+    var routeValue = document.createElement('strong');
+    routeValue.setAttribute('data-nc-route-status', '');
+    routeValue.textContent = 'Noch kein Lauf erfasst';
+
+    var routeTimeLabel = document.createElement('span');
+    routeTimeLabel.className = 'bratonien-label';
+    routeTimeLabel.textContent = 'Datenweg zuletzt';
+
+    var routeTimeValue = document.createElement('strong');
+    routeTimeValue.setAttribute('data-nc-route-time', '');
+    routeTimeValue.textContent = 'Nicht verfügbar';
+
+    grid.appendChild(routeLabel);
+    grid.appendChild(routeValue);
+    grid.appendChild(routeTimeLabel);
+    grid.appendChild(routeTimeValue);
+
+    var detail = document.createElement('p');
+    detail.className = 'bratonien-base-note';
+    detail.setAttribute('data-nc-route-detail', '');
+    detail.textContent = 'Der Datenweg wird nach dem nächsten Connector-Lauf angezeigt.';
+    statusCard.appendChild(detail);
+
+    var basePath = window.location.pathname.replace(/admin\.php.*$/, '');
+    var statusUrl = basePath + '_data/bratonien-tools/nc-connector-status/route-status.json';
+
+    function formatTime(timestamp) {
+      if (!timestamp) return 'Nicht verfügbar';
+      var date = new Date(Number(timestamp) * 1000);
+      if (Number.isNaN(date.getTime())) return 'Nicht verfügbar';
+      return date.toLocaleString('de-DE');
+    }
+
+    function render(data) {
+      var label = data && data.label ? String(data.label) : 'Unbekannt';
+      var route = data && data.route ? String(data.route) : '';
+      routeValue.textContent = label;
+      routeTimeValue.textContent = formatTime(data && data.timestamp);
+
+      if (route === 'webdav') {
+        routeValue.textContent = 'WEBDAV PRIMÄR';
+        detail.textContent = 'Portierung läuft über WebDAV. Legacy wurde in diesem Lauf nicht benutzt.';
+      } else if (route === 'legacy_fallback') {
+        routeValue.textContent = 'LEGACY-FALLBACK AKTIV';
+        detail.textContent = 'WebDAV war nicht erfolgreich. Dieser Lauf wurde über die alte Struktur abgefangen.';
+      } else if (route === 'failed') {
+        routeValue.textContent = 'FEHLER - KEIN ERFOLGREICHER DATENWEG';
+        detail.textContent = data && data.detail ? String(data.detail) : 'WebDAV und Fallback sind fehlgeschlagen.';
+      } else {
+        detail.textContent = data && data.detail ? String(data.detail) : 'Unbekannter Datenweg.';
+      }
+    }
+
+    function refresh() {
+      fetch(statusUrl + '?t=' + Date.now(), {
+        cache: 'no-store',
+        credentials: 'same-origin'
+      })
+        .then(function (response) {
+          if (!response.ok) throw new Error('status unavailable');
+          return response.json();
+        })
+        .then(render)
+        .catch(function () {
+          routeValue.textContent = 'Noch kein Lauf erfasst';
+          routeTimeValue.textContent = 'Nicht verfügbar';
+          detail.textContent = 'Nach dem nächsten Connector-Lauf wird hier WebDAV oder Legacy-Fallback angezeigt.';
+        });
+    }
+
+    refresh();
+    window.setInterval(refresh, 10000);
+  }
+
   function initBratonienTabs() {
     var admin = document.querySelector('.bratonien-admin');
     if (!admin) return;
@@ -113,9 +201,14 @@
     activate(initial, false);
   }
 
-  if (document.readyState === 'loading') {
-    document.addEventListener('DOMContentLoaded', initBratonienTabs);
-  } else {
+  function init() {
     initBratonienTabs();
+    initNcRouteStatus();
+  }
+
+  if (document.readyState === 'loading') {
+    document.addEventListener('DOMContentLoaded', init);
+  } else {
+    init();
   }
 })();

js/nc_connector_edit_v2.js

@@ -0,0 +1,236 @@
+(function () {
+  'use strict';
+
+  function ready(callback) {
+    if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', callback);
+    else callback();
+  }
+
+  ready(function () {
+    var section = document.getElementById('nc-connector');
+    if (!section) return;
+
+    var tokenInput = section.querySelector('input[name="pwg_token"]');
+    var pwgToken = tokenInput ? tokenInput.value : '';
+
+    var technicalButton = document.getElementById('bratonien-nc-technical-open');
+    if (technicalButton) technicalButton.remove();
+    var technicalCreate = document.getElementById('bratonien-nc-technical-create');
+    if (technicalCreate) technicalCreate.remove();
+
+    var statusHeading = Array.prototype.find.call(section.querySelectorAll('h4'), function (heading) {
+      return heading.textContent.trim() === 'Status';
+    });
+    var statusCard = statusHeading ? statusHeading.closest('.bratonien-card') : null;
+    if (statusCard && pwgToken && !statusCard.querySelector('[data-nc-run-now]')) {
+      var runForm = document.createElement('form');
+      runForm.method = 'post';
+      runForm.className = 'bratonien-actions';
+      runForm.style.marginTop = '1rem';
+      runForm.setAttribute('data-nc-run-now', '1');
+      runForm.innerHTML = '<input type="hidden" name="pwg_token" value="'+escapeHtml(pwgToken)+'">'
+        + '<button class="buttonLike" type="submit" name="bratonien_tool" value="nc_connector_run_now">Jetzt abgleichen</button>';
+      runForm.addEventListener('submit', function () {
+        var button = runForm.querySelector('button');
+        if (button) {
+          button.disabled = true;
+          button.textContent = 'Abgleich wird gestartet …';
+        }
+      });
+      statusCard.appendChild(runForm);
+    }
+
+    function escapeHtml(value) {
+      return String(value == null ? '' : value).replace(/[&<>"']/g, function (c) {
+        return {'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&#039;'}[c];
+      });
+    }
+
+    function loadConnection(id) {
+      return fetch('plugins/bratonien_tools/nc-connector-edit-data.php?connection_id='+encodeURIComponent(id)+'&_='+Date.now(), {
+        credentials:'same-origin', cache:'no-store', headers:{'Accept':'application/json'}
+      }).then(function (response) {
+        return response.json().then(function (data) {
+          if (!response.ok) throw new Error(data.error || ('HTTP '+response.status));
+          return data;
+        });
+      });
+    }
+
+    function createPostForm(label, tool, id) {
+      var form = document.createElement('form');
+      form.method = 'post';
+      form.style.display = 'inline';
+      form.innerHTML = '<input type="hidden" name="pwg_token" value="'+escapeHtml(pwgToken)+'">'
+        + '<input type="hidden" name="connection_id" value="'+escapeHtml(id)+'">'
+        + '<button class="buttonLike" type="submit" name="bratonien_tool" value="'+escapeHtml(tool)+'">'+escapeHtml(label)+'</button>';
+      return form;
+    }
+
+    function dialog() {
+      var node = document.getElementById('bratonien-nc-connection-edit-v2');
+      if (node) return node;
+      node = document.createElement('dialog');
+      node.id = 'bratonien-nc-connection-edit-v2';
+      node.className = 'bratonien-edit-dialog';
+      node.innerHTML = '<div class="bratonien-edit-dialog__body">'
+        + '<div style="display:flex;align-items:flex-start;justify-content:space-between;gap:1rem">'
+        + '<div><h4 style="margin:0">Verbindung bearbeiten</h4><p class="bratonien-base-note" style="margin:.35rem 0 0">Die Einstellungen gelten nur für diese Verbindung.</p></div>'
+        + '<button type="button" class="buttonLike" data-edit-close>Schließen</button></div>'
+        + '<div data-edit-content style="margin-top:1rem"></div></div>';
+      document.body.appendChild(node);
+      node.querySelector('[data-edit-close]').addEventListener('click', function () { node.close(); });
+      node.addEventListener('click', function (event) { if (event.target === node) node.close(); });
+      return node;
+    }
+
+    function storageRow(storage) {
+      storage = storage || {};
+      return '<div class="bratonien-storage-row" data-storage-row>'
+        + '<label>Storage-ID<input name="nc_storage_id[]" value="'+escapeHtml(storage.storage_id || '')+'" required></label>'
+        + '<label>Quellordner<input name="nc_source_prefix[]" value="'+escapeHtml(storage.source_prefix || '')+'" placeholder="optional"></label>'
+        + '<label>Lokaler Speicherpfad<input name="nc_local_mount[]" value="'+escapeHtml(storage.local_mount || '')+'" required></label>'
+        + '<button type="button" class="buttonLike" data-remove-storage>Entfernen</button></div>';
+    }
+
+    function showError(form, data) {
+      var old = form.querySelector('[data-edit-error]');
+      if (old) old.remove();
+      var box = document.createElement('div');
+      box.dataset.editError = '1';
+      box.className = 'bratonien-main-cache__warning';
+      box.style.margin = '0 0 1rem';
+      box.textContent = (data && data.message) ? data.message : 'Die Verbindung konnte nicht gespeichert werden.';
+      form.insertBefore(box, form.firstChild);
+    }
+
+    function submitLocal(form, editDialog) {
+      if (!form.reportValidity()) return;
+      var button = form.querySelector('button[type="submit"]');
+      if (button) button.disabled = true;
+      fetch('plugins/bratonien_tools/nc-connector-edit-save.php', {
+        method:'POST', credentials:'same-origin', cache:'no-store', headers:{'Accept':'application/json'}, body:new FormData(form)
+      }).then(function (response) {
+        return response.json().then(function (data) {
+          if (!response.ok || !data.ok) { showError(form, data); return; }
+          editDialog.close();
+          window.location.reload();
+        });
+      }).catch(function (error) {
+        showError(form, {message:error.message || String(error)});
+      }).finally(function () {
+        if (button) button.disabled = false;
+      });
+    }
+
+    function openLocalEditor(id) {
+      var editDialog = dialog();
+      var content = editDialog.querySelector('[data-edit-content]');
+      content.innerHTML = '<p class="bratonien-base-note">Verbindung wird geladen …</p>';
+      if (typeof editDialog.showModal === 'function') editDialog.showModal();
+      else editDialog.setAttribute('open', 'open');
+
+      loadConnection(id).then(function (data) {
+        if (data.adapter !== 'local') throw new Error('Diese Verbindung wird über den WebDAV-Assistenten bearbeitet.');
+        var legacy = data.legacy || {};
+        var webdav = data.webdav || {};
+        var storages = Array.isArray(legacy.storages) ? legacy.storages : [];
+        var rows = storages.map(storageRow).join('') || storageRow({});
+
+        content.innerHTML = '<form method="post" data-edit-form>'
+          + '<input type="hidden" name="pwg_token" value="'+escapeHtml(pwgToken)+'">'
+          + '<input type="hidden" name="connection_id" value="'+escapeHtml(data.id)+'">'
+          + '<h5>Verbindung</h5><div class="bratonien-form-grid">'
+          + '<label class="bratonien-label">Name</label><input name="connection_name" value="'+escapeHtml(data.name)+'" required>'
+          + '</div>'
+          + '<h5 style="margin-top:1.2rem">Nextcloud</h5><div class="bratonien-form-grid">'
+          + '<label class="bratonien-label">Nextcloud-Adresse</label><input name="nc_nextcloud_url" value="'+escapeHtml(webdav.nextcloud_url || '')+'">'
+          + '<label class="bratonien-label">Nextcloud-Benutzer</label><input name="nc_nextcloud_user" value="'+escapeHtml(webdav.nextcloud_user || '')+'" autocomplete="username">'
+          + '<label class="bratonien-label">Nextcloud-Passwort</label><input name="nc_nextcloud_password" type="password" autocomplete="current-password" placeholder="'+(webdav.has_nextcloud_password ? 'gespeichert – leer = unverändert' : 'noch nicht gespeichert')+'">'
+          + '</div>'
+          + '<h5 style="margin-top:1.2rem">Piwigo-Zugang</h5><div class="bratonien-form-grid">'
+          + '<label class="bratonien-label">API-Schlüssel-ID</label><input name="nc_connection_api_key_id" value="'+escapeHtml(webdav.api_key_id || '')+'" autocomplete="off">'
+          + '<label class="bratonien-label">API-Geheimnis</label><input name="nc_connection_api_key_secret" type="password" autocomplete="new-password" placeholder="'+(webdav.has_api_key_secret ? 'gespeichert – leer = unverändert' : 'noch nicht gespeichert')+'">'
+          + '<label class="bratonien-label">Fallback-Benutzer</label><input name="nc_fallback_user" value="'+escapeHtml(webdav.fallback_user || '')+'" autocomplete="username">'
+          + '<label class="bratonien-label">Fallback-Passwort</label><input name="nc_fallback_password" type="password" autocomplete="current-password" placeholder="'+(webdav.has_fallback_password ? 'gespeichert – leer = unverändert' : 'noch nicht gespeichert')+'">'
+          + '</div>'
+          + '<h5 style="margin-top:1.2rem">Lokaler Connector</h5><div class="bratonien-form-grid">'
+          + '<label class="bratonien-label">Datenbank-Server</label><input name="nc_host" value="'+escapeHtml(legacy.host)+'" required>'
+          + '<label class="bratonien-label">Port</label><input name="nc_port" type="number" min="1" max="65535" value="'+escapeHtml(legacy.port || 5432)+'" required>'
+          + '<label class="bratonien-label">Datenbank</label><input name="nc_database" value="'+escapeHtml(legacy.database)+'" required>'
+          + '<label class="bratonien-label">Reader-Benutzer</label><input name="nc_user" value="'+escapeHtml(legacy.user)+'" required>'
+          + '<label class="bratonien-label">Reader-Passwort</label><input name="nc_db_password" type="password" autocomplete="new-password" placeholder="'+(legacy.has_db_password ? 'gespeichert – leer = unverändert' : 'noch nicht gespeichert')+'">'
+          + '</div>'
+          + '<h5 style="margin-top:1.2rem">Speicherorte</h5><div data-storage-list>'+rows+'</div>'
+          + '<button type="button" class="buttonLike" data-add-storage>Speicherort hinzufügen</button>'
+          + '<details style="margin-top:1rem"><summary>Erweiterte Einstellungen</summary><div class="bratonien-form-grid" style="margin-top:.75rem">'
+          + '<label class="bratonien-label">Source-View</label><input name="nc_source_view" value="'+escapeHtml(legacy.source_view)+'" required>'
+          + '<label class="bratonien-label">Activity-View</label><input name="nc_activity_view" value="'+escapeHtml(legacy.activity_view)+'" required>'
+          + '<label class="bratonien-label">Piwigo-Galerieordner</label><input name="nc_gallery_root" value="'+escapeHtml(legacy.gallery_root)+'" required>'
+          + '<label class="bratonien-label">Ruhezeit (Sek.)</label><input name="nc_quiet_seconds" type="number" min="0" value="'+escapeHtml(legacy.quiet_seconds)+'">'
+          + '<label class="bratonien-label">Maximale Wartezeit (Sek.)</label><input name="nc_max_wait_seconds" type="number" min="60" value="'+escapeHtml(legacy.max_wait_seconds)+'">'
+          + '<label class="bratonien-label">Vollprüfung nach (Sek.)</label><input name="nc_full_sync_seconds" type="number" min="300" value="'+escapeHtml(legacy.full_sync_seconds)+'">'
+          + '</div></details>'
+          + '<div class="bratonien-actions" style="margin-top:1rem"><button class="buttonLike" type="submit">Änderungen prüfen und speichern</button><button class="buttonLike" type="button" data-cancel>Abbrechen</button></div>'
+          + '</form>';
+
+        var form = content.querySelector('[data-edit-form]');
+        form.querySelector('[data-cancel]').addEventListener('click', function () { editDialog.close(); });
+        form.querySelector('[data-add-storage]').addEventListener('click', function () {
+          form.querySelector('[data-storage-list]').insertAdjacentHTML('beforeend', storageRow({}));
+        });
+        form.addEventListener('click', function (event) {
+          var remove = event.target.closest('[data-remove-storage]');
+          if (remove) {
+            var row = remove.closest('[data-storage-row]');
+            if (row) row.remove();
+          }
+        });
+        form.addEventListener('submit', function (event) {
+          event.preventDefault();
+          submitLocal(form, editDialog);
+        });
+      }).catch(function (error) {
+        content.innerHTML = '<p class="bratonien-main-cache__warning"><strong>Bearbeiten nicht möglich:</strong> '+escapeHtml(error.message || String(error))+'</p>';
+      });
+    }
+
+    [].slice.call(section.querySelectorAll('button[value="nc_connector_edit_start"]')).forEach(function (button) {
+      var form = button.closest('form');
+      if (form) form.remove();
+    });
+
+    [].slice.call(section.querySelectorAll('button[value="nc_connector_migrate_start"]')).forEach(function (button) {
+      var form = button.closest('form');
+      if (form) form.remove();
+    });
+
+    [].slice.call(section.querySelectorAll('button[value="nc_connector_delete"]')).forEach(function (deleteButton) {
+      var deleteForm = deleteButton.closest('form');
+      if (!deleteForm || !deleteForm.parentElement) return;
+      var idInput = deleteForm.querySelector('input[name="connection_id"]');
+      if (!idInput) return;
+      var id = idInput.value;
+      var actions = deleteForm.parentElement;
+
+      loadConnection(id).then(function (data) {
+        var edit;
+        if (data.adapter === 'local') {
+          edit = document.createElement('button');
+          edit.type = 'button';
+          edit.className = 'buttonLike';
+          edit.textContent = 'Bearbeiten';
+          edit.addEventListener('click', function () { openLocalEditor(id); });
+        } else {
+          edit = createPostForm('Bearbeiten', 'nc_connector_edit_start', id);
+        }
+        actions.insertBefore(edit, deleteForm);
+      }).catch(function (error) {
+        var info = document.createElement('span');
+        info.className = 'bratonien-main-cache__warning';
+        info.textContent = 'Verbindung konnte nicht geladen werden: '+(error.message || String(error));
+        actions.insertBefore(info, deleteForm);
+      });
+    });
+  });
+})();

main.inc.php

@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: Bratonien Tools
-Version: 0.9.5.3
+Version: 0.9.7.16
 Description: Erweiterbare Administrationswerkzeuge fuer die Bratonien-Piwigo-Installation.
 Plugin URI: https://github.com/Terranom674/Piwigo_Bratonien_Tools
 Author: Bratonien
@@ -16,6 +16,7 @@ define('BRATONIEN_TOOLS_ID', basename(dirname(__FILE__)));
 define('BRATONIEN_TOOLS_PATH', PHPWG_PLUGINS_PATH . BRATONIEN_TOOLS_ID . '/');
 
 require_once(BRATONIEN_TOOLS_PATH . 'include/watermark_runtime.inc.php');
+require_once(BRATONIEN_TOOLS_PATH . 'include/webdav_image_runtime.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/public_selection.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/picture_navigation.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/batch_titles.inc.php');
@@ -23,11 +24,15 @@ require_once(BRATONIEN_TOOLS_PATH . 'include/album_shares.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_ws.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_orphan_ws.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_productive_ws.inc.php');
+require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_scheduler.inc.php');
 
 add_event_handler('get_admin_plugin_menu_links', 'bratonien_tools_admin_menu');
+add_event_handler('loc_end_index_category_thumbnails', 'bratonien_tools_watermark_prepare_album_overview');
 add_event_handler('get_derivative_url', 'bratonien_tools_filter_derivative_url', EVENT_HANDLER_PRIORITY_NEUTRAL, 4);
+add_event_handler('get_src_image_url', 'bratonien_tools_filter_webdav_src_url', EVENT_HANDLER_PRIORITY_NEUTRAL + 50, 2);
 add_event_handler('loc_end_element_set_global', 'bratonien_tools_batch_titles_register_action');
 add_event_handler('element_set_global_action', 'bratonien_tools_batch_titles_apply', EVENT_HANDLER_PRIORITY_NEUTRAL, 2);
+add_event_handler('init', 'bratonien_tools_watermark_cache_upgrade', EVENT_HANDLER_PRIORITY_NEUTRAL - 40);
 add_event_handler('init', 'bratonien_tools_prepare_connector_private_import', EVENT_HANDLER_PRIORITY_NEUTRAL - 30);
 add_event_handler('init', 'bratonien_tools_prepare_private_album_permissions', EVENT_HANDLER_PRIORITY_NEUTRAL - 20);
 add_event_handler('init', 'bratonien_tools_preserve_private_album_access', EVENT_HANDLER_PRIORITY_NEUTRAL - 10);

maintain.class.php

@@ -8,6 +8,8 @@ require_once(dirname(__FILE__) . '/include/album_shares.inc.php');
 require_once(dirname(__FILE__) . '/include/database.class.php');
 require_once(dirname(__FILE__) . '/tools/watermark_profiles.inc.php');
 require_once(dirname(__FILE__) . '/include/dependencies.inc.php');
+require_once(dirname(__FILE__) . '/include/nc_connector_scheduler.inc.php');
+require_once(dirname(__FILE__) . '/include/nc_legacy_reset.inc.php');
 
 class bratonien_tools_maintain extends PluginMaintain
 {
@@ -18,9 +20,14 @@ class bratonien_tools_maintain extends PluginMaintain
 
     $dependency_messages = array();
     bratonien_tools_ensure_dependencies($dependency_messages);
+    if (!bratonien_tools_nc_scheduler_install())
+    {
+      $dependency_messages[] = 'Der native NC-Scheduler konnte sein Piwigo-Laufzeitverzeichnis nicht anlegen.';
+    }
 
     if (function_exists('conf_update_param'))
     {
+      conf_update_param('bratonien_nc_scheduler_interval', 60);
       conf_update_param('bratonien_dependency_status', json_encode(array(
         'checked_at' => time(),
         'messages' => $dependency_messages,
@@ -45,6 +52,18 @@ class bratonien_tools_maintain extends PluginMaintain
   public function update($old_version, $new_version, &$errors = array())
   {
     $this->prepare($errors);
+
+    if (version_compare((string)$old_version, '0.9.7.7', '<') && version_compare((string)$new_version, '0.9.7.7', '>='))
+    {
+      try
+      {
+        bratonien_tools_nc_reset_legacy_imports();
+      }
+      catch (Throwable $e)
+      {
+        $errors[] = 'Connector-Altbestand konnte nicht vollständig bereinigt werden: '.$e->getMessage();
+      }
+    }
   }
 
   public function uninstall()

nc-connector-edit-data.php

@@ -0,0 +1,93 @@
+<?php
+$piwigo_root = realpath(dirname(__DIR__, 2));
+if ($piwigo_root === false)
+{
+  http_response_code(500);
+  exit;
+}
+define('PHPWG_ROOT_PATH', rtrim($piwigo_root, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR);
+include_once(PHPWG_ROOT_PATH.'include/common.inc.php');
+
+header('Content-Type: application/json; charset=utf-8');
+header('Cache-Control: no-store, max-age=0');
+
+if (!defined('BRATONIEN_TOOLS_PATH'))
+{
+  http_response_code(404);
+  echo json_encode(array('error'=>'Bratonien Tools ist nicht aktiv.'));
+  exit;
+}
+if (!function_exists('is_admin') || !is_admin())
+{
+  http_response_code(403);
+  echo json_encode(array('error'=>'Administratorrechte erforderlich.'));
+  exit;
+}
+
+require_once(BRATONIEN_TOOLS_PATH.'include/nc_connector.inc.php');
+require_once(BRATONIEN_TOOLS_PATH.'include/nc_connector_manage.inc.php');
+require_once(BRATONIEN_TOOLS_PATH.'include/nc_connector_connection_scope.inc.php');
+
+$id = (int)($_GET['connection_id'] ?? 0);
+$connection = bratonien_tools_nc_connector_connection($id, true);
+if (!$connection)
+{
+  http_response_code(404);
+  echo json_encode(array('error'=>'Connector-Verbindung wurde nicht gefunden.'));
+  exit;
+}
+
+$config = isset($connection['config']) && is_array($connection['config']) ? $connection['config'] : array();
+$credentials = array();
+try
+{
+  $credentials = bratonien_tools_nc_connector_scoped_secret($connection);
+}
+catch (Throwable $e)
+{
+  $credentials = array();
+}
+
+$storages = array();
+foreach ((array)($config['storages'] ?? array()) as $storage)
+{
+  $storages[] = array(
+    'storage_id'=>(string)($storage['storage_id'] ?? ''),
+    'source_prefix'=>(string)($storage['source_prefix'] ?? ''),
+    'local_mount'=>(string)($storage['local_mount'] ?? ''),
+  );
+}
+
+$payload = array(
+  'id'=>(int)$connection['id'],
+  'name'=>(string)$connection['name'],
+  'adapter'=>(string)$connection['adapter'],
+  'enabled'=>(bool)$connection['enabled'],
+  'takeover_state'=>(string)$connection['takeover_state'],
+  'source_mode'=>(string)($config['source_mode'] ?? ''),
+  'legacy'=>array(
+    'host'=>(string)($config['host'] ?? ''),
+    'port'=>(string)($config['port'] ?? '5432'),
+    'database'=>(string)($config['database'] ?? ''),
+    'user'=>(string)($config['user'] ?? ''),
+    'has_db_password'=>trim((string)($credentials['db_password'] ?? '')) !== '',
+    'source_view'=>(string)($config['source_view'] ?? ''),
+    'activity_view'=>(string)($config['activity_view'] ?? ''),
+    'gallery_root'=>(string)($config['gallery_root'] ?? ''),
+    'quiet_seconds'=>(int)($config['quiet_seconds'] ?? 120),
+    'max_wait_seconds'=>(int)($config['max_wait_seconds'] ?? 900),
+    'full_sync_seconds'=>(int)($config['full_sync_seconds'] ?? 86400),
+    'storages'=>$storages,
+  ),
+  'webdav'=>array(
+    'nextcloud_url'=>(string)($config['nextcloud_url'] ?? ''),
+    'nextcloud_user'=>(string)($credentials['nextcloud_user'] ?? $config['nextcloud_access_user'] ?? $config['access_user'] ?? ''),
+    'has_nextcloud_password'=>(string)($credentials['nextcloud_password'] ?? '') !== '',
+    'api_key_id'=>(string)($credentials['api_key_id'] ?? ''),
+    'has_api_key_secret'=>trim((string)($credentials['api_key_secret'] ?? '')) !== '',
+    'fallback_user'=>(string)($credentials['piwigo_user'] ?? ''),
+    'has_fallback_password'=>(string)($credentials['piwigo_password'] ?? '') !== '',
+  ),
+);
+
+echo json_encode($payload, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);

nc-connector-edit-save.php

@@ -0,0 +1,356 @@
+<?php
+$piwigo_root = realpath(dirname(__DIR__, 2));
+if ($piwigo_root === false)
+{
+  http_response_code(500);
+  exit;
+}
+define('PHPWG_ROOT_PATH', rtrim($piwigo_root, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR);
+include_once(PHPWG_ROOT_PATH.'include/common.inc.php');
+
+header('Content-Type: application/json; charset=utf-8');
+header('Cache-Control: no-store, max-age=0');
+
+function bratonien_tools_nc_edit_json($status, array $payload)
+{
+  http_response_code((int)$status);
+  echo json_encode($payload, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+  exit;
+}
+
+function bratonien_tools_nc_edit_fail($message, array $fields = array(), $stage = '', $detail = '')
+{
+  $visible = trim((string)$message);
+  if ($stage !== '') $visible = 'Bereich: '.$stage.' — '.$visible;
+  if ($detail !== '') $visible .= ' Technische Ursache: '.$detail;
+
+  bratonien_tools_nc_edit_json(422, array(
+    'ok'=>false,
+    'message'=>$visible,
+    'stage'=>(string)$stage,
+    'detail'=>(string)$detail,
+    'fields'=>array_values(array_unique($fields)),
+  ));
+}
+
+function bratonien_tools_nc_edit_probe($url, $username = '', $password = '', array $headers = array())
+{
+  if (!function_exists('curl_init'))
+  {
+    return array('ok'=>false, 'http'=>0, 'errno'=>-1, 'error'=>'cURL ist in PHP nicht verfügbar.', 'body'=>'');
+  }
+
+  $ch = curl_init($url);
+  $options = array(
+    CURLOPT_RETURNTRANSFER=>true,
+    CURLOPT_FOLLOWLOCATION=>true,
+    CURLOPT_MAXREDIRS=>3,
+    CURLOPT_CONNECTTIMEOUT=>8,
+    CURLOPT_TIMEOUT=>15,
+    CURLOPT_HTTPHEADER=>array_merge(array('Accept: application/json'), $headers),
+    CURLOPT_USERAGENT=>'Bratonien-Tools-NC-Editor/'.(function_exists('bratonien_tools_current_version') ? bratonien_tools_current_version() : 'dev'),
+  );
+  if ($username !== '')
+  {
+    $options[CURLOPT_HTTPAUTH] = CURLAUTH_BASIC;
+    $options[CURLOPT_USERPWD] = $username.':'.$password;
+  }
+  curl_setopt_array($ch, $options);
+  $body = curl_exec($ch);
+  $errno = curl_errno($ch);
+  $error = curl_error($ch);
+  $http = (int)curl_getinfo($ch, CURLINFO_HTTP_CODE);
+  curl_close($ch);
+
+  return array(
+    'ok'=>$body !== false && $errno === 0,
+    'http'=>$http,
+    'errno'=>$errno,
+    'error'=>$error,
+    'body'=>$body === false ? '' : (string)$body,
+  );
+}
+
+if (!defined('BRATONIEN_TOOLS_PATH'))
+{
+  bratonien_tools_nc_edit_json(404, array('ok'=>false, 'message'=>'Bratonien Tools ist nicht aktiv.', 'fields'=>array()));
+}
+if (!function_exists('is_admin') || !is_admin())
+{
+  bratonien_tools_nc_edit_json(403, array('ok'=>false, 'message'=>'Administratorrechte erforderlich.', 'fields'=>array()));
+}
+if (($_SERVER['REQUEST_METHOD'] ?? '') !== 'POST')
+{
+  bratonien_tools_nc_edit_json(405, array('ok'=>false, 'message'=>'Nur POST ist erlaubt.', 'fields'=>array()));
+}
+
+try
+{
+  check_pwg_token();
+  require_once(BRATONIEN_TOOLS_PATH.'include/tool_registry.inc.php');
+
+  $id = (int)($_POST['connection_id'] ?? 0);
+  $connection = bratonien_tools_nc_connector_connection($id, true);
+  if (!$connection)
+  {
+    bratonien_tools_nc_edit_fail('Die zu bearbeitende Verbindung wurde nicht gefunden.', array(), 'Verbindung');
+  }
+
+  $config = isset($connection['config']) && is_array($connection['config']) ? $connection['config'] : array();
+  $credentials = bratonien_tools_nc_connector_scoped_secret($connection);
+
+  $nextcloud_input = trim((string)($_POST['nc_nextcloud_url'] ?? ($config['nextcloud_url'] ?? '')));
+  $nextcloud_user = trim((string)($_POST['nc_nextcloud_user'] ?? ($credentials['nextcloud_user'] ?? '')));
+  $submitted_nc_password = (string)($_POST['nc_nextcloud_password'] ?? '');
+  $nextcloud_password = $submitted_nc_password !== '' ? $submitted_nc_password : (string)($credentials['nextcloud_password'] ?? '');
+
+  $has_any_nextcloud = $nextcloud_input !== '' || $nextcloud_user !== '' || $nextcloud_password !== '';
+  if ($has_any_nextcloud)
+  {
+    $missing = array();
+    if ($nextcloud_input === '') $missing[] = 'nc_nextcloud_url';
+    if ($nextcloud_user === '') $missing[] = 'nc_nextcloud_user';
+    if ($nextcloud_password === '') $missing[] = 'nc_nextcloud_password';
+    if ($missing)
+    {
+      bratonien_tools_nc_edit_fail(
+        'Die WebDAV-Daten sind unvollständig. Adresse, Benutzer und Passwort werden gemeinsam benötigt.',
+        $missing,
+        'Nextcloud / WebDAV'
+      );
+    }
+
+    try
+    {
+      $candidate_urls = bratonien_tools_nc_wizard_candidate_urls($nextcloud_input);
+    }
+    catch (Throwable $e)
+    {
+      bratonien_tools_nc_edit_fail($e->getMessage(), array('nc_nextcloud_url'), 'Nextcloud / WebDAV');
+    }
+
+    $nextcloud_url = '';
+    $last_probe = null;
+    $last_status_url = '';
+    foreach ($candidate_urls as $candidate_url)
+    {
+      $status_url = $candidate_url.'/status.php';
+      $probe = bratonien_tools_nc_edit_probe($status_url);
+      $last_probe = $probe;
+      $last_status_url = $status_url;
+
+      if (!$probe['ok'] || $probe['http'] < 200 || $probe['http'] >= 300)
+      {
+        continue;
+      }
+
+      $status = json_decode($probe['body'], true);
+      if (!is_array($status) || empty($status['installed']))
+      {
+        continue;
+      }
+
+      $nextcloud_url = $candidate_url;
+      break;
+    }
+
+    if ($nextcloud_url === '')
+    {
+      $attempts = array();
+      foreach ($candidate_urls as $candidate_url)
+      {
+        $attempts[] = $candidate_url.'/status.php';
+      }
+      if (is_array($last_probe) && !$last_probe['ok'])
+      {
+        $technical = $last_probe['errno'] >= 0
+          ? 'cURL '.$last_probe['errno'].($last_probe['error'] !== '' ? ': '.$last_probe['error'] : '')
+          : $last_probe['error'];
+        bratonien_tools_nc_edit_fail(
+          'Die Nextcloud-Adresse ist vom Piwigo-Server aus nicht erreichbar. Ohne angegebenes Protokoll wurden HTTPS und HTTP geprüft.',
+          array('nc_nextcloud_url'),
+          'Nextcloud / WebDAV – Erreichbarkeit',
+          $technical.' · Geprüft: '.implode(' ; ', $attempts)
+        );
+      }
+
+      bratonien_tools_nc_edit_fail(
+        'Unter der angegebenen Adresse wurde keine erreichbare installierte Nextcloud gefunden. Ohne angegebenes Protokoll wurden HTTPS und HTTP geprüft.',
+        array('nc_nextcloud_url'),
+        'Nextcloud / WebDAV – Erkennung',
+        'Geprüft: '.implode(' ; ', $attempts).($last_probe ? ' · Letzter HTTP-Status: '.$last_probe['http'] : '')
+      );
+    }
+
+    $_POST['nc_nextcloud_url'] = $nextcloud_url;
+
+    $user_url = $nextcloud_url.'/ocs/v2.php/cloud/user?format=json';
+    $user_probe = bratonien_tools_nc_edit_probe($user_url, $nextcloud_user, $nextcloud_password, array('OCS-APIRequest: true'));
+    if (!$user_probe['ok'])
+    {
+      $technical = $user_probe['errno'] >= 0
+        ? 'cURL '.$user_probe['errno'].($user_probe['error'] !== '' ? ': '.$user_probe['error'] : '')
+        : $user_probe['error'];
+      bratonien_tools_nc_edit_fail(
+        'Die Nextcloud-Anmeldung konnte technisch nicht geprüft werden.',
+        array('nc_nextcloud_url','nc_nextcloud_user','nc_nextcloud_password'),
+        'Nextcloud / WebDAV – Anmeldung',
+        $technical.' · Ziel: '.$user_url
+      );
+    }
+    if ($user_probe['http'] === 401 || $user_probe['http'] === 403)
+    {
+      bratonien_tools_nc_edit_fail(
+        'Nextcloud hat Benutzername oder Passwort abgelehnt.',
+        array('nc_nextcloud_user','nc_nextcloud_password'),
+        'Nextcloud / WebDAV – Anmeldung',
+        'HTTP '.$user_probe['http']
+      );
+    }
+    if ($user_probe['http'] < 200 || $user_probe['http'] >= 300)
+    {
+      bratonien_tools_nc_edit_fail(
+        'Nextcloud ist erreichbar, aber die Benutzerprüfung wurde vom Server abgelehnt.',
+        array('nc_nextcloud_user','nc_nextcloud_password'),
+        'Nextcloud / WebDAV – Anmeldung',
+        'HTTP '.$user_probe['http'].' · Ziel: '.$user_url
+      );
+    }
+    try
+    {
+      bratonien_tools_nc_wizard_ocs_data($user_probe['body']);
+    }
+    catch (Throwable $e)
+    {
+      bratonien_tools_nc_edit_fail(
+        'Nextcloud antwortet auf die Benutzerprüfung, die Antwort ist aber nicht gültig: '.$e->getMessage(),
+        array('nc_nextcloud_user','nc_nextcloud_password'),
+        'Nextcloud / WebDAV – Anmeldung'
+      );
+    }
+  }
+
+  $api_key_id = trim((string)($_POST['nc_connection_api_key_id'] ?? ($credentials['api_key_id'] ?? '')));
+  $submitted_api_secret = trim((string)($_POST['nc_connection_api_key_secret'] ?? ''));
+  $api_key_secret = $submitted_api_secret !== '' ? $submitted_api_secret : trim((string)($credentials['api_key_secret'] ?? ''));
+  if (($api_key_id === '') !== ($api_key_secret === ''))
+  {
+    $missing = $api_key_id === '' ? array('nc_connection_api_key_id') : array('nc_connection_api_key_secret');
+    bratonien_tools_nc_edit_fail(
+      'API-Schlüssel-ID und API-Geheimnis müssen gemeinsam vollständig sein.',
+      $missing,
+      'Piwigo API'
+    );
+  }
+  if ($api_key_id !== '')
+  {
+    try
+    {
+      bratonien_tools_nc_connector_validate_scoped_api($api_key_id, $api_key_secret);
+    }
+    catch (Throwable $e)
+    {
+      bratonien_tools_nc_edit_fail(
+        'Der Piwigo-API-Zugang konnte nicht bestätigt werden: '.$e->getMessage(),
+        array('nc_connection_api_key_id','nc_connection_api_key_secret'),
+        'Piwigo API'
+      );
+    }
+  }
+
+  $fallback_user = trim((string)($_POST['nc_fallback_user'] ?? ($credentials['piwigo_user'] ?? '')));
+  $submitted_fallback_password = (string)($_POST['nc_fallback_password'] ?? '');
+  $fallback_password = $submitted_fallback_password !== '' ? $submitted_fallback_password : (string)($credentials['piwigo_password'] ?? '');
+  if (($fallback_user === '') !== ($fallback_password === ''))
+  {
+    bratonien_tools_nc_edit_fail(
+      'Fallback-Benutzer und Fallback-Passwort müssen gemeinsam vollständig sein.',
+      array('nc_fallback_user','nc_fallback_password'),
+      'Piwigo-Fallback'
+    );
+  }
+  if ($fallback_user !== '')
+  {
+    try
+    {
+      bratonien_tools_nc_connector_validate_fallback_credentials($fallback_user, $fallback_password);
+    }
+    catch (Throwable $e)
+    {
+      bratonien_tools_nc_edit_fail(
+        'Der Piwigo-Fallback wurde abgelehnt: '.$e->getMessage(),
+        array('nc_fallback_user','nc_fallback_password'),
+        'Piwigo-Fallback'
+      );
+    }
+  }
+
+  $result = bratonien_tools_nc_connector_update_local_friendly();
+
+  if (array_key_exists('nc_fallback_user', $_POST) || array_key_exists('nc_fallback_password', $_POST))
+  {
+    $updated = bratonien_tools_nc_connector_connection($id, true);
+    if (!$updated) throw new RuntimeException('Die Verbindung konnte nach dem Speichern nicht erneut geladen werden.');
+    $updated_credentials = bratonien_tools_nc_connector_scoped_secret($updated);
+    $updated_credentials['piwigo_user'] = $fallback_user;
+    $updated_credentials['piwigo_password'] = $fallback_password;
+    bratonien_tools_nc_connector_store_scoped_secret($id, $updated, $updated_credentials);
+  }
+
+  bratonien_tools_nc_edit_json(200, array(
+    'ok'=>true,
+    'message'=>(string)($result['message'] ?? 'Verbindung wurde gespeichert.'),
+    'fields'=>array(),
+  ));
+}
+catch (Throwable $e)
+{
+  $message = trim($e->getMessage());
+  if ($message === '') $message = 'Die Verbindung konnte nicht gespeichert werden.';
+
+  $fields = array();
+  $stage = 'Verbindung';
+  $add = function($name) use (&$fields)
+  {
+    if (!in_array($name, $fields, true)) $fields[] = $name;
+  };
+
+  if (stripos($message, 'Name') !== false && stripos($message, 'Datenbankname') === false) $add('connection_name');
+  if (stripos($message, 'Datenbank-Server') !== false) { $add('nc_host'); $stage = 'Legacy-Datenbank'; }
+  if (stripos($message, 'Datenbank-Port') !== false) { $add('nc_port'); $stage = 'Legacy-Datenbank'; }
+  if (stripos($message, 'Datenbankname') !== false) { $add('nc_database'); $stage = 'Legacy-Datenbank'; }
+  if (stripos($message, 'Reader-Benutzer') !== false) { $add('nc_user'); $stage = 'Legacy-Datenbank'; }
+  if (stripos($message, 'Datenbankpasswort') !== false) { $add('nc_db_password'); $stage = 'Legacy-Datenbank'; }
+  if (stripos($message, 'Storage-ID') !== false) { $add('nc_storage_id[]'); $stage = 'Speicherorte'; }
+  if (stripos($message, 'lokaler Pfad') !== false || stripos($message, 'Speicherort') !== false) { $add('nc_local_mount[]'); $stage = 'Speicherorte'; }
+  if (stripos($message, 'Galerieordner') !== false) { $add('nc_gallery_root'); $stage = 'Erweiterte Legacy-Einstellungen'; }
+  if (stripos($message, 'Datenbankansichten') !== false || stripos($message, 'Source-View') !== false) { $add('nc_source_view'); $stage = 'Erweiterte Legacy-Einstellungen'; }
+  if (stripos($message, 'Datenbankansichten') !== false || stripos($message, 'Activity-View') !== false) { $add('nc_activity_view'); $stage = 'Erweiterte Legacy-Einstellungen'; }
+
+  if (stripos($message, 'Nextcloud') !== false)
+  {
+    $stage = 'Nextcloud / WebDAV';
+    if (stripos($message, 'Adresse') !== false) $add('nc_nextcloud_url');
+    if (stripos($message, 'Benutzer') !== false) $add('nc_nextcloud_user');
+    if (stripos($message, 'Passwort') !== false) $add('nc_nextcloud_password');
+  }
+  if (stripos($message, 'API') !== false)
+  {
+    $stage = 'Piwigo API';
+    $add('nc_connection_api_key_id');
+    $add('nc_connection_api_key_secret');
+  }
+  if (stripos($message, 'Fallback') !== false)
+  {
+    $stage = 'Piwigo-Fallback';
+    $add('nc_fallback_user');
+    $add('nc_fallback_password');
+  }
+
+  bratonien_tools_nc_edit_fail(
+    $message,
+    $fields,
+    $stage,
+    'Interne Prüfung: '.get_class($e)
+  );
+}

nc-connector-source-picker-start.php

@@ -0,0 +1,104 @@
+<?php
+$piwigo_root = realpath(dirname(__DIR__, 2));
+if ($piwigo_root === false)
+{
+  http_response_code(500);
+  exit;
+}
+define('PHPWG_ROOT_PATH', rtrim($piwigo_root, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR);
+include_once(PHPWG_ROOT_PATH.'include/common.inc.php');
+
+header('Content-Type: application/json; charset=utf-8');
+header('Cache-Control: no-store, max-age=0');
+
+function bratonien_tools_nc_source_picker_json($status, array $payload)
+{
+  http_response_code((int)$status);
+  echo json_encode($payload, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+  exit;
+}
+
+function bratonien_tools_nc_source_picker_fail($message, array $fields = array())
+{
+  bratonien_tools_nc_source_picker_json(422, array(
+    'ok'=>false,
+    'message'=>(string)$message,
+    'fields'=>array_values(array_unique($fields)),
+  ));
+}
+
+if (!defined('BRATONIEN_TOOLS_PATH'))
+{
+  bratonien_tools_nc_source_picker_json(404, array('ok'=>false, 'message'=>'Bratonien Tools ist nicht aktiv.', 'fields'=>array()));
+}
+if (!function_exists('is_admin') || !is_admin())
+{
+  bratonien_tools_nc_source_picker_json(403, array('ok'=>false, 'message'=>'Administratorrechte erforderlich.', 'fields'=>array()));
+}
+if (($_SERVER['REQUEST_METHOD'] ?? '') !== 'POST')
+{
+  bratonien_tools_nc_source_picker_json(405, array('ok'=>false, 'message'=>'Nur POST ist erlaubt.', 'fields'=>array()));
+}
+
+try
+{
+  check_pwg_token();
+  require_once(BRATONIEN_TOOLS_PATH.'include/tool_registry.inc.php');
+
+  $id = (int)($_POST['connection_id'] ?? 0);
+  $connection = bratonien_tools_nc_connector_connection($id, true);
+  if (!$connection)
+  {
+    bratonien_tools_nc_source_picker_fail('Die zu bearbeitende Verbindung wurde nicht gefunden.');
+  }
+  if ((string)$connection['adapter'] !== 'local')
+  {
+    bratonien_tools_nc_source_picker_fail('Die automatische Migrationsauswahl ist nur für die bestehende Legacy-Verbindung vorgesehen.');
+  }
+
+  $config = isset($connection['config']) && is_array($connection['config']) ? $connection['config'] : array();
+  $credentials = bratonien_tools_nc_connector_scoped_secret($connection);
+
+  $base_url = trim((string)($config['nextcloud_url'] ?? ''));
+  $username = trim((string)($credentials['nextcloud_user'] ?? ''));
+  $password = (string)($credentials['nextcloud_password'] ?? '');
+
+  $missing = array();
+  if ($base_url === '') $missing[] = 'nc_nextcloud_url';
+  if ($username === '') $missing[] = 'nc_nextcloud_user';
+  if ($password === '') $missing[] = 'nc_nextcloud_password';
+  if ($missing)
+  {
+    bratonien_tools_nc_source_picker_fail(
+      'Für die automatische Ordnerauswahl müssen Nextcloud-Adresse, Benutzer und Passwort gespeichert sein.',
+      $missing
+    );
+  }
+
+  bratonien_tools_nc_connector_prepare_webdav_wizard_from_connection($connection, 'migrate');
+
+  $state = bratonien_tools_nc_wizard_state();
+  if ((int)($state['step'] ?? 0) !== 2 || empty($state['scan_ok']) || empty($state['directory_selection_ready']))
+  {
+    $detail = trim((string)($state['technical_error'] ?? ''));
+    bratonien_tools_nc_source_picker_fail(
+      $detail !== '' ? 'Die Nextcloud-Ordner konnten nicht geladen werden: '.$detail : 'Die Nextcloud-Ordner konnten nicht geladen werden.',
+      array('nc_nextcloud_url','nc_nextcloud_user','nc_nextcloud_password')
+    );
+  }
+
+  bratonien_tools_nc_source_picker_json(200, array(
+    'ok'=>true,
+    'message'=>'Nextcloud-Ordner wurden geladen. Die Auswahl wird geöffnet.',
+    'fields'=>array(),
+  ));
+}
+catch (Throwable $e)
+{
+  $message = trim($e->getMessage());
+  if ($message === '') $message = 'Die Nextcloud-Ordnerauswahl konnte nicht vorbereitet werden.';
+  bratonien_tools_nc_source_picker_fail(
+    $message,
+    array('nc_nextcloud_url','nc_nextcloud_user','nc_nextcloud_password')
+  );
+}

nc-connector-status.php

@@ -36,6 +36,11 @@ $latest = array(
   'api'=>array('state'=>'not_run','message'=>''),
   'fallback'=>array('state'=>'not_run','message'=>''),
   'error_detail'=>'',
+  'route'=>'',
+  'route_label'=>'Noch kein Datenweg erfasst',
+  'route_timestamp'=>0,
+  'route_time_label'=>'Nicht verfügbar',
+  'route_detail'=>'',
 );
 
 if (is_dir($dir))
@@ -57,6 +62,54 @@ if (is_dir($dir))
       $latest['connection_file'] = basename($file);
     }
   }
+
+  $route_file = $dir.'/route-status.json';
+  if (is_readable($route_file))
+  {
+    $route = json_decode((string)@file_get_contents($route_file), true);
+    if (is_array($route))
+    {
+      $route_name = (string)($route['route'] ?? '');
+      $route_timestamp = (int)($route['timestamp'] ?? 0);
+      $route_label = (string)($route['label'] ?? '');
+
+      if ($route_name === 'webdav')
+      {
+        $route_label = 'WEBDAV PRIMÄR';
+      }
+      elseif ($route_name === 'legacy_fallback')
+      {
+        $route_label = 'LEGACY-FALLBACK AKTIV';
+      }
+      elseif ($route_name === 'failed')
+      {
+        $route_label = 'FEHLER - KEIN ERFOLGREICHER DATENWEG';
+      }
+      elseif ($route_label === '')
+      {
+        $route_label = 'UNBEKANNTER DATENWEG';
+      }
+
+      $route_detail = trim((string)($route['detail'] ?? ''));
+      $latest['route'] = $route_name;
+      $latest['route_label'] = $route_label;
+      $latest['route_timestamp'] = $route_timestamp;
+      $latest['route_time_label'] = $route_timestamp > 0 ? date('d.m.Y H:i:s', $route_timestamp) : 'Nicht verfügbar';
+      $latest['route_detail'] = $route_detail;
+
+      $base_message = trim((string)($latest['message'] ?? ''));
+      $message_parts = array($route_label);
+      if ($route_name !== 'webdav' && $route_detail !== '')
+      {
+        $message_parts[] = $route_detail;
+      }
+      if ($base_message !== '')
+      {
+        $message_parts[] = $base_message;
+      }
+      $latest['message'] = implode(' · ', $message_parts);
+    }
+  }
 }
 
 if ((int)$latest['timestamp'] > 0)

runtime/build-webdav-media.sh

@@ -0,0 +1,70 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+umask 0002
+
+CONFIG_FILE="${PIWIGO_CONFIG:-}"
+[[ -n "$CONFIG_FILE" && -r "$CONFIG_FILE" ]] || { echo "WebDAV-Konfiguration fehlt: ${CONFIG_FILE:-<leer>}" >&2; exit 1; }
+
+# shellcheck source=/dev/null
+source "$CONFIG_FILE"
+
+: "${PIWIGO_ROOT:?PIWIGO_ROOT fehlt}"
+: "${CONNECTION_ID:?CONNECTION_ID fehlt}"
+: "${WEBDAV_BASE_URL:?WEBDAV_BASE_URL fehlt}"
+: "${WEBDAV_USER:?WEBDAV_USER fehlt}"
+: "${WEBDAV_PASSWORD_FILE:?WEBDAV_PASSWORD_FILE fehlt}"
+: "${WEBDAV_MAPPING_FILE:?WEBDAV_MAPPING_FILE fehlt}"
+: "${STATE_DIR:?STATE_DIR fehlt}"
+
+SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+LOCK_FILE="$STATE_DIR/webdav-media.lock"
+mkdir -p -- "$STATE_DIR"
+exec 9>"$LOCK_FILE"
+flock -n 9 || exit 0
+
+PREVIEW_CACHE="$PIWIGO_ROOT/_data/bratonien-tools/nc-webdav-preview/connection-$CONNECTION_ID"
+SOURCE_CACHE="$PIWIGO_ROOT/_data/bratonien-tools/nc-webdav-gallery/connection-$CONNECTION_ID"
+DERIVATIVE_CACHE="$PIWIGO_ROOT/_data/i/_data/bratonien-tools/nc-webdav-gallery/connection-$CONNECTION_ID"
+PIWIGO_DATA="$PIWIGO_ROOT/_data"
+
+normalize_connector_cache_permissions() {
+    [[ -d "$PIWIGO_DATA" ]] || return 0
+
+    local data_uid data_gid current_uid path
+    data_uid="$(stat -c '%u' "$PIWIGO_DATA")"
+    data_gid="$(stat -c '%g' "$PIWIGO_DATA")"
+    current_uid="$(id -u)"
+
+    for path in "$SOURCE_CACHE" "$PREVIEW_CACHE" "$DERIVATIVE_CACHE"; do
+        [[ -e "$path" ]] || continue
+
+        if [[ "$current_uid" -eq 0 ]]; then
+            chown -R "$data_uid:$data_gid" -- "$path"
+        fi
+
+        if ! find "$path" -type d -exec chmod 2775 {} + 2>/dev/null; then
+            echo "Hinweis: Verzeichnisrechte konnten ohne Root-Rechte nicht vollständig repariert werden: $path" >&2
+        fi
+        if ! find "$path" -type f -exec chmod 0664 {} + 2>/dev/null; then
+            echo "Hinweis: Dateirechte konnten ohne Root-Rechte nicht vollständig repariert werden: $path" >&2
+        fi
+    done
+}
+
+# Altbestände aus früheren root/systemd-Läufen werden repariert, sobald dieser
+# Lauf mit ausreichenden Rechten ausgeführt wird. Bei normalen Webserver-Läufen
+# werden zumindest alle eigenen Dateien gruppenschreibbar gehalten.
+normalize_connector_cache_permissions
+
+php "$SCRIPT_DIR/lib/precache-webdav-previews.php" \
+    --mapping="$WEBDAV_MAPPING_FILE" \
+    --base-url="$WEBDAV_BASE_URL" \
+    --user="$WEBDAV_USER" \
+    --password-file="$WEBDAV_PASSWORD_FILE" \
+    --cache-dir="$PREVIEW_CACHE"
+
+php "$SCRIPT_DIR/lib/build-webdav-derivatives.php" \
+    --piwigo-root="$PIWIGO_ROOT" \
+    --connection-id="$CONNECTION_ID"
+
+normalize_connector_cache_permissions

runtime/cleanup-stale.php

@@ -0,0 +1,86 @@
+#!/usr/bin/env php
+<?php
+if (PHP_SAPI !== 'cli')
+{
+  fwrite(STDERR, "CLI only\n");
+  exit(1);
+}
+
+$pluginRoot = dirname(__DIR__);
+$piwigoRoot = dirname($pluginRoot, 2);
+$dbConfig = $piwigoRoot.'/local/config/database.inc.php';
+$configDir = '/etc/bratonien-tools/nc-connector';
+$stateRoot = '/var/lib/bratonien-tools/nc-connector';
+
+function cleanup_fail($message)
+{
+  fwrite(STDERR, $message."\n");
+  exit(1);
+}
+
+function cleanup_tree($path)
+{
+  $path = rtrim((string)$path, '/');
+  if ($path === '' || $path === '/' || !file_exists($path)) return;
+  if (is_link($path) || is_file($path))
+  {
+    @unlink($path);
+    return;
+  }
+  $items = @scandir($path);
+  if (!is_array($items)) return;
+  foreach ($items as $item)
+  {
+    if ($item === '.' || $item === '..') continue;
+    cleanup_tree($path.'/'.$item);
+  }
+  @rmdir($path);
+}
+
+if (!is_readable($dbConfig)) cleanup_fail('Piwigo-Datenbankkonfiguration ist nicht lesbar.');
+$conf = array();
+$prefixeTable = 'piwigo_';
+require $dbConfig;
+foreach (array('db_host','db_user','db_password','db_base') as $key)
+{
+  if (!isset($conf[$key])) cleanup_fail('Piwigo-Datenbankkonfiguration ist unvollstaendig: '.$key);
+}
+
+$db = new mysqli($conf['db_host'], $conf['db_user'], $conf['db_password'], $conf['db_base']);
+if ($db->connect_errno) cleanup_fail('Piwigo-Datenbank ist nicht erreichbar: '.$db->connect_error);
+$db->set_charset('utf8mb4');
+
+$table = $prefixeTable.'bratonien_tools_nc_connections';
+$escapedTable = $db->real_escape_string($table);
+$exists = $db->query("SHOW TABLES LIKE '{$escapedTable}'");
+if (!$exists) cleanup_fail('Connector-Tabelle konnte nicht geprüft werden: '.$db->error);
+if ($exists->num_rows === 0) exit(0);
+
+$activeIds = array();
+$result = $db->query("SELECT id FROM `{$table}`");
+if (!$result) cleanup_fail('Connector-Verbindungen konnten nicht gelesen werden: '.$db->error);
+while ($row = $result->fetch_assoc())
+{
+  $activeIds[(int)$row['id']] = true;
+}
+
+if (!is_dir($configDir)) exit(0);
+foreach (glob($configDir.'/connection-*.conf') ?: array() as $configPath)
+{
+  if (!preg_match('/connection-([0-9]+)\.conf$/', $configPath, $matches)) continue;
+  $id = (int)$matches[1];
+  if (isset($activeIds[$id])) continue;
+
+  echo "NC Connector: entferne verwaiste Laufzeitdateien fuer Verbindung {$id}.\n";
+  foreach (array('.conf','.db-password','.piwigo-password','.storages.tsv','.roots.tsv') as $suffix)
+  {
+    @unlink($configDir.'/connection-'.$id.$suffix);
+  }
+  cleanup_tree($stateRoot.'/connection-'.$id);
+
+  $statusDir = rtrim($piwigoRoot, '/').'/_data/bratonien-tools/nc-connector-status';
+  @unlink($statusDir.'/connection-'.$id.'.json');
+  @unlink($statusDir.'/deleted-'.$id);
+}
+
+exit(0);

runtime/cleanup-webdav-piwigo.php

@@ -0,0 +1,169 @@
+#!/usr/bin/env php
+<?php
+if (PHP_SAPI !== 'cli')
+{
+  fwrite(STDERR, "CLI only\n");
+  exit(1);
+}
+
+$pluginRoot = dirname(__DIR__);
+$piwigoRoot = dirname($pluginRoot, 2);
+define('PHPWG_ROOT_PATH', rtrim($piwigoRoot, '/').'/');
+
+$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
+$_SERVER['SERVER_ADDR'] = '127.0.0.1';
+$_SERVER['SERVER_NAME'] = 'localhost';
+$_SERVER['HTTP_HOST'] = 'localhost';
+$_SERVER['SERVER_PORT'] = '80';
+$_SERVER['REQUEST_METHOD'] = 'GET';
+$_SERVER['REQUEST_URI'] = '/';
+$_SERVER['SCRIPT_NAME'] = '/plugins/bratonien_tools/runtime/cleanup-webdav-piwigo.php';
+$_SERVER['PHP_SELF'] = $_SERVER['SCRIPT_NAME'];
+$_SERVER['QUERY_STRING'] = '';
+$_SERVER['HTTPS'] = 'off';
+
+require_once(PHPWG_ROOT_PATH.'include/common.inc.php');
+require_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
+
+function bratonien_cleanup_tree($path, $allowed_root)
+{
+  $path = rtrim((string)$path, '/');
+  $allowed_root = rtrim((string)$allowed_root, '/');
+  if ($path === '' || $allowed_root === '' || strpos($path, $allowed_root.'/') !== 0 || !file_exists($path)) return;
+
+  if (is_link($path) || is_file($path))
+  {
+    @unlink($path);
+    return;
+  }
+
+  $items = @scandir($path);
+  if (!is_array($items)) return;
+  foreach ($items as $item)
+  {
+    if ($item === '.' || $item === '..') continue;
+    bratonien_cleanup_tree($path.'/'.$item, $allowed_root);
+  }
+  @rmdir($path);
+}
+
+function bratonien_webdav_site_images($site_id)
+{
+  $rows = array();
+  $query = '
+SELECT DISTINCT i.id, i.path, i.representative_ext
+  FROM '.IMAGES_TABLE.' AS i
+  LEFT JOIN '.CATEGORIES_TABLE.' AS sc ON sc.id = i.storage_category_id
+  LEFT JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON ic.image_id = i.id
+  LEFT JOIN '.CATEGORIES_TABLE.' AS vc ON vc.id = ic.category_id
+  WHERE sc.site_id = '.(int)$site_id.' OR vc.site_id = '.(int)$site_id.'
+;';
+  $result = pwg_query($query);
+  while ($row = pwg_db_fetch_assoc($result))
+  {
+    $row['id'] = (int)$row['id'];
+    $rows[$row['id']] = $row;
+  }
+  return $rows;
+}
+
+try
+{
+  $connection_table = function_exists('bratonien_tools_nc_connector_table')
+    ? bratonien_tools_nc_connector_table()
+    : $GLOBALS['prefixeTable'].'bratonien_tools_nc_connections';
+
+  $active = array();
+  $exists = pwg_query("SHOW TABLES LIKE '".pwg_db_real_escape_string($connection_table)."'");
+  if (pwg_db_num_rows($exists))
+  {
+    $result = pwg_query("SELECT id FROM `".$connection_table."`");
+    while ($row = pwg_db_fetch_assoc($result))
+    {
+      $active[(int)$row['id']] = true;
+    }
+  }
+
+  $site_prefix = './_data/bratonien-tools/nc-webdav-gallery/connection-';
+  $result = pwg_query(
+    "SELECT id, galleries_url FROM ".SITES_TABLE.
+    " WHERE galleries_url LIKE '".pwg_db_real_escape_string($site_prefix)."%'"
+  );
+
+  $removed_sites = 0;
+  $removed_images = 0;
+  while ($site = pwg_db_fetch_assoc($result))
+  {
+    $site_id = (int)$site['id'];
+    $site_url = (string)$site['galleries_url'];
+    if (!preg_match('#^\./_data/bratonien-tools/nc-webdav-gallery/connection-([0-9]+)/$#', $site_url, $match)) continue;
+
+    $connection_id = (int)$match[1];
+    if ($connection_id < 1 || isset($active[$connection_id])) continue;
+
+    $images = bratonien_webdav_site_images($site_id);
+    foreach ($images as $row)
+    {
+      try
+      {
+        delete_element_derivatives($row);
+      }
+      catch (Throwable $e)
+      {
+        fwrite(STDERR, 'WebDAV-Cleanup: Derivate von Bild #'.(int)$row['id'].' konnten nicht vollständig entfernt werden: '.$e->getMessage()."\n");
+      }
+    }
+
+    delete_site($site_id);
+
+    if ($images)
+    {
+      $ids = array_keys($images);
+      $remaining = query2array(
+        'SELECT id FROM '.IMAGES_TABLE.' WHERE id IN ('.implode(',', array_map('intval', $ids)).')',
+        null,
+        'id'
+      );
+      if ($remaining)
+      {
+        delete_elements(array_map('intval', $remaining), false);
+      }
+    }
+
+    $removed_sites++;
+    $removed_images += count($images);
+    echo 'NC WebDAV: entferne verwaiste Piwigo-Site '.$site_id.' für gelöschte Verbindung '.$connection_id.".\n";
+
+    $gallery_root = PHPWG_ROOT_PATH.'_data/bratonien-tools/nc-webdav-gallery';
+    $source_root = PHPWG_ROOT_PATH.'_data/bratonien-tools/nc-webdav-source';
+    $preview_root = PHPWG_ROOT_PATH.'_data/bratonien-tools/nc-webdav-preview';
+    bratonien_cleanup_tree($gallery_root.'/connection-'.$connection_id, $gallery_root);
+    bratonien_cleanup_tree($source_root.'/connection-'.$connection_id, $source_root);
+    bratonien_cleanup_tree($preview_root.'/connection-'.$connection_id, $preview_root);
+
+    $state_root = '/var/lib/bratonien-tools/nc-connector';
+    bratonien_cleanup_tree($state_root.'/connection-'.$connection_id, $state_root);
+
+    foreach (glob('/etc/bratonien-tools/nc-connector/webdav-connection-'.$connection_id.'.*') ?: array() as $file)
+    {
+      @unlink($file);
+    }
+
+    $status_root = PHPWG_ROOT_PATH.'_data/bratonien-tools/nc-connector-status';
+    @unlink($status_root.'/connection-'.$connection_id.'.json');
+    @unlink($status_root.'/deleted-'.$connection_id);
+  }
+
+  if ($removed_sites > 0)
+  {
+    invalidate_user_cache(true);
+  }
+
+  echo 'NC WebDAV Piwigo-Cleanup: sites='.$removed_sites.' bilder='.$removed_images."\n";
+  exit(0);
+}
+catch (Throwable $e)
+{
+  fwrite(STDERR, 'NC WebDAV Piwigo-Cleanup: '.$e->getMessage()."\n");
+  exit(1);
+}

runtime/lib/build-webdav-derivatives.php

@@ -0,0 +1,273 @@
+#!/usr/bin/env php
+<?php
+if (PHP_SAPI !== 'cli')
+{
+  fwrite(STDERR, "CLI only\n");
+  exit(1);
+}
+
+const BRATONIEN_WEBDAV_DERIVATIVE_BUILDER_VERSION = '0.9.7.8';
+
+$options = getopt('', array('piwigo-root:', 'connection-id:'));
+$piwigo_root = rtrim((string)($options['piwigo-root'] ?? ''), '/');
+$connection_id = (int)($options['connection-id'] ?? 0);
+if ($piwigo_root === '' || $connection_id < 1)
+{
+  fwrite(STDERR, "Parameter --piwigo-root und --connection-id werden benoetigt.\n");
+  exit(1);
+}
+if (!is_dir($piwigo_root))
+{
+  fwrite(STDERR, "Piwigo-Root wurde nicht gefunden.\n");
+  exit(1);
+}
+
+define('PHPWG_ROOT_PATH', $piwigo_root.'/');
+$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
+$_SERVER['SERVER_ADDR'] = '127.0.0.1';
+$_SERVER['SERVER_NAME'] = 'localhost';
+$_SERVER['HTTP_HOST'] = 'localhost';
+$_SERVER['SERVER_PORT'] = '80';
+$_SERVER['REQUEST_METHOD'] = 'GET';
+$_SERVER['REQUEST_URI'] = '/';
+$_SERVER['SCRIPT_NAME'] = '/plugins/bratonien_tools/runtime/lib/build-webdav-derivatives.php';
+$_SERVER['PHP_SELF'] = $_SERVER['SCRIPT_NAME'];
+$_SERVER['QUERY_STRING'] = '';
+$_SERVER['HTTP_USER_AGENT'] = 'Bratonien-WebDAV-Derivative-Builder/'.BRATONIEN_WEBDAV_DERIVATIVE_BUILDER_VERSION;
+$_SERVER['HTTPS'] = 'off';
+
+require_once(PHPWG_ROOT_PATH.'include/common.inc.php');
+require_once(PHPWG_ROOT_PATH.'include/derivative.inc.php');
+require_once(PHPWG_ROOT_PATH.'admin/include/image.class.php');
+
+if (!function_exists('bratonien_tools_webdav_image_source_info') || !function_exists('bratonien_tools_webdav_generate_derivative'))
+{
+  fwrite(STDERR, "Bratonien WebDAV-Bildruntime ist nicht aktiv.\n");
+  exit(1);
+}
+
+function bratonien_tools_webdav_modus_config()
+{
+  global $conf;
+
+  $modus = $conf['modus_theme'] ?? array();
+  if (is_string($modus) && $modus !== '')
+  {
+    $decoded = @unserialize($modus);
+    if (is_array($decoded)) $modus = $decoded;
+  }
+  if (!is_array($modus)) $modus = array();
+
+  return array_merge(
+    array(
+      'index_photo_deriv'=>'2small',
+      'index_photo_deriv_hdpi'=>'xsmall',
+    ),
+    $modus
+  );
+}
+
+function bratonien_tools_webdav_gallery_base_params()
+{
+  $modus = bratonien_tools_webdav_modus_config();
+  $type = trim((string)($modus['index_photo_deriv'] ?? '2small'));
+  $params = $type !== '' ? @ImageStdParams::get_by_type($type) : null;
+  if ($params) return $params;
+
+  $params = ImageStdParams::get_by_type(IMG_THUMB);
+  if (!$params)
+  {
+    throw new RuntimeException('Piwigo-Galeriederivat ist nicht konfiguriert.');
+  }
+  return $params;
+}
+
+function bratonien_tools_webdav_modus_gallery_params(SrcImage $src, $base_params)
+{
+  $row_height = (int)$base_params->max_height();
+  $candidates = array($base_params);
+
+  foreach (ImageStdParams::get_defined_type_map() as $params)
+  {
+    if (
+      $params->max_height() > $row_height
+      && $params->sizing->max_crop == $base_params->sizing->max_crop
+    )
+    {
+      $candidates[] = $params;
+      if (count($candidates) === 3) break;
+    }
+  }
+
+  $selected = $base_params;
+  foreach ($candidates as $params)
+  {
+    $selected = $params;
+    $probe = new DerivativeImage($params, $src);
+    $size = $probe->get_size();
+    if ((int)$size[1] >= $row_height - 2) break;
+  }
+
+  return $selected;
+}
+
+try
+{
+  $gallery_base_params = bratonien_tools_webdav_gallery_base_params();
+  $gallery_base_type = (string)$gallery_base_params->type;
+
+  $images = 0;
+  $generated_or_ready = 0;
+  $identity = 0;
+  $metadata_repaired = 0;
+  $legacy_derivatives_rebuilt = 0;
+  $errors = 0;
+  $error_lines = array();
+  $variant_counts = array();
+
+  $result = pwg_query('SELECT * FROM '.IMAGES_TABLE.' ORDER BY id');
+  while ($row = pwg_db_fetch_assoc($result))
+  {
+    $image_id = (int)$row['id'];
+    $info = bratonien_tools_webdav_image_source_info($image_id);
+    if (!$info || (int)$info['connection_id'] !== $connection_id) continue;
+
+    $images++;
+    $preview = bratonien_tools_webdav_preview_path($info);
+    if (!$preview)
+    {
+      $errors++;
+      $error_lines[] = 'Bild #'.$image_id.': vorbereitetes WebDAV-Preview fehlt.';
+      continue;
+    }
+
+    $preview_ext = strtolower(pathinfo($preview, PATHINFO_EXTENSION));
+    if (!in_array($preview_ext, array('jpg', 'jpeg', 'png', 'gif'), true))
+    {
+      $errors++;
+      $error_lines[] = 'Bild #'.$image_id.': Preview-Format '.$preview_ext.' ist nicht Piwigo-kompatibel; Precache muss neu erzeugt werden.';
+      continue;
+    }
+
+    $size = @getimagesize($preview);
+    if (!is_array($size) || empty($size[0]) || empty($size[1]))
+    {
+      $errors++;
+      $error_lines[] = 'Bild #'.$image_id.': Preview ist kein lesbares Bild: '.$preview;
+      continue;
+    }
+
+    $preview_width = (int)$size[0];
+    $preview_height = (int)$size[1];
+    if ((int)($row['width'] ?? 0) !== $preview_width || (int)($row['height'] ?? 0) !== $preview_height || (int)($row['rotation'] ?? 0) !== 0)
+    {
+      pwg_query(
+        'UPDATE '.IMAGES_TABLE.
+        ' SET width='.$preview_width.', height='.$preview_height.', rotation=0'.
+        ' WHERE id='.$image_id
+      );
+      $row['width'] = $preview_width;
+      $row['height'] = $preview_height;
+      $row['rotation'] = 0;
+      $metadata_repaired++;
+    }
+
+    $src = new SrcImage($row);
+    try
+    {
+      $gallery_params = bratonien_tools_webdav_modus_gallery_params($src, $gallery_base_params);
+      $variant = (string)$gallery_params->type;
+      if ($variant === '') $variant = 'custom';
+      $variant_counts[$variant] = ($variant_counts[$variant] ?? 0) + 1;
+
+      $probe = new DerivativeImage($gallery_params, $src);
+      if ($probe->same_as_source())
+      {
+        $identity++;
+        continue;
+      }
+
+      $target = $probe->get_path();
+      if ($target !== '' && is_file($target) && is_readable($target))
+      {
+        $expected_size = $gallery_params->compute_final_size(array($preview_width, $preview_height));
+        $existing_size = @getimagesize($target);
+        if (
+          is_array($expected_size)
+          && isset($expected_size[0], $expected_size[1])
+          && is_array($existing_size)
+          && isset($existing_size[0], $existing_size[1])
+          && ((int)$existing_size[0] !== (int)$expected_size[0] || (int)$existing_size[1] !== (int)$expected_size[1])
+        )
+        {
+          if (!@unlink($target))
+          {
+            $errors++;
+            $error_lines[] = 'Bild #'.$image_id.' Galerie: falsches Alt-Derivat konnte nicht entfernt werden: '.$target;
+            continue;
+          }
+          $legacy_derivatives_rebuilt++;
+        }
+      }
+
+      $detail = '';
+      if (bratonien_tools_webdav_generate_derivative($gallery_params, $src, $detail))
+      {
+        $generated_or_ready++;
+      }
+      else
+      {
+        $errors++;
+        $error_lines[] = 'Bild #'.$image_id.' Galerie: '.($detail !== '' ? $detail : 'Galeriederivat konnte nicht erzeugt werden.');
+      }
+    }
+    catch (Throwable $e)
+    {
+      $errors++;
+      $error_lines[] = 'Bild #'.$image_id.' Galerie: '.get_class($e).': '.$e->getMessage();
+    }
+  }
+
+  if ($metadata_repaired > 0)
+  {
+    update_category('all');
+    invalidate_user_cache(true);
+  }
+
+  if ($errors > 0)
+  {
+    foreach (array_slice($error_lines, 0, 30) as $line)
+    {
+      fwrite(STDERR, $line."\n");
+    }
+    if (count($error_lines) > 30)
+    {
+      fwrite(STDERR, 'Weitere Fehler: '.(count($error_lines) - 30)."\n");
+    }
+  }
+
+  ksort($variant_counts);
+  $variant_parts = array();
+  foreach ($variant_counts as $type=>$count)
+  {
+    $variant_parts[] = $type.':'.$count;
+  }
+
+  echo 'WebDAV-Derivative-Builder: version='.BRATONIEN_WEBDAV_DERIVATIVE_BUILDER_VERSION.
+    ' bilder='.$images.
+    ' varianten_pro_bild=1'.
+    ' modus_basis='.$gallery_base_type.
+    ' modus_varianten='.implode(',', $variant_parts).
+    ' bereit='.$generated_or_ready.
+    ' identisch='.$identity.
+    ' metadaten_repariert='.$metadata_repaired.
+    ' alt_derivate_neu='.$legacy_derivatives_rebuilt.
+    ' fehler='.$errors."\n";
+
+  exit($errors > 0 ? 1 : 0);
+}
+catch (Throwable $e)
+{
+  fwrite(STDERR, 'WebDAV-Derivate: '.get_class($e).': '.$e->getMessage()."\n");
+  exit(1);
+}

runtime/lib/build_webdav_placeholder_source.py

@@ -0,0 +1,359 @@
+#!/usr/bin/env python3
+"""Build a placeholder-backed local source tree from Nextcloud WebDAV.
+
+This creates only tiny placeholder files plus a metadata mapping; no Nextcloud
+original media is downloaded. The authenticated Nextcloud user is never used as
+an album name.
+"""
+
+from __future__ import annotations
+
+import argparse
+import base64
+import getpass
+import json
+import os
+import shutil
+import socket
+import ssl
+import sys
+import tempfile
+import urllib.error
+import urllib.parse
+import urllib.request
+import xml.etree.ElementTree as ET
+from contextlib import contextmanager
+from pathlib import Path, PurePosixPath
+
+DAV = "DAV:"
+OC = "http://owncloud.org/ns"
+SUPPORTED_IMAGE_EXTENSIONS = {".jpg", ".jpeg", ".png", ".gif", ".webp"}
+PLACEHOLDER = base64.b64decode("R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==")
+
+
+def fail(message: str) -> None:
+    raise RuntimeError(message)
+
+
+def validate_relative(value: str) -> str:
+    value = str(value).strip("/")
+    parts = PurePosixPath(value).parts
+    if ".." in parts:
+        raise ValueError(f"unsafe WebDAV path: {value!r}")
+    return value
+
+
+def quote_path(value: str) -> str:
+    value = validate_relative(value)
+    return "/".join(urllib.parse.quote(part, safe="") for part in PurePosixPath(value).parts)
+
+
+def safe_local_name(name: str) -> str:
+    if not name or name in {".", ".."} or "/" in name or "\x00" in name:
+        raise ValueError(f"unsafe remote name: {name!r}")
+    return name
+
+
+@contextmanager
+def pinned_resolution(host: str, ip: str):
+    host = host.strip("[]").lower()
+    ip = ip.strip("[]")
+    if not host or not ip or host == ip:
+        yield
+        return
+
+    original = socket.getaddrinfo
+
+    def resolve(name, port, family=0, type=0, proto=0, flags=0):
+        normalized = str(name).strip("[]").lower()
+        if normalized == host:
+            return original(ip, port, family, type, proto, flags)
+        return original(name, port, family, type, proto, flags)
+
+    socket.getaddrinfo = resolve
+    try:
+        yield
+    finally:
+        socket.getaddrinfo = original
+
+
+class WebDavClient:
+    def __init__(self, base_url: str, user: str, password: str, timeout: int = 30, connect_ip: str = "") -> None:
+        self.base_url = base_url.rstrip("/")
+        parsed = urllib.parse.urlparse(self.base_url)
+        if parsed.scheme not in {"http", "https"} or not parsed.hostname:
+            fail("Nextcloud base URL must use HTTP or HTTPS and contain a host")
+        self.host = parsed.hostname.strip("[]")
+        self.connect_ip = connect_ip.strip("[]") or self.host
+        self.user = user
+        self.password = password
+        self.timeout = timeout
+        token = base64.b64encode(f"{user}:{password}".encode("utf-8")).decode("ascii")
+        self.auth_header = f"Basic {token}"
+        self.context = ssl.create_default_context()
+
+    def collection_url(self, relative: str) -> str:
+        user = urllib.parse.quote(self.user, safe="")
+        suffix = quote_path(relative)
+        url = f"{self.base_url}/remote.php/dav/files/{user}/"
+        if suffix:
+            url += suffix + "/"
+        return url
+
+    def list_collection(self, relative: str) -> tuple[dict[str, object], list[dict[str, object]]]:
+        relative = validate_relative(relative)
+        url = self.collection_url(relative)
+        body = (
+            '<?xml version="1.0"?>'
+            '<d:propfind xmlns:d="DAV:" xmlns:oc="http://owncloud.org/ns">'
+            '<d:prop><d:displayname/><d:resourcetype/><d:getcontenttype/>'
+            '<d:getcontentlength/><d:getetag/><oc:fileid/></d:prop></d:propfind>'
+        ).encode("utf-8")
+        request = urllib.request.Request(url, data=body, method="PROPFIND")
+        request.add_header("Authorization", self.auth_header)
+        request.add_header("Depth", "1")
+        request.add_header("Content-Type", "application/xml; charset=utf-8")
+        try:
+            with pinned_resolution(self.host, self.connect_ip):
+                with urllib.request.urlopen(request, timeout=self.timeout, context=self.context) as response:
+                    status = response.status
+                    payload = response.read()
+        except urllib.error.HTTPError as error:
+            if error.code in {401, 403}:
+                fail("Nextcloud rejected the WebDAV credentials or directory access")
+            fail(f"Nextcloud PROPFIND failed with HTTP {error.code}")
+        except urllib.error.URLError as error:
+            fail(f"Nextcloud WebDAV is unreachable: {error.reason}")
+        if status != 207:
+            fail(f"Nextcloud PROPFIND returned HTTP {status}")
+
+        base_path = urllib.parse.unquote(urllib.parse.urlparse(url).path).rstrip("/")
+        current: dict[str, object] | None = None
+        children: list[dict[str, object]] = []
+        try:
+            root = ET.fromstring(payload)
+        except ET.ParseError as error:
+            raise RuntimeError("Nextcloud returned invalid WebDAV XML") from error
+
+        for response in root.findall(f"{{{DAV}}}response"):
+            href = response.findtext(f"{{{DAV}}}href", default="")
+            href_path = urllib.parse.unquote(urllib.parse.urlparse(href).path).rstrip("/")
+            prop = None
+            for propstat in response.findall(f"{{{DAV}}}propstat"):
+                status_text = propstat.findtext(f"{{{DAV}}}status", default="")
+                if " 200 " in status_text:
+                    prop = propstat.find(f"{{{DAV}}}prop")
+                    if prop is not None:
+                        break
+            if prop is None:
+                continue
+            display = prop.findtext(f"{{{DAV}}}displayname", default="")
+            fileid_text = prop.findtext(f"{{{OC}}}fileid", default="").strip()
+            resource_type = prop.find(f"{{{DAV}}}resourcetype")
+            is_dir = resource_type is not None and resource_type.find(f"{{{DAV}}}collection") is not None
+            item = {
+                "display_name": display,
+                "fileid": int(fileid_text) if fileid_text.isdigit() else 0,
+                "is_dir": is_dir,
+                "content_type": prop.findtext(f"{{{DAV}}}getcontenttype", default=""),
+                "size": int(prop.findtext(f"{{{DAV}}}getcontentlength", default="0") or 0),
+                "etag": prop.findtext(f"{{{DAV}}}getetag", default="").strip('"'),
+            }
+            if href_path == base_path:
+                current = item
+                continue
+            if display:
+                children.append(item)
+        if current is None or int(current.get("fileid", 0)) < 1:
+            fail(f"Nextcloud returned no stable fileid for {relative or '/'}")
+        return current, children
+
+
+def link_placeholder(seed: Path, target: Path) -> None:
+    target.parent.mkdir(parents=True, exist_ok=True)
+    try:
+        os.link(seed, target)
+    except OSError:
+        target.write_bytes(PLACEHOLDER)
+
+
+def build_root(client: WebDavClient, remote_root: str, local_root: Path, seed: Path, mapping: dict[str, dict[str, object]]) -> tuple[int, int, int]:
+    files = 0
+    folders = 0
+    skipped = 0
+    stack: list[tuple[str, Path]] = [(validate_relative(remote_root), local_root)]
+    visited: set[str] = set()
+
+    while stack:
+        remote_dir, local_dir = stack.pop()
+        if remote_dir in visited:
+            continue
+        visited.add(remote_dir)
+        current, children = client.list_collection(remote_dir)
+        local_dir.mkdir(parents=True, exist_ok=True)
+        folders += 1
+        mapping[str(local_dir)] = {
+            "kind": "folder",
+            "fileid": int(current["fileid"]),
+            "webdav_path": remote_dir,
+            "display_name": str(current.get("display_name", "")),
+        }
+
+        for child in children:
+            name = safe_local_name(str(child["display_name"]))
+            child_remote = name if remote_dir == "" else f"{remote_dir}/{name}"
+            child_local = local_dir / name
+            if bool(child["is_dir"]):
+                stack.append((child_remote, child_local))
+                continue
+            extension = Path(name).suffix.lower()
+            if extension not in SUPPORTED_IMAGE_EXTENSIONS:
+                skipped += 1
+                continue
+            link_placeholder(seed, child_local)
+            files += 1
+            mapping[str(child_local)] = {
+                "kind": "file",
+                "fileid": int(child.get("fileid", 0)),
+                "webdav_path": child_remote,
+                "display_name": name,
+                "content_type": str(child.get("content_type", "")),
+                "size": int(child.get("size", 0)),
+                "etag": str(child.get("etag", "")),
+            }
+    return files, folders, skipped
+
+
+def atomic_json(path: Path, payload: object) -> None:
+    path.parent.mkdir(parents=True, exist_ok=True)
+    with tempfile.NamedTemporaryFile("w", encoding="utf-8", dir=path.parent, delete=False) as handle:
+        json.dump(payload, handle, ensure_ascii=False, indent=2, sort_keys=True)
+        handle.write("\n")
+        temporary = Path(handle.name)
+    temporary.replace(path)
+
+
+def atomic_text(path: Path, text: str) -> None:
+    path.parent.mkdir(parents=True, exist_ok=True)
+    with tempfile.NamedTemporaryFile("w", encoding="utf-8", dir=path.parent, delete=False) as handle:
+        handle.write(text)
+        temporary = Path(handle.name)
+    temporary.replace(path)
+
+
+def main() -> int:
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--base-url", required=True)
+    parser.add_argument("--connect-ip", default="", help="IP address used for the TCP connection while preserving the URL host for HTTP Host and TLS SNI")
+    parser.add_argument("--user", required=True)
+    parser.add_argument("--password-file", type=Path)
+    parser.add_argument("--root", action="append", required=True, help="WebDAV path relative to the authenticated user's files root")
+    parser.add_argument("--source-dir", required=True, type=Path)
+    parser.add_argument("--manifest", required=True, type=Path)
+    parser.add_argument("--mapping", required=True, type=Path)
+    parser.add_argument("--timeout", type=int, default=30)
+    args = parser.parse_args()
+
+    try:
+        if args.password_file:
+            password = args.password_file.read_text(encoding="utf-8").rstrip("\r\n")
+        else:
+            password = getpass.getpass("Nextcloud password: ")
+        if not password:
+            fail("Nextcloud password is empty")
+
+        source_dir = args.source_dir.resolve()
+        staging = source_dir.with_name(f".{source_dir.name}.next")
+        previous = source_dir.with_name(f".{source_dir.name}.previous")
+        seed = source_dir.parent / ".bratonien-webdav-placeholder.gif"
+        source_dir.parent.mkdir(parents=True, exist_ok=True)
+        seed.write_bytes(PLACEHOLDER)
+        os.chmod(seed, 0o644)
+        if staging.exists():
+            shutil.rmtree(staging)
+        staging.mkdir(parents=True)
+
+        client = WebDavClient(args.base_url, args.user, password, max(1, args.timeout), args.connect_ip)
+        mapping: dict[str, dict[str, object]] = {}
+        manifest: list[str] = []
+        total_files = total_folders = total_skipped = 0
+        used_fileids: set[int] = set()
+
+        for remote_root_raw in args.root:
+            remote_root = validate_relative(remote_root_raw)
+            current, root_children = client.list_collection(remote_root)
+            fileid = int(current["fileid"])
+            if fileid in used_fileids:
+                fail(f"duplicate selected Nextcloud root fileid: {fileid}")
+            used_fileids.add(fileid)
+            local_name = f"root-{fileid}"
+            local_root = staging / local_name
+            files, folders, skipped = build_root(client, remote_root, local_root, seed, mapping)
+            total_files += files
+            total_folders += folders
+            total_skipped += skipped
+
+            if remote_root == "":
+                for child in sorted(root_children, key=lambda item: str(item.get("display_name", "")).casefold()):
+                    name = safe_local_name(str(child.get("display_name", "")))
+                    child_fileid = int(child.get("fileid", 0))
+                    if child_fileid < 1:
+                        fail(f"Nextcloud returned no stable fileid for root child {name!r}")
+                    child_path = source_dir / local_name / name
+                    if bool(child.get("is_dir")):
+                        manifest.append(f"webdav:{child_fileid}\tfolder\t{name}\t{child_path}")
+                    elif Path(name).suffix.lower() in SUPPORTED_IMAGE_EXTENSIONS:
+                        manifest.append(f"webdav:{child_fileid}\tfile\t{name}\t{child_path}")
+                continue
+
+            display = str(current.get("display_name", "")).strip() or PurePosixPath(remote_root).name
+            manifest.append(f"webdav:{fileid}\tfolder\t{display}\t{source_dir / local_name}")
+
+        if previous.exists():
+            shutil.rmtree(previous)
+        if source_dir.exists():
+            source_dir.rename(previous)
+        try:
+            staging.rename(source_dir)
+        except Exception:
+            if source_dir.exists():
+                shutil.rmtree(source_dir)
+            if previous.exists():
+                previous.rename(source_dir)
+            raise
+        if previous.exists():
+            shutil.rmtree(previous)
+
+        final_mapping: dict[str, dict[str, object]] = {}
+        staging_text = str(staging)
+        source_text = str(source_dir)
+        for path, data in mapping.items():
+            final_path = source_text + path[len(staging_text):] if path.startswith(staging_text) else path
+            final_mapping[final_path] = data
+
+        atomic_text(args.manifest, "\n".join(manifest) + "\n")
+        atomic_json(args.mapping, {
+            "version": 1,
+            "base_url": args.base_url.rstrip("/"),
+            "connect_ip": client.connect_ip,
+            "user": args.user,
+            "files": final_mapping,
+        })
+        print(json.dumps({
+            "roots": len(args.root),
+            "files": total_files,
+            "folders": total_folders,
+            "skipped": total_skipped,
+            "connect_ip": client.connect_ip,
+            "source_dir": str(source_dir),
+            "manifest": str(args.manifest),
+            "mapping": str(args.mapping),
+        }, ensure_ascii=False))
+        return 0
+    except Exception as error:
+        print(f"webdav-placeholder: {error}", file=sys.stderr)
+        return 1
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())

runtime/lib/piwigo-sync.php

@@ -139,6 +139,39 @@ function decrypt_blob($blob, $hex_key)
   return (string)$plain;
 }
 
+function ensure_webdav_site(mysqli $db, $prefixeTable, $piwigo_root, array $connection_config, $connection_id)
+{
+  if ((string)($connection_config['source_mode'] ?? '') !== 'webdav-placeholder') return 1;
+
+  $gallery_root = rtrim((string)($connection_config['parallel_gallery_root'] ?? ''), '/');
+  if ($gallery_root === '') fail_sync('WebDAV-Galeriewurzel fehlt in der Verbindungskonfiguration.');
+  $piwigo_root = rtrim((string)$piwigo_root, '/');
+  if (strpos($gallery_root, $piwigo_root.'/') !== 0)
+  {
+    fail_sync('WebDAV-Galeriewurzel liegt ausserhalb der Piwigo-Installation.');
+  }
+  if (!is_dir($gallery_root)) fail_sync('WebDAV-Galeriewurzel existiert nicht: '.$gallery_root);
+
+  $relative = ltrim(substr($gallery_root, strlen($piwigo_root)), '/');
+  if ($relative === '') fail_sync('WebDAV-Galeriewurzel darf nicht dem Piwigo-Hauptverzeichnis entsprechen.');
+  $site_url = './'.rtrim($relative, '/').'/';
+  $escaped = $db->real_escape_string($site_url);
+  $result = $db->query("SELECT id FROM `{$prefixeTable}sites` WHERE galleries_url='{$escaped}' LIMIT 1");
+  if (!$result) fail_sync('Piwigo-Site konnte nicht gelesen werden: '.$db->error);
+  if ($result->num_rows)
+  {
+    return (int)$result->fetch_assoc()['id'];
+  }
+
+  if (!$db->query("INSERT INTO `{$prefixeTable}sites` (galleries_url) VALUES ('{$escaped}')"))
+  {
+    fail_sync('Piwigo-Site fuer WebDAV-Verbindung #'.$connection_id.' konnte nicht angelegt werden: '.$db->error);
+  }
+  $site_id = (int)$db->insert_id;
+  if ($site_id < 1) fail_sync('Piwigo-Site fuer WebDAV-Verbindung #'.$connection_id.' erhielt keine gueltige ID.');
+  return $site_id;
+}
+
 try
 {
   $options = getopt('', array('piwigo-root:', 'connection-id:', 'base-url:'));
@@ -173,6 +206,8 @@ try
   $connection_credentials = json_decode($connection_plain, true);
   if (!is_array($connection_credentials)) $connection_credentials = array();
 
+  $site_id = ensure_webdav_site($db, $prefixeTable, $piwigo_root, $connection_config, $connection_id);
+
   $api = array('key_id'=>'', 'key_secret'=>'');
   $connection_scoped = (string)($connection_config['piwigo_auth'] ?? '') === 'connection-scoped' || array_key_exists('api_enabled', $connection_config);
   if ($connection_scoped)
@@ -185,7 +220,6 @@ try
   }
   else
   {
-    // Nur fuer bereits aktive Altverbindungen: bisheriger globaler API-Zugang.
     $api_result = $db->query("SELECT value FROM `{$prefixeTable}config` WHERE param='bratonien_nc_piwigo_api' LIMIT 1");
     if ($api_result && $api_result->num_rows)
     {
@@ -216,11 +250,15 @@ try
         'Accept: application/json, text/xml;q=0.9',
         'Content-Type: application/x-www-form-urlencoded',
       );
-      decode_ws(http_request($base_url.'/ws.php?format=json', array('method'=>'bratonien.nc.syncProductive', 'site_id'=>1), $headers));
-      $orphan = decode_ws(http_request($base_url.'/ws.php?format=json', array('method'=>'bratonien.nc.syncOrphans', 'site_id'=>1, 'simulate'=>0), $headers));
+      decode_ws(http_request($base_url.'/ws.php?format=json', array('method'=>'bratonien.nc.syncProductive', 'site_id'=>$site_id), $headers));
+      $orphan = decode_ws(http_request($base_url.'/ws.php?format=json', array('method'=>'bratonien.nc.syncOrphans', 'site_id'=>$site_id, 'simulate'=>0), $headers));
+      if ($site_id !== 1)
+      {
+        decode_ws(http_request($base_url.'/ws.php?format=json', array('method'=>'bratonien.nc.syncOrphans', 'site_id'=>1, 'simulate'=>0), $headers));
+      }
       $added = (int)($orphan['added_orphans'] ?? 0);
       $deleted = (int)($orphan['deleted_orphans'] ?? 0);
-      echo "Piwigo-Synchronisierung per API erfolgreich\n";
+      echo "Piwigo-Synchronisierung per API erfolgreich (Site $site_id)\n";
       echo "Piwigo-Orphans synchronisiert: +$added / -$deleted\n";
       exit(0);
     }
@@ -244,16 +282,35 @@ try
   try
   {
     decode_ws(http_request($base_url.'/ws.php?format=json', array('method'=>'pwg.session.login', 'username'=>$fallback_user, 'password'=>$fallback_password), array(), $cookie_file));
-    http_request(
-      $base_url.'/admin.php?page=site_update&site=1',
-      array('sync'=>'files','display_info'=>1,'privacy_level'=>0,'sync_meta'=>1,'simulate'=>0,'subcats-included'=>1,'bratonien_connector'=>1,'submit'=>1),
+
+    // Der Fallback darf keinen zweiten Strukturpfad benutzen. Auch mit
+    // Benutzer/Passwort wird exakt derselbe Bratonien-Sync wie mit API-Key
+    // ausgefuehrt. Dadurch werden alte technische WebDAV-Kategorien entfernt
+    // und vorhandene Piwigo-Alben wiederverwendet.
+    decode_ws(http_request(
+      $base_url.'/ws.php?format=json',
+      array('method'=>'bratonien.nc.syncProductive', 'site_id'=>$site_id),
       array(),
       $cookie_file
-    );
-    $orphan = decode_ws(http_request($base_url.'/ws.php?format=json', array('method'=>'bratonien.nc.syncOrphans', 'site_id'=>1, 'simulate'=>0), array(), $cookie_file));
+    ));
+    $orphan = decode_ws(http_request(
+      $base_url.'/ws.php?format=json',
+      array('method'=>'bratonien.nc.syncOrphans', 'site_id'=>$site_id, 'simulate'=>0),
+      array(),
+      $cookie_file
+    ));
+    if ($site_id !== 1)
+    {
+      decode_ws(http_request(
+        $base_url.'/ws.php?format=json',
+        array('method'=>'bratonien.nc.syncOrphans', 'site_id'=>1, 'simulate'=>0),
+        array(),
+        $cookie_file
+      ));
+    }
     $added = (int)($orphan['added_orphans'] ?? 0);
     $deleted = (int)($orphan['deleted_orphans'] ?? 0);
-    echo "Piwigo-Datenbanksynchronisierung per Benutzername/Passwort-Fallback erfolgreich\n";
+    echo "Piwigo-Datenbanksynchronisierung per Benutzername/Passwort-Fallback erfolgreich (Site $site_id)\n";
     echo "Piwigo-Orphans synchronisiert: +$added / -$deleted\n";
   }
   finally

runtime/lib/precache-webdav-previews.php

@@ -0,0 +1,346 @@
+#!/usr/bin/env php
+<?php
+if (PHP_SAPI !== 'cli')
+{
+  fwrite(STDERR, "CLI only\n");
+  exit(1);
+}
+
+require_once(dirname(__DIR__, 2).'/include/nc_transport.inc.php');
+
+const BRATONIEN_WEBDAV_PREVIEW_VERSION = 2;
+const BRATONIEN_WEBDAV_PREVIEW_MAX_EDGE = 4096;
+const BRATONIEN_WEBDAV_PREVIEW_JPEG_QUALITY = 88;
+
+function fail_preview($message)
+{
+  throw new RuntimeException($message);
+}
+
+function quote_webdav_path($path)
+{
+  $parts = array_values(array_filter(explode('/', trim((string)$path, '/')), 'strlen'));
+  return implode('/', array_map('rawurlencode', $parts));
+}
+
+function fetch_remote_blob($url, $user, $password)
+{
+  $ch = curl_init($url);
+  $options = array(
+    CURLOPT_RETURNTRANSFER => true,
+    CURLOPT_FOLLOWLOCATION => false,
+    CURLOPT_CONNECTTIMEOUT => 10,
+    CURLOPT_TIMEOUT => 120,
+    CURLOPT_HTTPAUTH => CURLAUTH_BASIC,
+    CURLOPT_USERPWD => $user.':'.$password,
+    CURLOPT_FAILONERROR => false,
+    CURLOPT_USERAGENT => 'Bratonien-Tools-WebDAV-Precache/0.9.7.16',
+  );
+  bratonien_tools_nc_transport_apply_curl($options, $url);
+  curl_setopt_array($ch, $options);
+  $body = curl_exec($ch);
+  $errno = curl_errno($ch);
+  $error = curl_error($ch);
+  $http = (int)curl_getinfo($ch, CURLINFO_HTTP_CODE);
+  curl_close($ch);
+
+  if ($body === false || $errno !== 0) fail_preview('WebDAV-Bild konnte nicht geladen werden: '.$error);
+  if ($http < 200 || $http >= 300) fail_preview('WebDAV-Bild antwortete mit HTTP '.$http.'.');
+  if ($body === '') fail_preview('WebDAV-Bild ist leer.');
+  return (string)$body;
+}
+
+function preview_extension_for_entry(array $entry)
+{
+  $path = strtolower((string)($entry['webdav_path'] ?? ''));
+  $extension = strtolower(pathinfo($path, PATHINFO_EXTENSION));
+  if ($extension === 'png') return 'png';
+  if ($extension === 'gif') return 'gif';
+  if ($extension === 'webp') return 'webp';
+  return 'jpg';
+}
+
+function preview_target_for_entry($cache_dir, $key, array $entry)
+{
+  return $cache_dir.'/'.$key.'.'.preview_extension_for_entry($entry);
+}
+
+function remove_other_preview_format($cache_dir, $key, $keep_target)
+{
+  foreach (array('jpg', 'png', 'gif', 'webp') as $ext)
+  {
+    $candidate = $cache_dir.'/'.$key.'.'.$ext;
+    if ($candidate !== $keep_target && is_file($candidate)) @unlink($candidate);
+  }
+}
+
+function write_preview_imagick($blob, $target, $extension)
+{
+  $image = new Imagick();
+  try
+  {
+    $image->readImageBlob($blob);
+    if (method_exists($image, 'autoOrientImage')) @$image->autoOrientImage();
+    $image->setIteratorIndex(0);
+    $image->thumbnailImage(BRATONIEN_WEBDAV_PREVIEW_MAX_EDGE, BRATONIEN_WEBDAV_PREVIEW_MAX_EDGE, true, true);
+    $image->stripImage();
+
+    if ($extension === 'png')
+    {
+      $image->setImageFormat('png');
+    }
+    elseif ($extension === 'gif')
+    {
+      $image->setImageFormat('gif');
+    }
+    elseif ($extension === 'webp')
+    {
+      $image->setImageFormat('webp');
+      $image->setImageCompressionQuality(BRATONIEN_WEBDAV_PREVIEW_JPEG_QUALITY);
+    }
+    else
+    {
+      $image->setImageBackgroundColor('white');
+      if (method_exists($image, 'mergeImageLayers')) $image = $image->mergeImageLayers(Imagick::LAYERMETHOD_FLATTEN);
+      $image->setImageFormat('jpeg');
+      $image->setImageCompression(Imagick::COMPRESSION_JPEG);
+      $image->setImageCompressionQuality(BRATONIEN_WEBDAV_PREVIEW_JPEG_QUALITY);
+      $image->setInterlaceScheme(Imagick::INTERLACE_PLANE);
+    }
+
+    if (!$image->writeImage($target)) fail_preview('Imagick konnte das Preview nicht schreiben.');
+  }
+  finally
+  {
+    $image->clear();
+    $image->destroy();
+  }
+}
+
+function write_preview_gd($blob, $target, $extension)
+{
+  $source = @imagecreatefromstring($blob);
+  if (!$source) fail_preview('GD konnte das Bild nicht dekodieren.');
+
+  try
+  {
+    $width = imagesx($source);
+    $height = imagesy($source);
+    if ($width < 1 || $height < 1) fail_preview('Bildabmessungen sind ungültig.');
+
+    $scale = min(1, BRATONIEN_WEBDAV_PREVIEW_MAX_EDGE / $width, BRATONIEN_WEBDAV_PREVIEW_MAX_EDGE / $height);
+    $target_width = max(1, (int)round($width * $scale));
+    $target_height = max(1, (int)round($height * $scale));
+    $preview = imagecreatetruecolor($target_width, $target_height);
+    if (!$preview) fail_preview('GD konnte die Preview-Arbeitsfläche nicht anlegen.');
+
+    try
+    {
+      if (in_array($extension, array('png', 'gif', 'webp'), true))
+      {
+        imagealphablending($preview, false);
+        imagesavealpha($preview, true);
+        $transparent = imagecolorallocatealpha($preview, 0, 0, 0, 127);
+        imagefilledrectangle($preview, 0, 0, $target_width, $target_height, $transparent);
+      }
+      else
+      {
+        $white = imagecolorallocate($preview, 255, 255, 255);
+        imagefilledrectangle($preview, 0, 0, $target_width, $target_height, $white);
+      }
+
+      if (!imagecopyresampled($preview, $source, 0, 0, 0, 0, $target_width, $target_height, $width, $height))
+      {
+        fail_preview('GD konnte das Preview nicht skalieren.');
+      }
+
+      if ($extension === 'png') $written = imagepng($preview, $target, 6);
+      elseif ($extension === 'gif') $written = function_exists('imagegif') ? imagegif($preview, $target) : false;
+      elseif ($extension === 'webp') $written = function_exists('imagewebp') ? imagewebp($preview, $target, BRATONIEN_WEBDAV_PREVIEW_JPEG_QUALITY) : false;
+      else $written = imagejpeg($preview, $target, BRATONIEN_WEBDAV_PREVIEW_JPEG_QUALITY);
+
+      if (!$written) fail_preview('GD konnte das Preview im Format '.$extension.' nicht schreiben.');
+    }
+    finally
+    {
+      imagedestroy($preview);
+    }
+  }
+  finally
+  {
+    imagedestroy($source);
+  }
+}
+
+function write_preview($blob, $target, $extension)
+{
+  $dir = dirname($target);
+  if (!is_dir($dir) && !mkdir($dir, 0775, true) && !is_dir($dir)) fail_preview('Preview-Verzeichnis konnte nicht angelegt werden.');
+
+  if (class_exists('Imagick'))
+  {
+    write_preview_imagick($blob, $target, $extension);
+  }
+  elseif (function_exists('imagecreatefromstring') && function_exists('imagejpeg') && function_exists('imagepng'))
+  {
+    write_preview_gd($blob, $target, $extension);
+  }
+  else
+  {
+    fail_preview('Weder Imagick noch GD ist für die Preview-Erzeugung verfügbar.');
+  }
+
+  clearstatcache(true, $target);
+  $size = @getimagesize($target);
+  if (!is_array($size) || empty($size[0]) || empty($size[1]) || !is_file($target) || filesize($target) < 64)
+  {
+    @unlink($target);
+    fail_preview('Das erzeugte Preview ist ungültig.');
+  }
+  @chmod($target, 0664);
+}
+
+function local_source_is_hydrated($source_path, $preview)
+{
+  if (!is_file($source_path) || !is_readable($source_path)) return false;
+  $source_size = @getimagesize($source_path);
+  $preview_size = @getimagesize($preview);
+  if (!is_array($source_size) || !is_array($preview_size)) return false;
+  if ((int)$source_size[0] !== (int)$preview_size[0] || (int)$source_size[1] !== (int)$preview_size[1]) return false;
+  $source_bytes = @filesize($source_path);
+  $preview_bytes = @filesize($preview);
+  return $source_bytes !== false && $preview_bytes !== false && (int)$source_bytes === (int)$preview_bytes;
+}
+
+function hydrate_local_source($source_path, $preview)
+{
+  $normalized = str_replace('\\', '/', (string)$source_path);
+  if (!preg_match('#/nc-webdav-source/connection-[0-9]+/root-[0-9]+/#', $normalized))
+  {
+    fail_preview('Unsicherer lokaler Connector-Quellpfad: '.$source_path);
+  }
+  if (!is_file($preview) || !is_readable($preview)) fail_preview('Preview für lokale Quelle fehlt: '.$preview);
+  if (local_source_is_hydrated($source_path, $preview)) return false;
+
+  $dir = dirname($source_path);
+  if (!is_dir($dir) && !mkdir($dir, 0775, true) && !is_dir($dir)) fail_preview('Lokales Connector-Verzeichnis konnte nicht angelegt werden: '.$dir);
+
+  $tmp = $source_path.'.bratonien-next-'.getmypid();
+  if (!@copy($preview, $tmp)) fail_preview('Preview konnte nicht in lokale Piwigo-Quelle kopiert werden: '.$source_path);
+  @chmod($tmp, 0664);
+  $mtime = @filemtime($preview);
+  if ($mtime) @touch($tmp, $mtime);
+  if (!@rename($tmp, $source_path))
+  {
+    @unlink($tmp);
+    fail_preview('Lokale Piwigo-Quelle konnte nicht ersetzt werden: '.$source_path);
+  }
+  clearstatcache(true, $source_path);
+  $size = @getimagesize($source_path);
+  if (!is_array($size) || empty($size[0]) || empty($size[1])) fail_preview('Lokale Piwigo-Quelle ist nach dem Ersetzen ungültig: '.$source_path);
+  return true;
+}
+
+try
+{
+  $options = getopt('', array('mapping:', 'base-url:', 'user:', 'password-file:', 'cache-dir:'));
+  $mapping_file = (string)($options['mapping'] ?? '');
+  $base_url = rtrim((string)($options['base-url'] ?? ''), '/');
+  $user = trim((string)($options['user'] ?? ''));
+  $password_file = (string)($options['password-file'] ?? '');
+  $cache_dir = rtrim((string)($options['cache-dir'] ?? ''), '/');
+
+  if ($mapping_file === '' || !is_readable($mapping_file)) fail_preview('WebDAV-Mapping ist nicht lesbar.');
+  if ($base_url === '' || $user === '' || $password_file === '' || !is_readable($password_file) || $cache_dir === '') fail_preview('Preview-Parameter sind unvollständig.');
+  if (!function_exists('curl_init')) fail_preview('PHP-cURL ist nicht verfügbar.');
+
+  $password = rtrim((string)file_get_contents($password_file), "\r\n");
+  if ($password === '') fail_preview('Nextcloud-Passwort fehlt.');
+
+  $mapping = json_decode((string)file_get_contents($mapping_file), true);
+  if (!is_array($mapping) || !isset($mapping['files']) || !is_array($mapping['files'])) fail_preview('WebDAV-Mapping ist ungültig.');
+
+  if (!is_dir($cache_dir) && !mkdir($cache_dir, 0775, true) && !is_dir($cache_dir)) fail_preview('Preview-Cache konnte nicht angelegt werden.');
+  @chmod($cache_dir, 2775);
+
+  $state_file = $cache_dir.'/state.json';
+  $old_state = array();
+  if (is_readable($state_file))
+  {
+    $decoded = json_decode((string)file_get_contents($state_file), true);
+    if (is_array($decoded)) $old_state = $decoded;
+  }
+
+  $new_state = array();
+  $generated = 0;
+  $cached = 0;
+  $hydrated = 0;
+  $errors = 0;
+
+  foreach ($mapping['files'] as $local_path=>$entry)
+  {
+    if (!is_array($entry) || (string)($entry['kind'] ?? '') !== 'file') continue;
+    $webdav_path = trim((string)($entry['webdav_path'] ?? ''), '/');
+    if ($webdav_path === '') continue;
+
+    $etag = (string)($entry['etag'] ?? '');
+    $key = sha1($webdav_path);
+    $target = preview_target_for_entry($cache_dir, $key, $entry);
+    $extension = pathinfo($target, PATHINFO_EXTENSION);
+    $new_state[$key] = array(
+      'path' => $webdav_path,
+      'etag' => $etag,
+      'format' => $extension,
+      'version' => BRATONIEN_WEBDAV_PREVIEW_VERSION,
+    );
+
+    try
+    {
+      $old = $old_state[$key] ?? null;
+      $valid_cached = is_file($target)
+        && is_array($old)
+        && (string)($old['etag'] ?? '') === $etag
+        && (string)($old['format'] ?? '') === $extension
+        && (int)($old['version'] ?? 0) === BRATONIEN_WEBDAV_PREVIEW_VERSION;
+
+      if (!$valid_cached)
+      {
+        $url = $base_url.'/remote.php/dav/files/'.rawurlencode($user).'/'.quote_webdav_path($webdav_path);
+        $blob = fetch_remote_blob($url, $user, $password);
+        write_preview($blob, $target, $extension);
+        remove_other_preview_format($cache_dir, $key, $target);
+        $generated++;
+      }
+      else
+      {
+        $cached++;
+      }
+
+      if (hydrate_local_source((string)$local_path, $target)) $hydrated++;
+    }
+    catch (Throwable $e)
+    {
+      $errors++;
+      fwrite(STDERR, $webdav_path.': '.$e->getMessage()."\n");
+    }
+  }
+
+  foreach (glob($cache_dir.'/*') ?: array() as $file)
+  {
+    if (!is_file($file) || basename($file) === 'state.json') continue;
+    $name = basename($file);
+    if (!preg_match('/^([a-f0-9]{40})\.(jpg|png|gif|webp)$/', $name, $m)) continue;
+    if (!isset($new_state[$m[1]])) @unlink($file);
+  }
+
+  file_put_contents($state_file, json_encode($new_state, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT)."\n", LOCK_EX);
+  @chmod($state_file, 0664);
+
+  echo 'WebDAV-Previews: erzeugt='.$generated.' vorhanden='.$cached.' lokale_quellen='.$hydrated.' fehler='.$errors."\n";
+  exit($errors > 0 ? 1 : 0);
+}
+catch (Throwable $e)
+{
+  fwrite(STDERR, 'WebDAV-Preview-Cache: '.$e->getMessage()."\n");
+  exit(1);
+}

runtime/lib/resolve-nextcloud-target.php

@@ -0,0 +1,24 @@
+#!/usr/bin/env php
+<?php
+if (PHP_SAPI !== 'cli')
+{
+  fwrite(STDERR, "CLI only\n");
+  exit(1);
+}
+
+require_once(dirname(__DIR__, 2).'/include/nc_transport.inc.php');
+
+try
+{
+  if ($argc !== 2) throw new RuntimeException('Aufruf: resolve-nextcloud-target.php <nextcloud-url>');
+  $url = rtrim(trim((string)$argv[1]), '/');
+  bratonien_tools_nc_transport_scheme($url);
+  $host = bratonien_tools_nc_transport_host($url);
+  echo bratonien_tools_nc_transport_public_ip($host)."\n";
+  exit(0);
+}
+catch (Throwable $e)
+{
+  fwrite(STDERR, $e->getMessage()."\n");
+  exit(1);
+}

runtime/native-runner.php

@@ -0,0 +1,108 @@
+#!/usr/bin/env php
+<?php
+if (PHP_SAPI !== 'cli')
+{
+  fwrite(STDERR, "CLI only\n");
+  exit(1);
+}
+
+$options = getopt('', array('connection-id::'));
+$connectionId = isset($options['connection-id']) ? (int)$options['connection-id'] : 0;
+
+$pluginRoot = dirname(__DIR__);
+$piwigoRoot = dirname($pluginRoot, 2);
+$base = rtrim($piwigoRoot, '/').'/_data/bratonien-tools';
+$schedulerDir = $base.'/nc-connector-scheduler';
+$stateFile = $schedulerDir.'/state.json';
+$runtimeDir = $base.'/nc-connector-runtime';
+$stateRoot = $base.'/nc-connector-state';
+
+function native_scheduler_state($path)
+{
+  if (!is_readable($path)) return array();
+  $decoded = json_decode((string)@file_get_contents($path), true);
+  return is_array($decoded) ? $decoded : array();
+}
+
+function native_scheduler_write($path, array $state)
+{
+  $json = json_encode($state, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT);
+  if (!is_string($json)) return false;
+  $tmp = $path.'.tmp';
+  if (@file_put_contents($tmp, $json."\n", LOCK_EX) === false) return false;
+  @chmod($tmp, 0640);
+  return @rename($tmp, $path);
+}
+
+foreach (array($schedulerDir, $runtimeDir, $stateRoot) as $dir)
+{
+  if (!is_dir($dir) && !@mkdir($dir, 0750, true) && !is_dir($dir))
+  {
+    fwrite(STDERR, "Runtime-Verzeichnis konnte nicht angelegt werden: {$dir}\n");
+    exit(1);
+  }
+}
+
+$state = native_scheduler_state($stateFile);
+$state['enabled'] = true;
+$state['mode'] = 'piwigo-native';
+$state['state'] = 'running';
+$state['message'] = $connectionId > 0 ? 'NC-Abgleich für Verbindung #'.$connectionId.' läuft.' : 'NC-Abgleich läuft.';
+$state['started_at'] = time();
+$state['timestamp'] = time();
+$state['connection_id'] = $connectionId;
+native_scheduler_write($stateFile, $state);
+
+$env = $_ENV;
+$env['PATH'] = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin';
+$env['BRATONIEN_NC_NATIVE'] = '1';
+$env['BRATONIEN_NC_PIWIGO_ROOT'] = $piwigoRoot;
+$env['BRATONIEN_NC_CONFIG_DIR'] = $runtimeDir;
+$env['BRATONIEN_NC_STATE_ROOT'] = $stateRoot;
+$env['BRATONIEN_NC_CONNECTION_ID'] = (string)$connectionId;
+$env['LC_ALL'] = 'C';
+$env['LANG'] = 'C';
+
+$bash = is_executable('/usr/bin/bash') ? '/usr/bin/bash' : '/bin/bash';
+$command = array($bash, $pluginRoot.'/runtime/run-all.sh');
+$spec = array(
+  0=>array('file','/dev/null','r'),
+  1=>array('pipe','w'),
+  2=>array('pipe','w'),
+);
+$process = @proc_open($command, $spec, $pipes, null, $env);
+$stdout = '';
+$stderr = '';
+$exit = 1;
+if (is_resource($process))
+{
+  $stdout = (string)stream_get_contents($pipes[1]);
+  $stderr = (string)stream_get_contents($pipes[2]);
+  fclose($pipes[1]);
+  fclose($pipes[2]);
+  $exit = proc_close($process);
+}
+else
+{
+  $stderr = 'run-all.sh konnte nicht gestartet werden.';
+}
+
+$state = native_scheduler_state($stateFile);
+$state['enabled'] = true;
+$state['mode'] = 'piwigo-native';
+$state['state'] = $exit === 0 ? 'success' : 'error';
+$state['message'] = $exit === 0
+  ? ($connectionId > 0 ? 'NC-Abgleich für Verbindung #'.$connectionId.' erfolgreich abgeschlossen.' : 'NC-Abgleich erfolgreich abgeschlossen.')
+  : ($connectionId > 0 ? 'NC-Abgleich für Verbindung #'.$connectionId.' fehlgeschlagen.' : 'NC-Abgleich fehlgeschlagen.');
+$state['timestamp'] = time();
+$state['finished_at'] = time();
+$state['exit_code'] = $exit;
+$state['connection_id'] = $connectionId;
+$state['stdout'] = trim($stdout);
+$state['stderr'] = trim($stderr);
+if (empty($state['next_due']) || (int)$state['next_due'] < time())
+{
+  $state['next_due'] = time() + 60;
+}
+native_scheduler_write($stateFile, $state);
+exit($exit === 0 ? 0 : 1);

runtime/reconcile-webdav.php

@@ -0,0 +1,259 @@
+#!/usr/bin/env php
+<?php
+if (PHP_SAPI !== 'cli')
+{
+  fwrite(STDERR, "CLI only\n");
+  exit(1);
+}
+
+function fail_webdav_reconcile($message)
+{
+  throw new RuntimeException($message);
+}
+
+function decrypt_webdav_credentials($blob, $hexKey)
+{
+  if (!preg_match('/^[a-f0-9]{64}$/', (string)$hexKey)) fail_webdav_reconcile('Connector-Schluessel ist ungueltig.');
+  $outer = base64_decode(trim((string)$blob), true);
+  $payload = is_string($outer) ? json_decode($outer, true) : null;
+  if (!is_array($payload) || (int)($payload['v'] ?? 0) !== 1) fail_webdav_reconcile('Connector-Zugangsdaten haben ein unbekanntes Format.');
+  $iv = base64_decode((string)($payload['iv'] ?? ''), true);
+  $tag = base64_decode((string)($payload['tag'] ?? ''), true);
+  $cipher = base64_decode((string)($payload['data'] ?? ''), true);
+  $plain = openssl_decrypt($cipher, 'aes-256-gcm', hex2bin($hexKey), OPENSSL_RAW_DATA, $iv, $tag);
+  if ($plain === false || $plain === '') fail_webdav_reconcile('Connector-Zugangsdaten konnten nicht entschluesselt werden.');
+  $decoded = json_decode($plain, true);
+  if (!is_array($decoded)) fail_webdav_reconcile('WebDAV-Verbindung besitzt kein kompatibles Secret-Format.');
+  return array(
+    'nextcloud_user'=>(string)($decoded['nextcloud_user'] ?? ''),
+    'nextcloud_password'=>(string)($decoded['nextcloud_password'] ?? ''),
+  );
+}
+
+function webdav_shell_value($value)
+{
+  return escapeshellarg((string)$value);
+}
+
+function webdav_remove_generated_tree($path, $allowedRoot)
+{
+  $path = rtrim((string)$path, '/');
+  $allowedRoot = rtrim((string)$allowedRoot, '/');
+  if ($path === '' || $allowedRoot === '' || strpos($path, $allowedRoot.'/') !== 0 || !file_exists($path)) return;
+  if (is_link($path) || is_file($path))
+  {
+    @unlink($path);
+    return;
+  }
+  $items = scandir($path);
+  if (is_array($items))
+  {
+    foreach ($items as $item)
+    {
+      if ($item === '.' || $item === '..') continue;
+      webdav_remove_generated_tree($path.'/'.$item, $allowedRoot);
+    }
+  }
+  @rmdir($path);
+}
+
+function webdav_source_fingerprint($baseUrl, $user, array $roots)
+{
+  $normalized = array();
+  foreach ($roots as $root)
+  {
+    $normalized[] = array(
+      'fileid'=>(int)($root['fileid'] ?? 0),
+      'path'=>trim((string)($root['webdav_path'] ?? ''), '/'),
+    );
+  }
+  usort($normalized, function($a, $b)
+  {
+    $cmp = $a['fileid'] <=> $b['fileid'];
+    return $cmp !== 0 ? $cmp : strcmp($a['path'], $b['path']);
+  });
+  return hash('sha256', strtolower(rtrim((string)$baseUrl, '/'))."\n".strtolower(trim((string)$user))."\n".json_encode($normalized));
+}
+
+$pluginRoot = dirname(__DIR__);
+$piwigoRoot = dirname($pluginRoot, 2);
+$dbConfig = $piwigoRoot.'/local/config/database.inc.php';
+$nativeMode = getenv('BRATONIEN_NC_NATIVE') === '1';
+$configDir = trim((string)getenv('BRATONIEN_NC_CONFIG_DIR'));
+if ($configDir === '') $configDir = $nativeMode ? rtrim($piwigoRoot, '/').'/_data/bratonien-tools/nc-connector-runtime' : '/etc/bratonien-tools/nc-connector';
+$stateRoot = trim((string)getenv('BRATONIEN_NC_STATE_ROOT'));
+if ($stateRoot === '') $stateRoot = $nativeMode ? rtrim($piwigoRoot, '/').'/_data/bratonien-tools/nc-connector-state' : '/var/lib/bratonien-tools/nc-connector';
+$publicSourceRoot = rtrim($piwigoRoot, '/').'/_data/bratonien-tools/nc-webdav-source';
+$publicGalleryRoot = rtrim($piwigoRoot, '/').'/_data/bratonien-tools/nc-webdav-gallery';
+$legacyGalleryRoot = rtrim($piwigoRoot, '/').'/galleries';
+
+try
+{
+  if (!is_readable($dbConfig)) fail_webdav_reconcile('Piwigo-Datenbankkonfiguration ist nicht lesbar: '.$dbConfig);
+  $conf = array();
+  $prefixeTable = 'piwigo_';
+  require $dbConfig;
+  foreach (array('db_host','db_user','db_password','db_base') as $key)
+  {
+    if (!isset($conf[$key])) fail_webdav_reconcile('Piwigo-Datenbankkonfiguration ist unvollstaendig: '.$key);
+  }
+
+  $db = new mysqli($conf['db_host'], $conf['db_user'], $conf['db_password'], $conf['db_base']);
+  if ($db->connect_errno) fail_webdav_reconcile('Piwigo-Datenbank ist nicht erreichbar: '.$db->connect_error);
+  $db->set_charset('utf8mb4');
+
+  $keyResult = $db->query("SELECT value FROM `{$prefixeTable}config` WHERE param='bratonien_nc_connector_secret' LIMIT 1");
+  if (!$keyResult || !$keyResult->num_rows) fail_webdav_reconcile('Connector-Schluessel wurde nicht gefunden.');
+  $hexKey = trim((string)$keyResult->fetch_assoc()['value']);
+
+  $table = $prefixeTable.'bratonien_tools_nc_connections';
+  $rows = $db->query("SELECT id,name,adapter,config_json,secret_blob FROM `{$table}` ORDER BY id DESC");
+  if (!$rows) fail_webdav_reconcile('Connector-Verbindungen konnten nicht gelesen werden: '.$db->error);
+
+  foreach (array($configDir, $stateRoot, $publicSourceRoot, $publicGalleryRoot) as $dir)
+  {
+    if (!is_dir($dir) && !mkdir($dir, $dir === $configDir ? 0700 : 0750, true)) fail_webdav_reconcile('Runtime-Verzeichnis konnte nicht angelegt werden: '.$dir);
+  }
+  @chmod($configDir, 0700);
+  @chmod($stateRoot, 0750);
+  @chmod($publicSourceRoot, 0755);
+  @chmod($publicGalleryRoot, 0755);
+
+  $known = array();
+  $seenFingerprints = array();
+
+  while ($row = $rows->fetch_assoc())
+  {
+    $id = (int)$row['id'];
+    $config = json_decode((string)$row['config_json'], true);
+    if (!is_array($config)) $config = array();
+    if ((string)$row['adapter'] !== 'remote') continue;
+    if ((string)($config['source_mode'] ?? '') !== 'webdav-placeholder') continue;
+
+    try
+    {
+      $baseUrl = rtrim(trim((string)($config['nextcloud_url'] ?? '')), '/');
+      $roots = isset($config['roots']) && is_array($config['roots']) ? $config['roots'] : array();
+      if ($baseUrl === '') fail_webdav_reconcile('Nextcloud-Adresse fehlt.');
+      if (!$roots) fail_webdav_reconcile('Keine WebDAV-Wurzeln gespeichert.');
+
+      $credentials = decrypt_webdav_credentials((string)$row['secret_blob'], $hexKey);
+      $user = trim($credentials['nextcloud_user']);
+      $password = $credentials['nextcloud_password'];
+      if ($user === '' || $password === '') fail_webdav_reconcile('Nextcloud-Zugangsdaten fehlen.');
+
+      $fingerprint = webdav_source_fingerprint($baseUrl, $user, $roots);
+      if (isset($seenFingerprints[$fingerprint]))
+      {
+        fwrite(STDERR, "NC WebDAV #{$id}: identische Quelle bereits durch Verbindung #".$seenFingerprints[$fingerprint]." abgedeckt; doppelte Runtime wird unterdrueckt.\n");
+        foreach (glob($configDir.'/webdav-connection-'.$id.'.*') ?: array() as $stale) @unlink($stale);
+        webdav_remove_generated_tree($legacyGalleryRoot.'/bratonien-webdav-'.$id, $legacyGalleryRoot);
+        webdav_remove_generated_tree($publicGalleryRoot.'/connection-'.$id, $publicGalleryRoot);
+        continue;
+      }
+      $seenFingerprints[$fingerprint] = $id;
+      $known[$id] = true;
+
+      $stateDir = $nativeMode ? $stateRoot.'/connection-'.$id : rtrim((string)($config['state_dir'] ?? ''), '/');
+      if ($stateDir === '') $stateDir = $stateRoot.'/connection-'.$id;
+      if (!is_dir($stateDir) && !mkdir($stateDir, 0750, true)) fail_webdav_reconcile('State-Verzeichnis konnte nicht angelegt werden.');
+      @chmod($stateDir, 0750);
+
+      $legacyDefault = $legacyGalleryRoot.'/bratonien-webdav-'.$id;
+      $galleryRoot = rtrim((string)($config['parallel_gallery_root'] ?? ''), '/');
+      if ($galleryRoot === '' || $galleryRoot === $legacyDefault || strpos($galleryRoot, $legacyGalleryRoot.'/bratonien-webdav-') === 0)
+      {
+        $galleryRoot = $publicGalleryRoot.'/connection-'.$id;
+      }
+      if (!is_dir($galleryRoot) && !mkdir($galleryRoot, 0755, true)) fail_webdav_reconcile('WebDAV-Galeriebereich konnte nicht angelegt werden.');
+      @chmod($galleryRoot, 0755);
+      webdav_remove_generated_tree($legacyDefault, $legacyGalleryRoot);
+
+      $sourceDir = $publicSourceRoot.'/connection-'.$id;
+      if (!is_dir($sourceDir) && !mkdir($sourceDir, 0755, true)) fail_webdav_reconcile('WebDAV-Platzhalterquelle konnte nicht angelegt werden.');
+      @chmod($sourceDir, 0755);
+
+      $base = $configDir.'/webdav-connection-'.$id;
+      $passwordPath = $base.'.nextcloud-password';
+      $rootsPath = $base.'.roots.tsv';
+      $configPath = $base.'.conf';
+      $statusFile = $stateDir.'/connector-status.json';
+      $mappingFile = $stateDir.'/webdav-map.json';
+      $manifestFile = $stateDir.'/webdav-manifest.tsv';
+      $shadowMapFile = $stateDir.'/webdav-shadow-map.json';
+
+      file_put_contents($passwordPath, $password."\n", LOCK_EX);
+      @chmod($passwordPath, 0600);
+
+      $rootLines = array('# webdav_path<TAB>display_name');
+      foreach ($roots as $root)
+      {
+        $path = trim((string)($root['webdav_path'] ?? ''), '/');
+        $display = trim((string)($root['display_name'] ?? ''));
+        $runtimePath = $path === '' ? '/' : $path;
+        if ($display === '' || preg_match('/[\t\r\n]/', $runtimePath.$display)) fail_webdav_reconcile('Eine gespeicherte WebDAV-Wurzel ist ungueltig.');
+        $rootLines[] = $runtimePath."\t".$display;
+      }
+      file_put_contents($rootsPath, implode("\n", $rootLines)."\n", LOCK_EX);
+      @chmod($rootsPath, 0600);
+
+      $lines = array(
+        'PIWIGO_ROOT='.webdav_shell_value($piwigoRoot),
+        'CONNECTION_ID='.$id,
+        'SOURCE_MODE=webdav-placeholder',
+        'WEBDAV_BASE_URL='.webdav_shell_value($baseUrl),
+        'WEBDAV_USER='.webdav_shell_value($user),
+        'WEBDAV_PASSWORD_FILE='.webdav_shell_value($passwordPath),
+        'WEBDAV_ROOTS_FILE='.webdav_shell_value($rootsPath),
+        'WEBDAV_SOURCE_DIR='.webdav_shell_value($sourceDir),
+        'WEBDAV_MAPPING_FILE='.webdav_shell_value($mappingFile),
+        'MANIFEST='.webdav_shell_value($manifestFile),
+        'SHADOW_MAP_FILE='.webdav_shell_value($shadowMapFile),
+        'GALLERY_ROOT='.webdav_shell_value($galleryRoot),
+        'STATE_DIR='.webdav_shell_value($stateDir),
+        'STATUS_FILE='.webdav_shell_value($statusFile),
+        'PIWIGO_SYNC_ENABLED=1',
+      );
+      file_put_contents($configPath, implode("\n", $lines)."\n", LOCK_EX);
+      @chmod($configPath, 0600);
+
+      unset($config['migration'], $config['parallel_test']);
+      $config['state_dir'] = $stateDir;
+      $config['status_file'] = $statusFile;
+      $config['parallel_gallery_root'] = $galleryRoot;
+      $config['source_fingerprint'] = $fingerprint;
+      $config['runtime'] = array(
+        'mode'=>$nativeMode ? 'piwigo-native-webdav' : 'webdav',
+        'config'=>$configPath,
+        'piwigo_sync_enabled'=>true,
+        'reconciled_at'=>date('Y-m-d H:i:s'),
+      );
+      $json = json_encode($config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+      if (!is_string($json)) fail_webdav_reconcile('WebDAV-Runtime-Konfiguration konnte nicht serialisiert werden.');
+      $escaped = $db->real_escape_string($json);
+      if (!$db->query("UPDATE `{$table}` SET config_json='{$escaped}' WHERE id={$id} AND adapter='remote' LIMIT 1"))
+      {
+        fail_webdav_reconcile('WebDAV-Runtime-Status konnte nicht gespeichert werden: '.$db->error);
+      }
+    }
+    catch (Throwable $e)
+    {
+      fwrite(STDERR, "NC WebDAV #{$id}: ".$e->getMessage()."\n");
+    }
+  }
+
+  foreach (glob($configDir.'/webdav-connection-*.conf') ?: array() as $path)
+  {
+    if (!preg_match('/webdav-connection-([0-9]+)\.conf$/', $path, $match)) continue;
+    $id = (int)$match[1];
+    if (isset($known[$id])) continue;
+    foreach (glob($configDir.'/webdav-connection-'.$id.'.*') ?: array() as $stale) @unlink($stale);
+  }
+
+  exit(0);
+}
+catch (Throwable $e)
+{
+  fwrite(STDERR, "NC WebDAV Reconcile: ".$e->getMessage()."\n");
+  exit(1);
+}

runtime/repair-webdav-cache-permissions.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+PIWIGO_ROOT="${1:-/var/www/piwigo}"
+PIWIGO_ROOT="${PIWIGO_ROOT%/}"
+DATA_DIR="$PIWIGO_ROOT/_data"
+
+[[ -d "$DATA_DIR" ]] || { echo "Piwigo-_data wurde nicht gefunden: $DATA_DIR" >&2; exit 1; }
+[[ "$(id -u)" -eq 0 ]] || { echo "Die Reparatur muss als root ausgeführt werden." >&2; exit 1; }
+
+DATA_UID="$(stat -c '%u' "$DATA_DIR")"
+DATA_GID="$(stat -c '%g' "$DATA_DIR")"
+
+PATHS=(
+  "$DATA_DIR/bratonien-tools/nc-webdav-gallery"
+  "$DATA_DIR/bratonien-tools/nc-webdav-preview"
+  "$DATA_DIR/i/_data/bratonien-tools/nc-webdav-gallery"
+  "$DATA_DIR/i/bratonien-watermark"
+)
+
+found=0
+for path in "${PATHS[@]}"; do
+  [[ -e "$path" ]] || continue
+  found=1
+  echo "Repariere: $path"
+  chown -R "$DATA_UID:$DATA_GID" -- "$path"
+  find "$path" -type d -exec chmod 2775 {} +
+  find "$path" -type f -exec chmod 0664 {} +
+done
+
+if [[ "$found" -eq 0 ]]; then
+  echo "Keine Bratonien-Cache-Verzeichnisse gefunden."
+  exit 0
+fi
+
+echo "Bratonien-Cache-Rechte wurden an $DATA_DIR angeglichen (UID $DATA_UID, GID $DATA_GID)."

runtime/run-all.sh

@@ -1,53 +1,194 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-CONFIG_DIR="/etc/bratonien-tools/nc-connector"
 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+PIWIGO_ROOT_DEFAULT="${BRATONIEN_NC_PIWIGO_ROOT:-$(cd -- "$SCRIPT_DIR/../../.." && pwd)}"
+CONFIG_DIR="${BRATONIEN_NC_CONFIG_DIR:-/etc/bratonien-tools/nc-connector}"
+NATIVE_MODE="${BRATONIEN_NC_NATIVE:-0}"
+TARGET_CONNECTION_ID="${BRATONIEN_NC_CONNECTION_ID:-0}"
+GLOBAL_LOCK_DIR="${PIWIGO_ROOT_DEFAULT%/}/_data/bratonien-tools/nc-connector-scheduler"
+GLOBAL_LOCK_FILE="$GLOBAL_LOCK_DIR/worker.lock"
+mkdir -p -- "$GLOBAL_LOCK_DIR"
+exec 8>"$GLOBAL_LOCK_FILE"
+if ! flock -n 8; then
+    echo "NC Connector: ein Lauf ist bereits aktiv."
+    exit 0
+fi
 shopt -s nullglob
 
-if ! php "$SCRIPT_DIR/reconcile.php"; then
-    echo "NC Connector: gespeicherte Verbindungen konnten nicht mit der Runtime abgeglichen werden." >&2
+if [[ ! "$TARGET_CONNECTION_ID" =~ ^[0-9]+$ ]]; then
+    echo "NC Connector: ungültige Ziel-Verbindungs-ID: $TARGET_CONNECTION_ID" >&2
     exit 1
 fi
 
-configs=("$CONFIG_DIR"/connection-*.conf)
+read_config_value() {
+    local key="$1"
+    local file="$2"
+    local value
+    value="$(sed -n "s/^${key}=//p" "$file" | tail -n 1)"
+    value="${value%\"}"
+    value="${value#\"}"
+    value="${value%\'}"
+    value="${value#\'}"
+    printf '%s' "$value"
+}
 
-if [[ ${#configs[@]} -eq 0 ]]; then
-    echo "Keine aktiven NC-Connector-Verbindungen konfiguriert."
+write_route_status() {
+    local route="$1"
+    local label="$2"
+    local detail="$3"
+    local success="$4"
+    [[ -n "${ROUTE_STATUS_FILE:-}" ]] || return 0
+    mkdir -p -- "$(dirname -- "$ROUTE_STATUS_FILE")"
+    php -r '
+      $payload = array(
+        "timestamp" => time(),
+        "route" => (string)$argv[2],
+        "label" => (string)$argv[3],
+        "detail" => (string)$argv[4],
+        "fallback_used" => false,
+        "success" => $argv[5] === "1"
+      );
+      $json = json_encode($payload, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT);
+      if (!is_string($json) || file_put_contents($argv[1], $json.PHP_EOL, LOCK_EX) === false) exit(1);
+      @chmod($argv[1], 0644);
+    ' "$ROUTE_STATUS_FILE" "$route" "$label" "$detail" "$success"
+}
+
+if [[ "$NATIVE_MODE" != "1" ]]; then
+    php "$SCRIPT_DIR/reconcile.php"
+fi
+php "$SCRIPT_DIR/reconcile-webdav.php"
+php "$SCRIPT_DIR/cleanup-webdav-piwigo.php"
+if [[ "$NATIVE_MODE" != "1" ]]; then
+    php "$SCRIPT_DIR/cleanup-stale.php"
+fi
+
+configs=("$CONFIG_DIR"/connection-*.conf)
+webdav_configs=("$CONFIG_DIR"/webdav-connection-*.conf)
+
+if [[ ${#configs[@]} -eq 0 && ${#webdav_configs[@]} -eq 0 ]]; then
+    echo "Keine NC-Connector-Verbindungen konfiguriert."
     exit 0
 fi
 
-result=0
-for config in "${configs[@]}"; do
-    name="$(basename "$config")"
-    connection_id=""
-    if [[ "$name" =~ ^connection-([0-9]+)\.conf$ ]]; then
-        connection_id="${BASH_REMATCH[1]}"
+route_piwigo_root=""
+for candidate in "${webdav_configs[@]}" "${configs[@]}"; do
+    [[ -f "$candidate" ]] || continue
+    candidate_id="$(read_config_value CONNECTION_ID "$candidate")"
+    if [[ "$TARGET_CONNECTION_ID" -gt 0 && "$candidate_id" != "$TARGET_CONNECTION_ID" ]]; then
+        continue
     fi
+    route_piwigo_root="$(read_config_value PIWIGO_ROOT "$candidate")"
+    [[ -n "$route_piwigo_root" ]] && break
+done
+[[ -n "$route_piwigo_root" ]] || route_piwigo_root="$PIWIGO_ROOT_DEFAULT"
+ROUTE_STATUS_FILE="${route_piwigo_root%/}/_data/bratonien-tools/nc-connector-status/route-status.json"
 
-    piwigo_root="$(sed -n 's/^PIWIGO_ROOT=//p' "$config" | tail -n 1)"
-    piwigo_root="${piwigo_root%\"}"
-    piwigo_root="${piwigo_root#\"}"
-    piwigo_root="${piwigo_root%\'}"
-    piwigo_root="${piwigo_root#\'}"
-    [[ -n "$piwigo_root" ]] || piwigo_root="/var/www/piwigo"
-    tombstone_dir="${piwigo_root%/}/_data/bratonien-tools/nc-connector-status"
+failure_count=0
+webdav_count=0
+local_count=0
+summary_parts=()
+matched_count=0
 
-    if [[ -n "$connection_id" && -f "$tombstone_dir/deleted-$connection_id" ]]; then
-        echo "NC Connector: Verbindung $connection_id wurde geloescht; Laufzeitdateien werden entfernt."
-        rm -f -- "$CONFIG_DIR/connection-$connection_id.conf" \
-            "$CONFIG_DIR/connection-$connection_id.db-password" \
-            "$CONFIG_DIR/connection-$connection_id.piwigo-password" \
-            "$CONFIG_DIR/connection-$connection_id.storages.tsv" \
-            "$CONFIG_DIR/connection-$connection_id.roots.tsv"
-        rm -f -- "$tombstone_dir/deleted-$connection_id"
+for config in "${webdav_configs[@]}"; do
+    [[ -f "$config" ]] || continue
+    name="$(basename "$config")"
+    connection_id="$(read_config_value CONNECTION_ID "$config")"
+    if [[ ! "$connection_id" =~ ^[0-9]+$ ]] || [[ "$connection_id" -lt 1 ]]; then
+        echo "NC Connector: $name besitzt keine gueltige Verbindungs-ID." >&2
+        failure_count=$((failure_count + 1))
+        summary_parts+=("$name: ungueltige Verbindungs-ID")
+        continue
+    fi
+    if [[ "$TARGET_CONNECTION_ID" -gt 0 && "$connection_id" != "$TARGET_CONNECTION_ID" ]]; then
         continue
     fi
 
-    echo "NC Connector: $name"
-    if ! env PIWIGO_CONFIG="$config" bash "$SCRIPT_DIR/sync.sh"; then
-        result=1
+    matched_count=$((matched_count + 1))
+    webdav_count=$((webdav_count + 1))
+    echo "NC Connector WebDAV #$connection_id: $name"
+    output=""
+    if output="$(env PIWIGO_CONFIG="$config" bash "$SCRIPT_DIR/sync-webdav.sh" 2>&1)"; then
+        [[ -z "$output" ]] || printf '%s\n' "$output"
+        summary_parts+=("WebDAV #$connection_id erfolgreich")
+    else
+        code=$?
+        [[ -z "$output" ]] || printf '%s\n' "$output" >&2
+        failure_count=$((failure_count + 1))
+        summary_parts+=("WebDAV #$connection_id fehlgeschlagen (Exit $code)")
     fi
 done
 
-exit "$result"
+if [[ "$NATIVE_MODE" != "1" ]]; then
+    for config in "${configs[@]}"; do
+        [[ -f "$config" ]] || continue
+        name="$(basename "$config")"
+        connection_id="0"
+        if [[ "$name" =~ ^connection-([0-9]+)\.conf$ ]]; then
+            connection_id="${BASH_REMATCH[1]}"
+        fi
+        if [[ "$connection_id" -lt 1 ]]; then
+            echo "NC Connector: $name besitzt keine gueltige Verbindungs-ID." >&2
+            failure_count=$((failure_count + 1))
+            summary_parts+=("$name: ungueltige Verbindungs-ID")
+            continue
+        fi
+        if [[ "$TARGET_CONNECTION_ID" -gt 0 && "$connection_id" != "$TARGET_CONNECTION_ID" ]]; then
+            continue
+        fi
+
+        matched_count=$((matched_count + 1))
+        piwigo_root="$(read_config_value PIWIGO_ROOT "$config")"
+        [[ -n "$piwigo_root" ]] || piwigo_root="$PIWIGO_ROOT_DEFAULT"
+        tombstone_dir="${piwigo_root%/}/_data/bratonien-tools/nc-connector-status"
+        if [[ -f "$tombstone_dir/deleted-$connection_id" ]]; then
+            echo "NC Connector: Verbindung $connection_id wurde geloescht; Laufzeitdateien werden entfernt."
+            rm -f -- "$CONFIG_DIR/connection-$connection_id.conf" \
+                "$CONFIG_DIR/connection-$connection_id.db-password" \
+                "$CONFIG_DIR/connection-$connection_id.piwigo-password" \
+                "$CONFIG_DIR/connection-$connection_id.storages.tsv" \
+                "$CONFIG_DIR/connection-$connection_id.roots.tsv"
+            rm -f -- "$tombstone_dir/deleted-$connection_id"
+            continue
+        fi
+
+        local_count=$((local_count + 1))
+        echo "NC Connector Local #$connection_id: $name"
+        if env PIWIGO_CONFIG="$config" bash "$SCRIPT_DIR/sync.sh"; then
+            summary_parts+=("Local #$connection_id erfolgreich")
+        else
+            failure_count=$((failure_count + 1))
+            summary_parts+=("Local #$connection_id fehlgeschlagen")
+        fi
+    done
+fi
+
+if [[ "$TARGET_CONNECTION_ID" -gt 0 && "$matched_count" -eq 0 ]]; then
+    write_route_status "failed" "FEHLER - Verbindung #$TARGET_CONNECTION_ID" "Keine Laufzeitkonfiguration für Verbindung #$TARGET_CONNECTION_ID gefunden." "0"
+    echo "NC Connector: keine Laufzeitkonfiguration für Verbindung #$TARGET_CONNECTION_ID gefunden." >&2
+    exit 1
+fi
+
+summary_detail="$(IFS='; '; printf '%s' "${summary_parts[*]}")"
+[[ -n "$summary_detail" ]] || summary_detail="Keine Verbindung wurde ausgefuehrt."
+
+if [[ "$failure_count" -eq 0 ]]; then
+    if [[ "$webdav_count" -gt 0 && "$local_count" -gt 0 ]]; then
+        route="mixed"
+        label="WebDAV + Local"
+    elif [[ "$webdav_count" -gt 0 ]]; then
+        route="webdav"
+        label="WebDAV"
+    else
+        route="local"
+        label="Local"
+    fi
+    write_route_status "$route" "$label" "$summary_detail" "1"
+    echo "NC Connector: angeforderte Verbindung wurde erfolgreich verarbeitet."
+    exit 0
+fi
+
+write_route_status "failed" "FEHLER - angeforderte Verbindung" "$summary_detail" "0"
+echo "NC Connector: die angeforderte Verbindung ist fehlgeschlagen." >&2
+exit 1

runtime/sync-webdav.sh

@@ -0,0 +1,188 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+CONFIG_FILE="${PIWIGO_CONFIG:-}"
+[[ -n "$CONFIG_FILE" && -r "$CONFIG_FILE" ]] || { echo "WebDAV-Konfiguration fehlt: ${CONFIG_FILE:-<leer>}" >&2; exit 1; }
+
+# shellcheck source=/dev/null
+source "$CONFIG_FILE"
+
+: "${PIWIGO_ROOT:?PIWIGO_ROOT fehlt}"
+: "${CONNECTION_ID:?CONNECTION_ID fehlt}"
+: "${WEBDAV_BASE_URL:?WEBDAV_BASE_URL fehlt}"
+: "${WEBDAV_USER:?WEBDAV_USER fehlt}"
+: "${WEBDAV_PASSWORD_FILE:?WEBDAV_PASSWORD_FILE fehlt}"
+: "${WEBDAV_ROOTS_FILE:?WEBDAV_ROOTS_FILE fehlt}"
+: "${WEBDAV_SOURCE_DIR:?WEBDAV_SOURCE_DIR fehlt}"
+: "${WEBDAV_MAPPING_FILE:?WEBDAV_MAPPING_FILE fehlt}"
+: "${MANIFEST:?MANIFEST fehlt}"
+: "${SHADOW_MAP_FILE:?SHADOW_MAP_FILE fehlt}"
+: "${GALLERY_ROOT:?GALLERY_ROOT fehlt}"
+: "${STATE_DIR:?STATE_DIR fehlt}"
+: "${STATUS_FILE:?STATUS_FILE fehlt}"
+
+[[ "${SOURCE_MODE:-}" == "webdav-placeholder" ]] || { echo "Falscher SOURCE_MODE: ${SOURCE_MODE:-<leer>}" >&2; exit 1; }
+[[ -r "$WEBDAV_PASSWORD_FILE" ]] || { echo "Nextcloud-Passwortdatei fehlt." >&2; exit 1; }
+[[ -r "$WEBDAV_ROOTS_FILE" ]] || { echo "WebDAV-Wurzeln fehlen." >&2; exit 1; }
+
+SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+LOCK_FILE="$STATE_DIR/webdav-sync.lock"
+mkdir -p -- "$STATE_DIR"
+exec 9>"$LOCK_FILE"
+flock -n 9 || exit 0
+
+write_status() {
+    local state="$1" message="$2" detail="${3:-}" auth_mode="${4:-webdav}" api_state="${5:-not_run}" api_message="${6:-}" fallback_state="${7:-not_run}" fallback_message="${8:-}"
+    python3 - "$STATUS_FILE" "$PIWIGO_ROOT" "$CONNECTION_ID" "$state" "$message" "$detail" "$auth_mode" "$api_state" "$api_message" "$fallback_state" "$fallback_message" <<'PY'
+import json, os, sys, tempfile, time
+(status_file, piwigo_root, connection_id, state, message, detail, auth_mode,
+ api_state, api_message, fallback_state, fallback_message) = sys.argv[1:]
+payload = {
+    "state": state,
+    "message": message,
+    "timestamp": int(time.time()),
+    "auth_mode": auth_mode,
+    "api": {"state": api_state, "message": api_message},
+    "fallback": {"state": fallback_state, "message": fallback_message},
+    "error_detail": detail if state == "error" else "",
+}
+public_file = os.path.join(piwigo_root.rstrip('/'), '_data', 'bratonien-tools', 'nc-connector-status', f'connection-{connection_id}.json')
+for target in (status_file, public_file):
+    directory = os.path.dirname(target)
+    os.makedirs(directory, exist_ok=True)
+    fd, temporary = tempfile.mkstemp(dir=directory)
+    with os.fdopen(fd, 'w', encoding='utf-8') as handle:
+        json.dump(payload, handle, ensure_ascii=False)
+        handle.write('\n')
+    os.chmod(temporary, 0o644)
+    os.replace(temporary, target)
+PY
+}
+
+failure() {
+    local code="$1" command="$2" line="$3"
+    trap - ERR
+    write_status error "WebDAV-Shadow-Tree fehlgeschlagen" "Exit-Code: $code; Zeile: $line; Befehl: $command"
+    exit "$code"
+}
+trap 'failure $? "$BASH_COMMAND" "$LINENO"' ERR
+
+ROOT_ARGS=()
+while IFS=$'\t' read -r path display_name; do
+    [[ -z "$path" || "$path" == \#* ]] && continue
+    ROOT_ARGS+=(--root "$path")
+done < "$WEBDAV_ROOTS_FILE"
+
+[[ ${#ROOT_ARGS[@]} -gt 0 ]] || { write_status error "Keine WebDAV-Wurzeln konfiguriert"; exit 1; }
+
+WEBDAV_CONNECT_IP="$(php "$SCRIPT_DIR/lib/resolve-nextcloud-target.php" "$WEBDAV_BASE_URL")"
+[[ -n "$WEBDAV_CONNECT_IP" ]] || { write_status error "Nextcloud-Zieladresse konnte nicht ermittelt werden"; exit 1; }
+
+python3 "$SCRIPT_DIR/lib/build_webdav_placeholder_source.py" \
+    --base-url "$WEBDAV_BASE_URL" \
+    --connect-ip "$WEBDAV_CONNECT_IP" \
+    --user "$WEBDAV_USER" \
+    --password-file "$WEBDAV_PASSWORD_FILE" \
+    "${ROOT_ARGS[@]}" \
+    --source-dir "$WEBDAV_SOURCE_DIR" \
+    --manifest "$MANIFEST" \
+    --mapping "$WEBDAV_MAPPING_FILE"
+
+python3 "$SCRIPT_DIR/lib/shadow_tree.py" \
+    --manifest "$MANIFEST" \
+    --destination "$GALLERY_ROOT" \
+    --state "$SHADOW_MAP_FILE"
+
+trap - ERR
+
+if [[ "${PIWIGO_SYNC_ENABLED:-0}" == "1" ]]; then
+    PIWIGO_OUTPUT=""
+    PIWIGO_EXIT=0
+    if PIWIGO_OUTPUT="$(php "$SCRIPT_DIR/lib/piwigo-sync.php" \
+        --piwigo-root="$PIWIGO_ROOT" \
+        --connection-id="$CONNECTION_ID" \
+        --base-url="http://127.0.0.1" 2>&1)"; then
+        PIWIGO_EXIT=0
+    else
+        PIWIGO_EXIT=$?
+    fi
+    [[ -z "$PIWIGO_OUTPUT" ]] || printf '%s\n' "$PIWIGO_OUTPUT"
+
+    if [[ "$PIWIGO_EXIT" -ne 0 ]]; then
+        DETAIL="Exit-Code: $PIWIGO_EXIT"
+        if [[ -n "$PIWIGO_OUTPUT" ]]; then
+            DETAIL+="; Ausgabe: $(printf '%s\n' "$PIWIGO_OUTPUT" | tail -n 12 | tr '\n' ' ' | sed 's/[[:space:]]\+/ /g; s/^[[:space:]]//; s/[[:space:]]$//')"
+        fi
+
+        if grep -qi 'Invalid username/password' <<<"$PIWIGO_OUTPUT"; then
+            write_status error \
+                "Piwigo-Fallback fehlgeschlagen: Benutzername oder Passwort ist ungültig" \
+                "$DETAIL" \
+                "fallback" \
+                "not_configured" \
+                "Für diese Verbindung ist keine nutzbare API konfiguriert" \
+                "error" \
+                "Piwigo hat Benutzername oder Passwort des Fallback-Zugangs abgelehnt"
+        elif grep -qi 'Kein gespeicherter Benutzername/Passwort-Fallback\|Kein verbindungseigener Piwigo-Zugang' <<<"$PIWIGO_OUTPUT"; then
+            write_status error \
+                "Piwigo-Zugang fehlt: API und Fallback sind nicht nutzbar" \
+                "$DETAIL" \
+                "failed" \
+                "not_configured" \
+                "Für diese Verbindung ist keine nutzbare API konfiguriert" \
+                "not_configured" \
+                "Kein vollständiger Fallback-Zugang gespeichert"
+        else
+            write_status error "Piwigo-Synchronisierung des WebDAV-Shadow-Trees fehlgeschlagen" "$DETAIL"
+        fi
+        exit "$PIWIGO_EXIT"
+    fi
+
+    if [[ "${BRATONIEN_NC_NATIVE:-0}" == "1" ]]; then
+        if command -v timeout >/dev/null 2>&1; then
+            if ! timeout 30m env PIWIGO_CONFIG="$CONFIG_FILE" bash "$SCRIPT_DIR/build-webdav-media.sh"; then
+                write_status error "Bildaufbereitung ist fehlgeschlagen oder hat das 30-Minuten-Limit erreicht"
+                exit 1
+            fi
+        elif ! env PIWIGO_CONFIG="$CONFIG_FILE" bash "$SCRIPT_DIR/build-webdav-media.sh"; then
+            write_status error "Bildaufbereitung ist fehlgeschlagen"
+            exit 1
+        fi
+    else
+        MEDIA_UNIT="bratonien-nc-media-${CONNECTION_ID}-$(date +%s)"
+        if ! systemd-run \
+            --quiet \
+            --collect \
+            --unit="$MEDIA_UNIT" \
+            --property=RuntimeMaxSec=30min \
+            --setenv="PIWIGO_CONFIG=$CONFIG_FILE" \
+            /usr/bin/env bash "$SCRIPT_DIR/build-webdav-media.sh"; then
+            write_status error "Bildaufbereitung konnte nicht im Hintergrund gestartet werden"
+            exit 1
+        fi
+    fi
+
+    if grep -q 'Piwigo-Synchronisierung per API erfolgreich' <<<"$PIWIGO_OUTPUT"; then
+        write_status ok \
+            "WebDAV eingelesen und Piwigo synchronisiert; Bildaufbereitung abgeschlossen" \
+            "" \
+            "api" \
+            "ok" \
+            "Piwigo-API erfolgreich" \
+            "not_needed" \
+            "Fallback wurde nicht benötigt"
+    elif grep -q 'Piwigo-Datenbanksynchronisierung per Benutzername/Passwort-Fallback erfolgreich' <<<"$PIWIGO_OUTPUT"; then
+        write_status ok \
+            "WebDAV eingelesen und Piwigo über Fallback synchronisiert; Bildaufbereitung abgeschlossen" \
+            "" \
+            "fallback" \
+            "not_used" \
+            "API war nicht nutzbar" \
+            "ok" \
+            "Benutzername/Passwort-Fallback erfolgreich"
+    else
+        write_status ok "WebDAV eingelesen und Piwigo synchronisiert; Bildaufbereitung abgeschlossen"
+    fi
+else
+    write_status ok "WebDAV eingelesen; Piwigo-Synchronisierung ist für diese Verbindung deaktiviert"
+fi

template/admin_tabs.tpl

@@ -9,7 +9,13 @@
 .bratonien-tab-panel { width:100%; max-width:none; margin-left:0 !important; margin-right:0 !important; }
 .bratonien-tab-panel[hidden] { display:none !important; }
 .bratonien-card { margin-left:0; margin-right:0; }
-@media (max-width:760px) { .bratonien-tabs{gap:5px}.bratonien-tab{border-bottom:1px solid rgba(255,255,255,.16);border-radius:4px;margin-bottom:0;padding:9px 11px} }
+.bratonien-edit-dialog { width:min(920px,calc(100vw - 3rem)); max-height:88vh; overflow:auto; background:#444; color:inherit; border:1px solid #777; border-radius:4px; padding:0; box-shadow:0 18px 60px rgba(0,0,0,.55); }
+.bratonien-edit-dialog::backdrop { background:rgba(0,0,0,.55); }
+.bratonien-edit-dialog__body { padding:1.25rem 1.5rem; }
+.bratonien-storage-row { display:grid; grid-template-columns:minmax(120px,.7fr) minmax(150px,1fr) minmax(240px,1.5fr) auto; gap:.5rem; align-items:end; margin:.5rem 0; }
+.bratonien-storage-row label { display:flex; flex-direction:column; gap:.25rem; }
+.bratonien-storage-row input { width:100%; box-sizing:border-box; }
+@media (max-width:760px) { .bratonien-tabs{gap:5px}.bratonien-tab{border-bottom:1px solid rgba(255,255,255,.16);border-radius:4px;margin-bottom:0;padding:9px 11px}.bratonien-storage-row{grid-template-columns:1fr} }
 </style>
 <div id="bratonien-tabs-anchor"></div>
 <script>
@@ -48,10 +54,35 @@
     var openButton=document.getElementById('bratonien-nc-wizard-open');
     var closeButton=document.getElementById('bratonien-nc-wizard-close');
     var storageKey='bratonienNcWizardOpen';
+    var modeKey='bratonienNcWizardMode';
     var resetBusy=false;
 
     function token(){var input=section.querySelector('input[name="pwg_token"]');return input?input.value:'';}
     function setOpen(value){try{if(value)sessionStorage.setItem(storageKey,'1');else sessionStorage.removeItem(storageKey);}catch(e){}}
+    function mode(){try{return sessionStorage.getItem(modeKey)||'';}catch(e){return '';}}
+    function clearMode(){try{sessionStorage.removeItem(modeKey);}catch(e){}}
+    function applyMode(){
+      if(!dialog)return;
+      var current=mode();
+      var heading=dialog.querySelector('h4');
+      var finish=dialog.querySelector('button[value="nc_connector_wizard_finish"]');
+      if(current==='edit'){
+        if(heading)heading.textContent='Verbindung bearbeiten';
+        if(finish)finish.textContent='Änderungen speichern';
+      }else if(current==='migrate'){
+        if(heading)heading.textContent='Auf WebDAV migrieren';
+        if(finish)finish.textContent='Migration starten';
+      }else{
+        if(heading)heading.textContent='Neue Verbindung';
+        if(finish)finish.textContent='Verbindung anlegen';
+      }
+    }
+    function showWizard(){
+      setOpen(true);applyMode();
+      if(!dialog)return;
+      if(typeof dialog.showModal==='function'&&!dialog.open)dialog.showModal();
+      else dialog.setAttribute('open','open');
+    }
     function resetServer(){
       var pwgToken=token();
       if(!pwgToken)return Promise.reject(new Error('CSRF token missing'));
@@ -59,14 +90,13 @@
       return fetch(window.location.href,{method:'POST',credentials:'same-origin',cache:'no-store',headers:{'Content-Type':'application/x-www-form-urlencoded;charset=UTF-8'},body:body.toString()});
     }
     function closeAfterReset(){
-      if(resetBusy)return;resetBusy=true;setOpen(false);
+      if(resetBusy)return;resetBusy=true;setOpen(false);clearMode();
       resetServer().catch(function(){}).finally(function(){resetBusy=false;if(dialog){if(typeof dialog.close==='function'&&dialog.open)dialog.close();else dialog.removeAttribute('open');}});
     }
 
     if(openButton){
       openButton.addEventListener('click',function(event){
-        if(resetBusy)return;event.preventDefault();event.stopImmediatePropagation();resetBusy=true;setOpen(true);
-        resetServer().then(function(){window.location.reload();}).catch(function(){setOpen(false);resetBusy=false;});
+        event.preventDefault();event.stopImmediatePropagation();clearMode();showWizard();
       },true);
     }
     if(closeButton){
@@ -75,12 +105,115 @@
     if(dialog){
       dialog.addEventListener('cancel',function(event){event.preventDefault();event.stopImmediatePropagation();closeAfterReset();},true);
       dialog.addEventListener('click',function(event){if(event.target===dialog){event.preventDefault();event.stopImmediatePropagation();closeAfterReset();}},true);
+      [].slice.call(dialog.querySelectorAll('form[data-bratonien-wizard-form]')).forEach(function(form){
+        form.addEventListener('submit',function(event){
+          var submitter=event.submitter;
+          setOpen(true);
+          if(submitter&&submitter.hasAttribute('data-bratonien-wizard-end')){
+            setOpen(false);
+            if(submitter.value==='nc_connector_wizard_reset')clearMode();
+          }
+        },true);
+      });
+      try{if(sessionStorage.getItem(storageKey)==='1')showWizard();}catch(e){}
+      applyMode();
     }
   }
 
+  function initNCConnectionEditing(){
+    var section=document.getElementById('nc-connector');if(!section)return;
+    var modeKey='bratonienNcWizardMode';
+    var pwgTokenInput=section.querySelector('input[name="pwg_token"]');
+    var pwgToken=pwgTokenInput?pwgTokenInput.value:'';
+
+    function setMode(value){try{sessionStorage.setItem(modeKey,value);}catch(e){}}
+    function makePostButton(label,tool,id,modeValue){
+      var form=document.createElement('form');form.method='post';form.style.display='inline';
+      var token=document.createElement('input');token.type='hidden';token.name='pwg_token';token.value=pwgToken;form.appendChild(token);
+      var connection=document.createElement('input');connection.type='hidden';connection.name='connection_id';connection.value=String(id);form.appendChild(connection);
+      var button=document.createElement('button');button.type='submit';button.className='buttonLike';button.name='bratonien_tool';button.value=tool;button.textContent=label;
+      if(modeValue)form.addEventListener('submit',function(){setMode(modeValue);});
+      form.appendChild(button);return form;
+    }
+    function escapeHtml(value){return String(value==null?'':value).replace(/[&<>"']/g,function(c){return {'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&#039;'}[c];});}
+    function localEditorDialog(){
+      var dialog=document.getElementById('bratonien-nc-local-edit-dialog');
+      if(dialog)return dialog;
+      dialog=document.createElement('dialog');dialog.id='bratonien-nc-local-edit-dialog';dialog.className='bratonien-edit-dialog';
+      dialog.innerHTML='<div class="bratonien-edit-dialog__body"><div style="display:flex;align-items:center;justify-content:space-between;gap:1rem"><div><h4 style="margin:0">Verbindung bearbeiten</h4><p class="bratonien-base-note" style="margin:.35rem 0 0">Bestehende Legacy-Verbindung. Änderungen werden in derselben Verbindung gespeichert.</p></div><button type="button" class="buttonLike" data-local-edit-close>Schließen</button></div><div data-local-edit-content style="margin-top:1rem"></div></div>';
+      document.body.appendChild(dialog);
+      dialog.querySelector('[data-local-edit-close]').addEventListener('click',function(){dialog.close();});
+      dialog.addEventListener('click',function(event){if(event.target===dialog)dialog.close();});
+      return dialog;
+    }
+    function storageRow(storage){
+      return '<div class="bratonien-storage-row" data-storage-row>'+
+        '<label>Storage-ID<input name="nc_storage_id[]" value="'+escapeHtml(storage.storage_id||'')+'" required></label>'+
+        '<label>Quellordner<input name="nc_source_prefix[]" value="'+escapeHtml(storage.source_prefix||'')+'" placeholder="optional"></label>'+
+        '<label>Lokaler Speicherpfad<input name="nc_local_mount[]" value="'+escapeHtml(storage.local_mount||'')+'" required></label>'+
+        '<button type="button" class="buttonLike" data-remove-storage>Entfernen</button></div>';
+    }
+    function openLocalEditor(id){
+      var dialog=localEditorDialog();
+      var content=dialog.querySelector('[data-local-edit-content]');
+      content.innerHTML='<p class="bratonien-base-note">Verbindung wird geladen …</p>';
+      if(typeof dialog.showModal==='function')dialog.showModal();else dialog.setAttribute('open','open');
+      fetch('plugins/bratonien_tools/nc-connector-edit-data.php?connection_id='+encodeURIComponent(id)+'&_='+Date.now(),{credentials:'same-origin',cache:'no-store',headers:{'Accept':'application/json'}})
+        .then(function(response){return response.json().then(function(data){if(!response.ok)throw new Error(data.error||('HTTP '+response.status));return data;});})
+        .then(function(data){
+          if(data.adapter!=='local')throw new Error('Diese Verbindung ist keine Legacy-Verbindung.');
+          var legacy=data.legacy||{};var storages=Array.isArray(legacy.storages)?legacy.storages:[];
+          var rows=storages.map(storageRow).join('');
+          if(!rows)rows=storageRow({});
+          content.innerHTML='<form method="post" data-local-edit-form>'+
+            '<input type="hidden" name="pwg_token" value="'+escapeHtml(pwgToken)+'">'+
+            '<input type="hidden" name="connection_id" value="'+escapeHtml(data.id)+'">'+
+            '<div class="bratonien-form-grid">'+
+              '<label class="bratonien-label">Name</label><input name="connection_name" value="'+escapeHtml(data.name)+'" required>'+
+              '<label class="bratonien-label">Datenbank-Server</label><input name="nc_host" value="'+escapeHtml(legacy.host)+'" required>'+
+              '<label class="bratonien-label">Port</label><input name="nc_port" type="number" min="1" max="65535" value="'+escapeHtml(legacy.port||5432)+'" required>'+
+              '<label class="bratonien-label">Datenbank</label><input name="nc_database" value="'+escapeHtml(legacy.database)+'" required>'+
+              '<label class="bratonien-label">Reader-Benutzer</label><input name="nc_user" value="'+escapeHtml(legacy.user)+'" required>'+
+              '<label class="bratonien-label">Reader-Passwort</label><input name="nc_db_password" type="password" autocomplete="new-password" placeholder="leer = unverändert">'+
+            '</div>'+
+            '<h5 style="margin-top:1rem">Speicherorte</h5><p class="bratonien-base-note">Jeder Speicherort wird einzeln bearbeitet. Es ist kein Pipe-/Textformat erforderlich.</p><div data-storage-list>'+rows+'</div><button type="button" class="buttonLike" data-add-storage>Speicherort hinzufügen</button>'+
+            '<details style="margin-top:1rem"><summary>Erweiterte Legacy-Einstellungen</summary><div class="bratonien-form-grid" style="margin-top:.75rem">'+
+              '<label class="bratonien-label">Source-View</label><input name="nc_source_view" value="'+escapeHtml(legacy.source_view)+'" required>'+
+              '<label class="bratonien-label">Activity-View</label><input name="nc_activity_view" value="'+escapeHtml(legacy.activity_view)+'" required>'+
+              '<label class="bratonien-label">Piwigo-Galerieordner</label><input name="nc_gallery_root" value="'+escapeHtml(legacy.gallery_root)+'" required>'+
+              '<label class="bratonien-label">Ruhezeit (Sek.)</label><input name="nc_quiet_seconds" type="number" min="0" value="'+escapeHtml(legacy.quiet_seconds)+'">'+
+              '<label class="bratonien-label">Maximale Wartezeit (Sek.)</label><input name="nc_max_wait_seconds" type="number" min="60" value="'+escapeHtml(legacy.max_wait_seconds)+'">'+
+              '<label class="bratonien-label">Vollprüfung nach (Sek.)</label><input name="nc_full_sync_seconds" type="number" min="300" value="'+escapeHtml(legacy.full_sync_seconds)+'">'+
+            '</div></details>'+
+            '<div class="bratonien-actions" style="margin-top:1rem"><button class="buttonLike" type="submit" name="bratonien_tool" value="nc_connector_update_local">Änderungen speichern</button><button class="buttonLike" type="button" data-local-edit-cancel>Abbrechen</button></div></form>';
+          var form=content.querySelector('[data-local-edit-form]');
+          form.querySelector('[data-local-edit-cancel]').addEventListener('click',function(){dialog.close();});
+          form.querySelector('[data-add-storage]').addEventListener('click',function(){form.querySelector('[data-storage-list]').insertAdjacentHTML('beforeend',storageRow({}));});
+          form.addEventListener('click',function(event){var remove=event.target.closest('[data-remove-storage]');if(remove){var row=remove.closest('[data-storage-row]');if(row)row.remove();}});
+        })
+        .catch(function(error){content.innerHTML='<p class="bratonien-main-cache__warning"><strong>Bearbeiten nicht möglich:</strong> '+escapeHtml(error.message||String(error))+'</p>';});
+    }
+
+    [].slice.call(section.querySelectorAll('button[value="nc_connector_edit_start"]')).forEach(function(button){var form=button.closest('form');if(form)form.remove();});
+
+    [].slice.call(section.querySelectorAll('button[value="nc_connector_delete"]')).forEach(function(deleteButton){
+      var deleteForm=deleteButton.closest('form');var card=deleteButton.closest('details');if(!deleteForm||!card)return;
+      var idInput=deleteForm.querySelector('input[name="connection_id"]');if(!idInput)return;var id=idInput.value;
+      var actions=deleteForm.parentElement;if(!actions)return;
+      var text=card.textContent||'';var isLocal=text.indexOf('bestehende Legacy-Konfiguration')!==-1;
+      if(isLocal){
+        var edit=document.createElement('button');edit.type='button';edit.className='buttonLike';edit.textContent='Bearbeiten';edit.addEventListener('click',function(){openLocalEditor(id);});actions.insertBefore(edit,deleteForm);
+        actions.insertBefore(makePostButton('Auf WebDAV migrieren','nc_connector_migrate_start',id,'migrate'),deleteForm);
+      }else{
+        actions.insertBefore(makePostButton('Bearbeiten','nc_connector_edit_start',id,'edit'),deleteForm);
+      }
+    });
+  }
+
   function initNCConnectorPolling(){
     var section=document.getElementById('nc-connector');if(!section)return;
     var endpoint='plugins/bratonien_tools/nc-connector-status.php';
+    var pollTimer=null;
 
     function valueNodeForLabel(labelText){
       var labels=[].slice.call(section.querySelectorAll('.bratonien-label'));
@@ -108,21 +241,28 @@
     var nextRunNode=valueNodeForLabel('Nächster Lauf');
     var lastResultNode=lastResultValueNode();
 
+    function render(data){
+      if(lastRunNode&&typeof data.last_run_label==='string'&&data.last_run_label!=='')lastRunNode.textContent=data.last_run_label;
+      if(nextRunNode&&typeof data.next_run_label==='string'&&data.next_run_label!=='')nextRunNode.textContent=data.next_run_label;
+      if(lastResultNode&&typeof data.message==='string'&&data.message!=='')lastResultNode.textContent=data.message;
+    }
+
     function poll(){
-      fetch(endpoint+'?_='+Date.now(),{credentials:'same-origin',cache:'no-store'})
+      fetch(endpoint+'?_='+Date.now(),{credentials:'same-origin',cache:'no-store',headers:{'Accept':'application/json'}})
         .then(function(response){if(!response.ok)throw new Error('HTTP '+response.status);return response.json();})
-        .then(function(data){
-          if(lastRunNode&&data.last_run_label)lastRunNode.textContent=data.last_run_label;
-          if(nextRunNode&&data.next_run_label)nextRunNode.textContent=data.next_run_label;
-          if(lastResultNode&&typeof data.message==='string'&&data.message!=='')lastResultNode.textContent=data.message;
-        })
+        .then(render)
         .catch(function(){});
     }
 
-    poll();window.setInterval(poll,5000);
+    function schedule(){
+      if(pollTimer)window.clearInterval(pollTimer);
+      pollTimer=window.setInterval(poll,5000);
+    }
+
+    poll();schedule();
   }
 
-  function initAll(){initBratonienTabs();initNCWizardLifecycle();initNCConnectorPolling();}
+  function initAll(){initBratonienTabs();initNCWizardLifecycle();initNCConnectionEditing();initNCConnectorPolling();}
   if(document.readyState==='loading')document.addEventListener('DOMContentLoaded',initAll);else initAll();
 })();
 </script>

tools/album_rules.inc.php

@@ -61,6 +61,7 @@ function bratonien_tools_save_album_rule()
     )));
   }
 
+  bratonien_tools_clear_watermark_cache();
   return array('message'=>'Albumregel gespeichert.');
 }
 
@@ -93,7 +94,34 @@ function bratonien_tools_resolve_album_rule($category_id, array $categories, arr
     $by_id[(int)$category['id']] = $category;
   }
 
-  $current = (int)$category_id;
+  $category_id = (int)$category_id;
+  $root = $by_id[$category_id] ?? null;
+  $is_private = $root && isset($root['status']) && $root['status'] === 'private';
+
+  if ($is_private)
+  {
+    if (isset($rules[$category_id]))
+    {
+      $rule = $rules[$category_id];
+      if ($rule['mode'] === 'disabled')
+      {
+        return array('mode'=>'disabled','profile_id'=>null,'source'=>'album');
+      }
+      if ($rule['mode'] === 'profile')
+      {
+        return array('mode'=>'profile','profile_id'=>(int)$rule['profile_id'],'source'=>'album');
+      }
+    }
+
+    $profile_id = $defaults['private_profile'] ?? null;
+    if (empty($profile_id))
+    {
+      return array('mode'=>'disabled','profile_id'=>null,'source'=>'global');
+    }
+    return array('mode'=>'profile','profile_id'=>(int)$profile_id,'source'=>'global');
+  }
+
+  $current = $category_id;
   $visited = array();
 
   while ($current > 0 && isset($by_id[$current]) && !isset($visited[$current]))
@@ -116,10 +144,7 @@ function bratonien_tools_resolve_album_rule($category_id, array $categories, arr
     $current = (int)($by_id[$current]['id_uppercat'] ?? 0);
   }
 
-  $root = $by_id[(int)$category_id] ?? null;
-  $is_private = $root && isset($root['status']) && $root['status'] === 'private';
-  $profile_id = $is_private ? ($defaults['private_profile'] ?? null) : ($defaults['public_profile'] ?? null);
-
+  $profile_id = $defaults['public_profile'] ?? null;
   if (empty($profile_id))
   {
     return array('mode'=>'disabled','profile_id'=>null,'source'=>'global');

tools/watermark_profiles.inc.php

@@ -128,6 +128,7 @@ function bratonien_tools_save_watermark_profile()
     mass_inserts($table, array_keys($data), array($data));
   }
 
+  bratonien_tools_clear_watermark_cache();
   return array('message'=>'Wasserzeichenprofil gespeichert.');
 }
 
@@ -158,6 +159,7 @@ function bratonien_tools_delete_watermark_profile()
   }
 
   pwg_query('DELETE FROM '.bratonien_tools_table('watermark_profiles').' WHERE id='.$id);
+  bratonien_tools_clear_watermark_cache();
   return array('message'=>'Wasserzeichenprofil geloescht.');
 }
 
@@ -174,6 +176,7 @@ function bratonien_tools_duplicate_watermark_profile()
   $profile['name'] .= ' (Kopie)';
   $profile['created'] = date('Y-m-d H:i:s');
   mass_inserts(bratonien_tools_table('watermark_profiles'), array_keys($profile), array($profile));
+  bratonien_tools_clear_watermark_cache();
 
   return array('message'=>'Wasserzeichenprofil dupliziert.');
 }

tools/watermark_settings.inc.php

@@ -4,6 +4,59 @@ if (!defined('PHPWG_ROOT_PATH'))
   die('Hacking attempt!');
 }
 
+function bratonien_tools_watermark_cache_dir()
+{
+  return PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR.'bratonien-watermark';
+}
+
+function bratonien_tools_remove_tree($path)
+{
+  $path = rtrim((string)$path, DIRECTORY_SEPARATOR);
+  if ($path === '' || !file_exists($path)) return;
+
+  if (is_file($path) || is_link($path))
+  {
+    @unlink($path);
+    return;
+  }
+
+  foreach (scandir($path) ?: array() as $entry)
+  {
+    if ($entry === '.' || $entry === '..') continue;
+    bratonien_tools_remove_tree($path.DIRECTORY_SEPARATOR.$entry);
+  }
+  @rmdir($path);
+}
+
+function bratonien_tools_clear_watermark_cache()
+{
+  $dir = bratonien_tools_watermark_cache_dir();
+  $derivative_root = realpath(PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR);
+  $parent = realpath(dirname($dir));
+
+  if ($derivative_root === false || $parent === false || $parent !== $derivative_root)
+  {
+    throw new RuntimeException('Wasserzeichen-Cachepfad ist ungueltig.');
+  }
+
+  if (is_dir($dir))
+  {
+    bratonien_tools_remove_tree($dir);
+  }
+}
+
+function bratonien_tools_watermark_cache_upgrade()
+{
+  $version = '0.9.7.13';
+  if ((string)conf_get_param('bratonien_watermark_cache_version', '') === $version)
+  {
+    return;
+  }
+
+  bratonien_tools_clear_watermark_cache();
+  conf_update_param('bratonien_watermark_cache_version', $version);
+}
+
 function bratonien_tools_get_watermark_defaults()
 {
   $defaults = conf_get_param('bratonien_watermark_defaults', null);
@@ -40,6 +93,7 @@ function bratonien_tools_save_watermark_defaults()
   );
 
   conf_update_param('bratonien_watermark_defaults', json_encode($config));
+  bratonien_tools_clear_watermark_cache();
 
   return array('message'=>'Globale Wasserzeichenregeln gespeichert.');
 }

webdav-image.php

@@ -0,0 +1,175 @@
+<?php
+define('PHPWG_ROOT_PATH', '../../');
+include_once(PHPWG_ROOT_PATH.'include/common.inc.php');
+
+if (!defined('BRATONIEN_TOOLS_PATH'))
+{
+  define('BRATONIEN_TOOLS_ID', basename(__DIR__));
+  define('BRATONIEN_TOOLS_PATH', PHPWG_ROOT_PATH.'plugins/'.BRATONIEN_TOOLS_ID.'/');
+}
+require_once(BRATONIEN_TOOLS_PATH.'include/webdav_image_runtime.inc.php');
+require_once(BRATONIEN_TOOLS_PATH.'include/nc_transport.inc.php');
+
+function bratonien_tools_webdav_image_abort($status, $message)
+{
+  http_response_code((int)$status);
+  header('Content-Type: text/plain; charset=utf-8');
+  header('Cache-Control: no-store');
+  echo $message;
+  exit;
+}
+
+function bratonien_tools_webdav_image_decrypt_secret($blob, $hex_key)
+{
+  $hex_key = trim((string)$hex_key);
+  if (!preg_match('/^[a-f0-9]{64}$/', $hex_key)) return null;
+  $outer = base64_decode(trim((string)$blob), true);
+  $payload = is_string($outer) ? json_decode($outer, true) : null;
+  if (!is_array($payload) || (int)($payload['v'] ?? 0) !== 1) return null;
+  $iv = base64_decode((string)($payload['iv'] ?? ''), true);
+  $tag = base64_decode((string)($payload['tag'] ?? ''), true);
+  $cipher = base64_decode((string)($payload['data'] ?? ''), true);
+  if (!is_string($iv) || !is_string($tag) || !is_string($cipher)) return null;
+  $plain = openssl_decrypt($cipher, 'aes-256-gcm', hex2bin($hex_key), OPENSSL_RAW_DATA, $iv, $tag);
+  if ($plain === false) return null;
+  $decoded = json_decode((string)$plain, true);
+  return is_array($decoded) ? $decoded : null;
+}
+
+function bratonien_tools_webdav_image_quote_path($path)
+{
+  $parts = array_values(array_filter(explode('/', trim((string)$path, '/')), 'strlen'));
+  return implode('/', array_map('rawurlencode', $parts));
+}
+
+$image_id = (int)($_GET['id'] ?? 0);
+if ($image_id < 1) bratonien_tools_webdav_image_abort(400, 'Bild-ID fehlt.');
+
+$permission_condition = get_sql_condition_FandF(array('forbidden_categories'=>'category_id'), null, true);
+$access_result = pwg_query('SELECT 1 FROM '.IMAGE_CATEGORY_TABLE.' WHERE image_id='.$image_id.' AND '.$permission_condition.' LIMIT 1');
+if (!pwg_db_num_rows($access_result)) bratonien_tools_webdav_image_abort(403, 'Kein Zugriff auf dieses Bild.');
+
+$source = bratonien_tools_webdav_image_source_info($image_id);
+if (!$source) bratonien_tools_webdav_image_abort(404, 'Keine WebDAV-Quelle für dieses Bild gefunden.');
+
+if (!empty($_GET['preview']))
+{
+  $preview = bratonien_tools_webdav_preview_path($source);
+  if ($preview)
+  {
+    $mtime = @filemtime($preview) ?: time();
+    $etag = sha1($preview.'|'.$mtime.'|'.(@filesize($preview) ?: 0));
+    header('Content-Type: '.bratonien_tools_webdav_preview_content_type($preview));
+    header('Content-Length: '.(string)filesize($preview));
+    header('ETag: "'.$etag.'"');
+    header('Cache-Control: private, max-age=86400, must-revalidate');
+    header('X-Content-Type-Options: nosniff');
+    $client_etag = trim((string)($_SERVER['HTTP_IF_NONE_MATCH'] ?? ''), " \t\r\n\"");
+    if ($client_etag !== '' && hash_equals($etag, $client_etag))
+    {
+      http_response_code(304);
+      exit;
+    }
+    if (($_SERVER['REQUEST_METHOD'] ?? 'GET') !== 'HEAD') readfile($preview);
+    exit;
+  }
+}
+
+$table = $GLOBALS['prefixeTable'].'bratonien_tools_nc_connections';
+$result = pwg_query('SELECT config_json, secret_blob FROM `'.$table.'` WHERE id='.(int)$source['connection_id'].' LIMIT 1');
+if (!pwg_db_num_rows($result)) bratonien_tools_webdav_image_abort(404, 'WebDAV-Verbindung nicht gefunden.');
+$row = pwg_db_fetch_assoc($result);
+$config = json_decode((string)$row['config_json'], true);
+if (!is_array($config)) bratonien_tools_webdav_image_abort(500, 'WebDAV-Konfiguration ist ungültig.');
+
+$key_result = pwg_query("SELECT value FROM ".$GLOBALS['prefixeTable']."config WHERE param='bratonien_nc_connector_secret' LIMIT 1");
+if (!pwg_db_num_rows($key_result)) bratonien_tools_webdav_image_abort(500, 'Connector-Schlüssel fehlt.');
+$key_row = pwg_db_fetch_assoc($key_result);
+$credentials = bratonien_tools_webdav_image_decrypt_secret((string)$row['secret_blob'], (string)$key_row['value']);
+if (!is_array($credentials)) bratonien_tools_webdav_image_abort(500, 'WebDAV-Zugangsdaten konnten nicht gelesen werden.');
+
+$base_url = rtrim((string)($config['nextcloud_url'] ?? ''), '/');
+$user = trim((string)($credentials['nextcloud_user'] ?? ''));
+$password = (string)($credentials['nextcloud_password'] ?? '');
+$webdav_path = trim((string)$source['webdav_path'], '/');
+if ($base_url === '' || $user === '' || $password === '' || $webdav_path === '')
+{
+  bratonien_tools_webdav_image_abort(500, 'WebDAV-Bildquelle ist unvollständig.');
+}
+
+$etag = trim((string)($source['etag'] ?? ''));
+if ($etag !== '')
+{
+  header('ETag: "'.str_replace('"', '', $etag).'"');
+  $client_etag = trim((string)($_SERVER['HTTP_IF_NONE_MATCH'] ?? ''), " \t\r\n\"");
+  if ($client_etag !== '' && hash_equals($etag, $client_etag))
+  {
+    http_response_code(304);
+    exit;
+  }
+}
+header('Cache-Control: private, max-age=300, must-revalidate');
+header('X-Content-Type-Options: nosniff');
+
+$url = $base_url.'/remote.php/dav/files/'.rawurlencode($user).'/'.bratonien_tools_webdav_image_quote_path($webdav_path);
+$ch = curl_init($url);
+$options = array(
+  CURLOPT_FOLLOWLOCATION => false,
+  CURLOPT_CONNECTTIMEOUT => 10,
+  CURLOPT_TIMEOUT => 120,
+  CURLOPT_HTTPAUTH => CURLAUTH_BASIC,
+  CURLOPT_USERPWD => $user.':'.$password,
+  CURLOPT_RETURNTRANSFER => false,
+  CURLOPT_FAILONERROR => false,
+  CURLOPT_USERAGENT => 'Bratonien-Tools-WebDAV-Image/0.9.7.16',
+  CURLOPT_HEADERFUNCTION => function($ch, $line)
+  {
+    $length = strlen($line);
+    $trimmed = trim($line);
+    if ($trimmed === '') return $length;
+    if (preg_match('#^HTTP/\S+\s+([0-9]{3})#i', $trimmed, $m))
+    {
+      http_response_code((int)$m[1]);
+      return $length;
+    }
+    $colon = strpos($line, ':');
+    if ($colon === false) return $length;
+    $name = strtolower(trim(substr($line, 0, $colon)));
+    $value = trim(substr($line, $colon + 1));
+    if (in_array($name, array('content-type','content-length','content-range','accept-ranges','last-modified'), true))
+    {
+      header($name.': '.$value, true);
+    }
+    return $length;
+  },
+  CURLOPT_WRITEFUNCTION => function($ch, $data)
+  {
+    echo $data;
+    return strlen($data);
+  },
+);
+bratonien_tools_nc_transport_apply_curl($options, $url);
+if (!empty($_SERVER['HTTP_RANGE']))
+{
+  $range = trim((string)$_SERVER['HTTP_RANGE']);
+  if (preg_match('/^bytes=(.+)$/i', $range, $m)) $options[CURLOPT_RANGE] = $m[1];
+}
+if (($_SERVER['REQUEST_METHOD'] ?? 'GET') === 'HEAD')
+{
+  $options[CURLOPT_NOBODY] = true;
+}
+curl_setopt_array($ch, $options);
+$ok = curl_exec($ch);
+$errno = curl_errno($ch);
+$http = (int)curl_getinfo($ch, CURLINFO_HTTP_CODE);
+curl_close($ch);
+
+if ($ok === false || $errno !== 0)
+{
+  if (!headers_sent()) bratonien_tools_webdav_image_abort(502, 'Nextcloud-Bild konnte nicht geladen werden.');
+  exit;
+}
+if ($http < 200 || $http >= 400)
+{
+  exit;
+}