Bump Bratonien Tools to 0.9.6.8

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',

include/nc_connector_edit.inc.php

@@ -0,0 +1,109 @@
+<?php
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die('Hacking attempt!');
+}
+
+/**
+ * Start the normal WebDAV wizard with the values of an existing connection.
+ *
+ * Remote/WebDAV connections are edited in place. A legacy/local connection is
+ * intentionally not mutated: the wizard prepares its WebDAV successor while
+ * the existing connection remains available as fallback.
+ */
+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();
+  $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 ($path === '' || $fileid < 1) continue;
+    $selected[] = $path;
+    $selected_ids[$path] = $fileid;
+  }
+
+  $is_remote = (string)$connection['adapter'] === 'remote'
+    && (string)($config['source_mode'] ?? '') === 'webdav-placeholder';
+
+  $state = bratonien_tools_nc_wizard_state();
+  $state = array_merge($state, array(
+    'editing_connection_id'=>$id,
+    'editing_adapter'=>(string)$connection['adapter'],
+    'editing_mode'=>$is_remote ? 'update' : 'migrate',
+    '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);
+
+  return array(
+    'message'=>$is_remote
+      ? 'Verbindung #'.$id.' wurde zum Bearbeiten geöffnet.'
+      : 'Verbindung #'.$id.' wird im Assistenten auf WebDAV vorbereitet. Die bestehende Legacy-Verbindung bleibt dabei als Fallback erhalten.',
+  );
+}

include/nc_connector_webdav.inc.php

@@ -5,10 +5,81 @@ if (!defined('PHPWG_ROOT_PATH'))
 }
 
 /**
- * Create a disabled WebDAV-backed connector beside the existing local modes.
+ * Return the only existing local connector as migration fallback.
+ */
+function bratonien_tools_nc_connector_single_local_fallback()
+{
+  bratonien_tools_nc_connector_ensure_table();
+  $table = bratonien_tools_nc_connector_table();
+  $result = pwg_query("SELECT id, enabled, takeover_state, config_json FROM `$table` WHERE adapter='local' ORDER BY id");
+  $rows = array();
+
+  while ($row = pwg_db_fetch_assoc($result))
+  {
+    $rows[] = $row;
+    if (count($rows) > 1) return null;
+  }
+
+  if (count($rows) !== 1) return null;
+
+  $row = $rows[0];
+  $config = json_decode((string)$row['config_json'], true);
+  if (!is_array($config)) $config = array();
+
+  return array(
+    'id'=>(int)$row['id'],
+    'enabled'=>(bool)$row['enabled'],
+    'takeover_state'=>(string)$row['takeover_state'],
+    'config'=>$config,
+  );
+}
+
+/**
+ * Link a WebDAV connection with the single existing local fallback.
+ */
+function bratonien_tools_nc_connector_pair_migration_fallback($webdav_id, array &$webdav_config, $now)
+{
+  $legacy = bratonien_tools_nc_connector_single_local_fallback();
+  if (!$legacy) return null;
+
+  $legacy_id = (int)$legacy['id'];
+  if ($legacy_id < 1 || $legacy_id === (int)$webdav_id) return null;
+
+  $webdav_config['migration'] = array(
+    'role'=>'webdav-primary-candidate',
+    'legacy_fallback_connection_id'=>$legacy_id,
+    'fallback_policy'=>'keep-running',
+    'paired_at'=>(string)$now,
+    'cutover_state'=>'parallel',
+  );
+
+  $legacy_config = $legacy['config'];
+  $legacy_config['migration'] = array(
+    'role'=>'legacy-fallback',
+    'webdav_successor_connection_id'=>(int)$webdav_id,
+    'fallback_policy'=>'keep-running',
+    'paired_at'=>(string)$now,
+    'cutover_state'=>'parallel',
+  );
+
+  $legacy_json = json_encode($legacy_config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+  if (!is_string($legacy_json))
+  {
+    throw new RuntimeException('Die bestehende Verbindung konnte nicht als Migrations-Fallback markiert werden.');
+  }
+
+  $table = bratonien_tools_nc_connector_table();
+  pwg_query("UPDATE `$table` SET config_json='".pwg_db_real_escape_string($legacy_json)."', updated='".pwg_db_real_escape_string((string)$now)."' WHERE id=".$legacy_id." LIMIT 1");
+
+  return $legacy_id;
+}
+
+/**
+ * Create or update a WebDAV-backed connector from the user-facing wizard.
  *
- * This deliberately does not activate, migrate or modify any existing
- * connection. It only persists the data required for the parallel WebDAV path.
+ * Remote connections are updated in place. When the editor was opened for a
+ * legacy connection, a WebDAV successor is created and the legacy connection
+ * stays available as fallback.
  */
 function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
 {
@@ -24,7 +95,7 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
   $password = (string)($state['_password'] ?? '');
   if ($base_url === '' || $username === '' || $password === '')
   {
-    throw new RuntimeException('Für den WebDAV-Testpfad fehlen Nextcloud-Adresse oder Zugangsdaten.');
+    throw new RuntimeException('Für den WebDAV-Zugang fehlen Nextcloud-Adresse oder Zugangsdaten.');
   }
 
   $selected = isset($state['directory_selected']) && is_array($state['directory_selected'])
@@ -34,7 +105,7 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
     ? $state['directory_selected_fileids']
     : array();
   $selected = array_values(array_filter($selected, function($path) { return $path !== ''; }));
-  if (!$selected) throw new RuntimeException('Bitte mindestens ein Nextcloud-Verzeichnis für den WebDAV-Testpfad auswählen.');
+  if (!$selected) throw new RuntimeException('Bitte mindestens ein Nextcloud-Verzeichnis auswählen.');
 
   $roots = array();
   foreach ($selected as $path)
@@ -59,6 +130,14 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
   $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';
+
   $config = array(
     'origin'=>'native',
     'source_mode'=>'webdav-placeholder',
@@ -78,6 +157,19 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
     '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','migration') 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] ?? ''));
@@ -96,15 +188,31 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
   ), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
   if (!is_string($secret_payload)) throw new RuntimeException('WebDAV-Zugangsdaten konnten nicht serialisiert werden.');
 
-  $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.');
-
   bratonien_tools_nc_connector_ensure_table();
   $table = bratonien_tools_nc_connector_table();
   $now = date('Y-m-d H:i:s');
-  $connection_key = 'webdav-'.bin2hex(random_bytes(12));
   $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." LIMIT 1");
+    unset($_SESSION['bratonien_nc_wizard']);
+
+    return array(
+      'connection_id'=>$editing_id,
+      'message'=>'WebDAV-Verbindung #'.$editing_id.' wurde gespeichert. Der nächste Connector-Lauf verwendet die neuen Einstellungen.',
+    );
+  }
+
+  $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','"
@@ -114,20 +222,40 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
     .pwg_db_real_escape_string($now)."')");
 
   $id = (int)pwg_db_insert_id();
-  if ($id < 1) throw new RuntimeException('Die WebDAV-Testverbindung konnte nicht eindeutig angelegt werden.');
+  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))
+  try
+  {
+    $config['state_dir'] = '/var/lib/bratonien-tools/nc-connector/connection-'.$id;
+    $config['status_file'] = $config['state_dir'].'/connector-status.json';
+    $legacy_fallback_id = bratonien_tools_nc_connector_pair_migration_fallback($id, $config, $now);
+
+    $config_json = json_encode($config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+    if (!is_string($config_json))
+    {
+      throw new RuntimeException('Die WebDAV-Verbindung konnte nach dem Anlegen nicht serialisiert werden.');
+    }
+    pwg_query("UPDATE `$table` SET config_json='".pwg_db_real_escape_string($config_json)."' WHERE id=".$id." LIMIT 1");
+  }
+  catch (Throwable $e)
   {
     pwg_query("DELETE FROM `$table` WHERE id=".$id." LIMIT 1");
-    throw new RuntimeException('Die WebDAV-Testverbindung konnte nach dem Anlegen nicht serialisiert werden.');
+    throw $e;
+  }
+
+  unset($_SESSION['bratonien_nc_wizard']);
+
+  if ($legacy_fallback_id !== null)
+  {
+    return array(
+      'connection_id'=>$id,
+      'legacy_fallback_connection_id'=>$legacy_fallback_id,
+      'message'=>'WebDAV-Nachfolger wurde angelegt. Die bestehende lokale Verbindung #'.$legacy_fallback_id.' bleibt als Fallback erhalten.',
+    );
   }
-  pwg_query("UPDATE `$table` SET config_json='".pwg_db_real_escape_string($config_json)."' WHERE id=".$id." LIMIT 1");
 
   return array(
     'connection_id'=>$id,
-    'message'=>'Parallele WebDAV-Testverbindung wurde deaktiviert angelegt. Bestehende Verbindungen blieben unverändert.',
+    'message'=>'WebDAV-Verbindung wurde angelegt.',
   );
 }

include/tool_registry.inc.php

@@ -30,6 +30,7 @@ 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');
 
 function bratonien_tools_get_tools()
 {
@@ -56,6 +57,7 @@ function bratonien_tools_get_tools()
     '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_create_webdav_parallel' => array('handler' => 'bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard'),
+    'nc_connector_edit_start' => array('handler' => 'bratonien_tools_nc_connector_edit_start'),
     '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'),

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();
   }
 })();

main.inc.php

@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: Bratonien Tools
-Version: 0.9.6.1
+Version: 0.9.6.8
 Description: Erweiterbare Administrationswerkzeuge fuer die Bratonien-Piwigo-Installation.
 Plugin URI: https://github.com/Terranom674/Piwigo_Bratonien_Tools
 Author: Bratonien

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/run-all.sh

@@ -5,20 +5,107 @@ CONFIG_DIR="/etc/bratonien-tools/nc-connector"
 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
 shopt -s nullglob
 
+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"
+}
+
+compact_text() {
+    printf '%s\n' "$1" | tail -n 20 | tr '\n' ' ' | sed 's/[[:space:]]\+/ /g; s/^[[:space:]]//; s/[[:space:]]$//'
+}
+
+read_webdav_failure_detail() {
+    local config="$1"
+    local captured_output="${2:-}"
+    local connection_id piwigo_root status_file status_detail
+
+    connection_id="$(read_config_value CONNECTION_ID "$config")"
+    piwigo_root="$(read_config_value PIWIGO_ROOT "$config")"
+    [[ -n "$piwigo_root" ]] || piwigo_root="/var/www/piwigo"
+
+    status_detail=""
+    if [[ -n "$connection_id" ]]; then
+        status_file="${piwigo_root%/}/_data/bratonien-tools/nc-connector-status/connection-${connection_id}.json"
+        if [[ -r "$status_file" ]]; then
+            status_detail="$(php -r '
+              $file = $argv[1];
+              $data = json_decode((string)@file_get_contents($file), true);
+              if (!is_array($data)) exit(0);
+              $message = trim((string)($data["message"] ?? ""));
+              $detail = trim((string)($data["error_detail"] ?? ""));
+              $parts = array();
+              if ($message !== "") $parts[] = $message;
+              if ($detail !== "") $parts[] = $detail;
+              if ($parts) {
+                $text = preg_replace("/\\s+/u", " ", implode(" - ", $parts));
+                echo trim((string)$text);
+              }
+            ' "$status_file")"
+        fi
+    fi
+
+    if [[ -n "$captured_output" ]]; then
+        captured_output="$(compact_text "$captured_output")"
+    fi
+
+    if [[ -n "$status_detail" && -n "$captured_output" ]]; then
+        printf '%s' "$status_detail | Prozessausgabe: $captured_output"
+    elif [[ -n "$status_detail" ]]; then
+        printf '%s' "$status_detail"
+    elif [[ -n "$captured_output" ]]; then
+        printf '%s' "$captured_output"
+    elif [[ -z "$connection_id" ]]; then
+        printf '%s' 'WebDAV-Prozess wurde gestartet, aber die Verbindungs-ID fehlt in der Runtime-Konfiguration.'
+    else
+        printf '%s' "WebDAV-Prozess fuer Verbindung ${connection_id} endete mit Fehler, lieferte aber weder Statusdatei noch Prozessausgabe."
+    fi
+}
+
+write_route_status() {
+    local route="$1"
+    local label="$2"
+    local detail="$3"
+    local fallback_used="$4"
+    local success="$5"
+
+    [[ -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" => $argv[5] === "1",
+        "success" => $argv[6] === "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) {
+        fwrite(STDERR, "Route-Status konnte nicht geschrieben werden.\n");
+        exit(1);
+      }
+      @chmod($argv[1], 0644);
+    ' "$ROUTE_STATUS_FILE" "$route" "$label" "$detail" "$fallback_used" "$success"
+}
+
 if ! php "$SCRIPT_DIR/reconcile.php"; then
     echo "NC Connector: gespeicherte lokale Verbindungen konnten nicht mit der Runtime abgeglichen werden." >&2
     exit 1
 fi
 
 if ! php "$SCRIPT_DIR/reconcile-webdav.php"; then
-    echo "NC Connector: WebDAV-Testverbindungen konnten nicht mit der parallelen Runtime abgeglichen werden." >&2
+    echo "NC Connector: WebDAV-Verbindungen konnten nicht mit der Runtime abgeglichen werden." >&2
     exit 1
 fi
 
-# Nach dem Reconcile kennt Piwigo alle noch aktiven WebDAV-Verbindungen. Jetzt
-# werden Sites, Alben, Bilddatensaetze und Derivate geloeschter Verbindungen
-# entfernt. Das erfasst auch Verbindungen, die bereits vor diesem Update
-# geloescht wurden.
 if ! php "$SCRIPT_DIR/cleanup-webdav-piwigo.php"; then
     echo "NC Connector: Piwigo-Inhalte geloeschter WebDAV-Verbindungen konnten nicht bereinigt werden." >&2
     exit 1
@@ -37,20 +124,68 @@ if [[ ${#configs[@]} -eq 0 && ${#webdav_configs[@]} -eq 0 ]]; then
     exit 0
 fi
 
-result=0
-
-# WebDAV zuerst: Der parallele Shadow Tree muss bereits vollständig stehen,
-# bevor der weiterhin produktive lokale Weg seine normale Piwigo-
-# Dateisynchronisierung ausführt. So wird der neue Baum im selben Minutenlauf
-# sichtbar, ohne dass der WebDAV-Zweig selbst eine zweite globale Piwigo-
-# Synchronisierung startet.
-for config in "${webdav_configs[@]}"; do
-    name="$(basename "$config")"
-    echo "NC Connector WebDAV parallel: $name"
-    if ! env PIWIGO_CONFIG="$config" bash "$SCRIPT_DIR/sync-webdav.sh"; then
-        result=1
-    fi
+route_piwigo_root=""
+for candidate in "${webdav_configs[@]}" "${configs[@]}"; do
+    [[ -f "$candidate" ]] || continue
+    route_piwigo_root="$(read_config_value PIWIGO_ROOT "$candidate")"
+    [[ -n "$route_piwigo_root" ]] && break
 done
+[[ -n "$route_piwigo_root" ]] || route_piwigo_root="/var/www/piwigo"
+ROUTE_STATUS_FILE="${route_piwigo_root%/}/_data/bratonien-tools/nc-connector-status/route-status.json"
+
+webdav_success=0
+webdav_failed=0
+webdav_failure_detail=""
+
+if [[ ${#webdav_configs[@]} -eq 0 ]]; then
+    webdav_failed=1
+    webdav_failure_detail="Keine WebDAV-Runtime-Verbindung ist konfiguriert. Es existiert aktuell nur die Legacy-Verbindung; deshalb kann WebDAV nicht primaer laufen."
+    echo "NC Connector: $webdav_failure_detail" >&2
+else
+    for config in "${webdav_configs[@]}"; do
+        name="$(basename "$config")"
+        echo "NC Connector WebDAV primaer: $name"
+        webdav_output=""
+        if webdav_output="$(env PIWIGO_CONFIG="$config" bash "$SCRIPT_DIR/sync-webdav.sh" 2>&1)"; then
+            webdav_success=1
+            [[ -z "$webdav_output" ]] || printf '%s\n' "$webdav_output"
+        else
+            webdav_exit=$?
+            webdav_failed=1
+            [[ -z "$webdav_output" ]] || printf '%s\n' "$webdav_output" >&2
+            webdav_failure_detail="$(read_webdav_failure_detail "$config" "$webdav_output")"
+            webdav_failure_detail="Exit-Code ${webdav_exit}: ${webdav_failure_detail}"
+            echo "NC Connector: WebDAV-Lauf fehlgeschlagen: $webdav_failure_detail" >&2
+            echo "NC Connector: Legacy-Fallback bleibt verfuegbar." >&2
+        fi
+    done
+fi
+
+if [[ "$webdav_success" -eq 1 ]]; then
+    write_route_status \
+        "webdav" \
+        "WebDAV (primaer)" \
+        "WebDAV erfolgreich. Legacy-Fallback wurde in diesem Lauf nicht ausgefuehrt." \
+        "0" \
+        "1"
+    echo "NC Connector: WebDAV erfolgreich; Legacy-Verbindung wird in diesem Lauf nicht ausgefuehrt."
+    exit 0
+fi
+
+if [[ ${#configs[@]} -eq 0 ]]; then
+    [[ -n "$webdav_failure_detail" ]] || webdav_failure_detail="WebDAV ist fehlgeschlagen; Ursache konnte nicht ermittelt werden."
+    write_route_status \
+        "failed" \
+        "FEHLER - kein Datenweg" \
+        "WebDAV-Fehler: $webdav_failure_detail Keine Legacy-Fallback-Verbindung vorhanden." \
+        "0" \
+        "0"
+    echo "NC Connector: WebDAV ist fehlgeschlagen und es ist keine Legacy-Fallback-Verbindung vorhanden." >&2
+    exit 1
+fi
+
+echo "NC Connector: kein erfolgreicher WebDAV-Lauf; Legacy-Fallback wird ausgefuehrt."
+legacy_result=0
 
 for config in "${configs[@]}"; do
     name="$(basename "$config")"
@@ -59,11 +194,7 @@ for config in "${configs[@]}"; do
         connection_id="${BASH_REMATCH[1]}"
     fi
 
-    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#\'}"
+    piwigo_root="$(read_config_value PIWIGO_ROOT "$config")"
     [[ -n "$piwigo_root" ]] || piwigo_root="/var/www/piwigo"
     tombstone_dir="${piwigo_root%/}/_data/bratonien-tools/nc-connector-status"
 
@@ -78,10 +209,33 @@ for config in "${configs[@]}"; do
         continue
     fi
 
-    echo "NC Connector lokal: $name"
+    echo "NC Connector Legacy-Fallback: $name"
     if ! env PIWIGO_CONFIG="$config" bash "$SCRIPT_DIR/sync.sh"; then
-        result=1
+        legacy_result=1
     fi
 done
 
-exit "$result"
+if [[ "$legacy_result" -eq 0 ]]; then
+    [[ -n "$webdav_failure_detail" ]] || webdav_failure_detail="WebDAV war nicht erfolgreich; Ursache konnte nicht ermittelt werden."
+    write_route_status \
+        "legacy_fallback" \
+        "LEGACY-FALLBACK AKTIV" \
+        "WebDAV-Fehler: $webdav_failure_detail Legacy-Fallback wurde erfolgreich ausgefuehrt." \
+        "1" \
+        "1"
+    echo "NC Connector: Legacy-Fallback erfolgreich."
+    exit 0
+fi
+
+[[ -n "$webdav_failure_detail" ]] || webdav_failure_detail="WebDAV war nicht erfolgreich; Ursache konnte nicht ermittelt werden."
+write_route_status \
+    "failed" \
+    "FEHLER - WebDAV und Fallback" \
+    "WebDAV-Fehler: $webdav_failure_detail Legacy-Fallback ist ebenfalls fehlgeschlagen." \
+    "1" \
+    "0"
+
+if [[ "$webdav_failed" -eq 1 ]]; then
+    echo "NC Connector: WebDAV und Legacy-Fallback sind fehlgeschlagen." >&2
+fi
+exit 1

template/admin_tabs.tpl

@@ -69,6 +69,22 @@
       resetServer().catch(function(){}).finally(function(){resetBusy=false;if(dialog){if(typeof dialog.close==='function'&&dialog.open)dialog.close();else dialog.removeAttribute('open');}});
     }
 
+    // Every stored connection gets the same user-facing edit action. The edit
+    // action opens the normal WebDAV wizard; users never have to edit raw JSON,
+    // runtime paths or database rows.
+    [].slice.call(section.querySelectorAll('form')).forEach(function(deleteForm){
+      var tool=deleteForm.querySelector('button[name="bratonien_tool"][value="nc_connector_delete"]');
+      var idInput=deleteForm.querySelector('input[name="connection_id"]');
+      if(!tool||!idInput)return;
+      var actionRow=deleteForm.parentElement;if(!actionRow||actionRow.querySelector('[data-nc-edit-connection="'+idInput.value+'"]'))return;
+      var editForm=document.createElement('form');editForm.method='post';editForm.setAttribute('data-nc-edit-connection',idInput.value);
+      var tokenInput=document.createElement('input');tokenInput.type='hidden';tokenInput.name='pwg_token';tokenInput.value=token();editForm.appendChild(tokenInput);
+      var connectionInput=document.createElement('input');connectionInput.type='hidden';connectionInput.name='connection_id';connectionInput.value=idInput.value;editForm.appendChild(connectionInput);
+      var editButton=document.createElement('button');editButton.className='buttonLike';editButton.type='submit';editButton.name='bratonien_tool';editButton.value='nc_connector_edit_start';editButton.textContent='Bearbeiten';editForm.appendChild(editButton);
+      editForm.addEventListener('submit',function(){setOpen(true);},true);
+      actionRow.insertBefore(editForm,deleteForm);
+    });
+
     if(openButton){
       openButton.addEventListener('click',function(event){
         event.preventDefault();event.stopImmediatePropagation();showWizard();
@@ -80,14 +96,9 @@
     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);
-
-      // Every wizard POST explicitly preserves the open state before the
-      // browser leaves the page. Validation errors therefore return to the
-      // same wizard step instead of closing/resetting the dialog.
       [].slice.call(dialog.querySelectorAll('form[data-bratonien-wizard-form]')).forEach(function(form){
         form.addEventListener('submit',function(){setOpen(true);},true);
       });
-
       try{if(sessionStorage.getItem(storageKey)==='1')showWizard();}catch(e){}
     }
   }