0.9.6.27: einen NC-Anlageweg und Jetzt-abgleichen

0.9.6.27: CI-Marker entfernen
2026-09-19 22:14:33 +00:00 · 2026-08-19 19:29:08 +02:00 · 2026-08-19 19:28:20 +02:00 · 2026-08-19 19:28:11 +02:00 · 2026-08-19 19:28:03 +02:00 · 2026-08-19 19:27:53 +02:00
18 changed files with 540 additions and 923 deletions
--- a/.github/workflows/lint.yml
+++ b/.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
@@ -36,6 +40,12 @@ jobs:
            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: |
--- a/admin.php
+++ b/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);
--- a/include/nc_connector_delete_safe.inc.php
+++ b/include/nc_connector_delete_safe.inc.php
@@ -36,14 +36,7 @@ function bratonien_tools_nc_connector_remove_webdav_piwigo_content(array $connec
  include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');

  $image_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 = '.$site_id.' OR vc.site_id = '.$site_id.'
-;';
+  $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))
  {
@@ -84,10 +77,8 @@ SELECT DISTINCT i.id, i.path, i.representative_ext
 }

 /**
- * Delete a connector connection from Piwigo without depending on the web
- * server being allowed to write into root-owned runtime directories.
- * WebDAV-managed Piwigo records are removed before the connection itself so
- * deleted remote content cannot remain visible or addressable in Piwigo.
+ * Delete exactly the connection selected by the user.
+ * No other connector record is implicitly removed.
 */
 function bratonien_tools_nc_connector_delete_safe()
 {
@@ -112,10 +103,7 @@ function bratonien_tools_nc_connector_delete_safe()

  $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_file($public_status)) @unlink($public_status);

  if (is_dir($status_dir) || @mkdir($status_dir, 0755, true))
  {
@@ -125,11 +113,11 @@ function bratonien_tools_nc_connector_delete_safe()
  if ((int)$cleanup['site_id'] > 0)
  {
    return array(
-      'message'=>'Connector-Verbindung wurde gelöscht. Die zugehörigen Piwigo-Alben und '.(int)$cleanup['images'].' Bilder wurden aus Piwigo entfernt. Nextcloud-Dateien blieben unverändert. Laufzeit- und Vorschaudaten werden automatisch bereinigt.',
+      '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'=>'Connector-Verbindung wurde gelöscht. Verbliebene Laufzeitdateien werden vor dem nächsten Connector-Lauf automatisch entfernt. Quelldateien blieben unverändert.',
+    'message'=>'Verbindung wurde gelöscht. Verbliebene Laufzeitdaten werden automatisch bereinigt. Quelldateien blieben unverändert.',
  );
 }
--- a/include/nc_connector_edit.inc.php
+++ b/include/nc_connector_edit.inc.php
@@ -13,12 +13,22 @@ function bratonien_tools_nc_connector_migration_state(array $connection)
  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';
-  if (trim((string)($credentials['api_key_id'] ?? '')) === '') $missing[] = 'Piwigo-API-Schluessel-ID';
-  if (trim((string)($credentials['api_key_secret'] ?? '')) === '') $missing[] = 'Piwigo-API-Geheimnis';
+
+  $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,
  );
 }

@@ -112,7 +122,7 @@ function bratonien_tools_nc_connector_prepare_webdav_wizard_from_connection(arra
  {
    $path = trim((string)($root['webdav_path'] ?? ''), '/');
    $fileid = (int)($root['fileid'] ?? 0);
-    if ($path === '' || $fileid < 1) continue;
+    if ($fileid < 1) continue;
    $selected[] = $path;
    $selected_ids[$path] = $fileid;
  }
--- a/include/nc_connector_system.inc.php
+++ b/include/nc_connector_system.inc.php
@@ -170,7 +170,7 @@ function bratonien_tools_nc_connector_last_status(array $connections)

  foreach ($connections as $connection)
  {
-    if (empty($connection['enabled']) || (string)($connection['takeover_state'] ?? '') !== 'active')
+    if (empty($connection['enabled']))
    {
      continue;
    }
@@ -190,6 +190,13 @@ function bratonien_tools_nc_connector_system_status(array $connections = array()
  $timer = 'bratonien-nc-connector.timer';
  $service = 'bratonien-nc-connector.service';

+  $active = bratonien_tools_nc_connector_systemctl_value(array('is-active', $timer));
+  $enabled = bratonien_tools_nc_connector_systemctl_value(array('is-enabled', $timer));
+  $service_active_raw = bratonien_tools_nc_connector_systemctl_value(array('is-active', $service));
+  $service_active = in_array($service_active_raw, array('active', 'activating'), true);
+  $service_started_raw = bratonien_tools_nc_connector_systemctl_value(array('show', $service, '--property=ActiveEnterTimestamp', '--value'));
+  $service_started_timestamp = bratonien_tools_nc_connector_parse_systemd_time($service_started_raw);
+
  $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);

@@ -204,9 +211,6 @@ function bratonien_tools_nc_connector_system_status(array $connections = array()
    $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));
-
  $last = bratonien_tools_nc_connector_last_status($connections);
  if ($last['timestamp'] <= 0)
  {
@@ -214,10 +218,32 @@ function bratonien_tools_nc_connector_system_status(array $connections = array()
    $last['timestamp'] = bratonien_tools_nc_connector_parse_systemd_time($last_raw);
  }

+  if ($next_timestamp > 0)
+  {
+    $next_label = date('d.m.Y H:i:s', $next_timestamp);
+  }
+  elseif ($service_active && $active === 'active' && $enabled === 'enabled')
+  {
+    $next_label = 'Nach Abschluss des aktuellen Laufs';
+  }
+  elseif ($active === 'active' && $enabled === 'enabled')
+  {
+    $next_label = 'Wird von systemd neu geplant';
+  }
+  else
+  {
+    $next_label = 'Nicht verfügbar';
+  }
+
  return array(
    'timer_name' => $timer,
    'timer_active' => $active === 'active',
    'timer_enabled' => $enabled === 'enabled',
+    'service_active' => $service_active,
+    'current_run_timestamp' => $service_started_timestamp,
+    'current_run_label' => $service_active
+      ? ($service_started_timestamp > 0 ? 'Läuft seit '.date('d.m.Y H:i:s', $service_started_timestamp) : 'Läuft gerade')
+      : 'Kein Lauf aktiv',
    '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'],
@@ -229,7 +255,7 @@ function bratonien_tools_nc_connector_system_status(array $connections = array()
    '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',
+    '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'),
--- a/include/nc_connector_takeover.inc.php
+++ b/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,
-  );
-}
--- a/include/nc_connector_webdav.inc.php
+++ b/include/nc_connector_webdav.inc.php
@@ -5,81 +5,8 @@ if (!defined('PHPWG_ROOT_PATH'))
 }

 /**
- * 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.
- *
- * 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.
+ * 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()
 {
@@ -87,7 +14,7 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()

  if (empty($state['scan_ok']) || empty($state['technical_complete']))
  {
-    throw new RuntimeException('Die WebDAV-Verbindung wurde im Assistenten noch nicht vollständig vorbereitet.');
+    throw new RuntimeException('Die WebDAV-Verbindung wurde im Assistenten noch nicht vollstaendig vorbereitet.');
  }

  $base_url = rtrim(trim((string)($state['base_url'] ?? '')), '/');
@@ -95,7 +22,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-Zugang fehlen Nextcloud-Adresse oder Zugangsdaten.');
+    throw new RuntimeException('Fuer den WebDAV-Zugang fehlen Nextcloud-Adresse oder Zugangsdaten.');
  }

  $selected = isset($state['directory_selected']) && is_array($state['directory_selected'])
@@ -104,13 +31,20 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
  $selected_ids = isset($state['directory_selected_fileids']) && is_array($state['directory_selected_fileids'])
    ? $state['directory_selected_fileids']
    : array();
-  if (!$selected) throw new RuntimeException('Bitte mindestens ein Nextcloud-Verzeichnis auswählen.');
+
+  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('Für ein ausgewähltes Nextcloud-Verzeichnis fehlt die eindeutige Datei-ID.');
+    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);
@@ -140,6 +74,11 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
    && (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',
@@ -154,7 +93,6 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
    'quiet_seconds'=>120,
    'max_wait_seconds'=>900,
    'full_sync_seconds'=>86400,
-    'parallel_test'=>true,
    'piwigo_auth'=>'connection-scoped',
    'api_enabled'=>$api_enabled,
  );
@@ -162,7 +100,7 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
  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)
+    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];
    }
@@ -202,12 +140,12 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
    $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");
+    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 #'.$editing_id.' wurde gespeichert. Der nächste Connector-Lauf verwendet die neuen Einstellungen.',
+      'message'=>'WebDAV-Verbindung wurde gespeichert.',
    );
  }

@@ -226,36 +164,14 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
  $id = (int)pwg_db_insert_id();
  if ($id < 1) throw new RuntimeException('Die WebDAV-Verbindung konnte nicht eindeutig angelegt werden.');

-  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 $e;
-  }
+  $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']);

-  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.',
-    );
-  }
-
  return array(
    'connection_id'=>$id,
    'message'=>'WebDAV-Verbindung wurde angelegt.',
--- a/include/nc_connector_wizard_webdav_flow.inc.php
+++ b/include/nc_connector_wizard_webdav_flow.inc.php
@@ -158,9 +158,35 @@ function bratonien_tools_nc_wizard_save_sources_dispatch()
  $state['technical_source'] = 'WebDAV-Verzeichnisse ausgewählt';
  $state['technical_error'] = '';
  $state['directory_selection_ready'] = false;
-  bratonien_tools_nc_wizard_store($state);

-  return array('message'=>'WebDAV-Verzeichnisse wurden übernommen. Die Verbindung ist für den parallelen Testweg vorbereitet.');
+  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()
--- a/include/tool_registry.inc.php
+++ b/include/tool_registry.inc.php
@@ -6,19 +6,13 @@ if (!defined('PHPWG_ROOT_PATH'))

 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.6.15';
+  $script_version = function_exists('bratonien_tools_current_version') ? bratonien_tools_current_version() : '0.9.6.27';
  $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,
  ));
-  $GLOBALS['template']->func_combine_script(array(
-    'id'=>'bratonien_nc_connector_source_ui',
-    'path'=>BRATONIEN_TOOLS_PATH.'js/nc_connector_source_ui.js',
-    'load'=>'footer',
-    'version'=>$script_version,
-  ));
 }

 require_once(BRATONIEN_TOOLS_PATH . 'tools/image_cache.inc.php');
@@ -34,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');
@@ -48,6 +41,58 @@ 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_connector_system.inc.php');
+
+function bratonien_tools_nc_connector_run_now()
+{
+  $service = 'bratonien-nc-connector.service';
+  $active = bratonien_tools_nc_connector_systemctl_value(array('is-active', $service));
+  if ($active === 'active' || $active === 'activating')
+  {
+    return array('message'=>'Der NC-Abgleich läuft bereits.');
+  }
+
+  if (!function_exists('proc_open'))
+  {
+    throw new RuntimeException('Der NC-Abgleich konnte nicht gestartet werden: proc_open ist nicht verfügbar.');
+  }
+
+  $commands = array(
+    array('/usr/bin/sudo', '-n', '/usr/bin/systemctl', 'start', '--no-block', $service),
+    array('/usr/bin/systemctl', 'start', '--no-block', $service),
+  );
+  $last_error = '';
+
+  foreach ($commands as $command)
+  {
+    if (!is_executable($command[0]))
+    {
+      continue;
+    }
+    $spec = array(
+      0=>array('file','/dev/null','r'),
+      1=>array('pipe','w'),
+      2=>array('pipe','w'),
+    );
+    $process = @proc_open($command, $spec, $pipes, null, array_merge($_ENV, array('LC_ALL'=>'C','LANG'=>'C')));
+    if (!is_resource($process))
+    {
+      continue;
+    }
+    $stdout = trim((string)stream_get_contents($pipes[1]));
+    $stderr = trim((string)stream_get_contents($pipes[2]));
+    fclose($pipes[1]);
+    fclose($pipes[2]);
+    $exit = proc_close($process);
+    if ($exit === 0)
+    {
+      return array('message'=>'NC-Abgleich wurde gestartet.');
+    }
+    $last_error = $stderr !== '' ? $stderr : $stdout;
+  }
+
+  throw new RuntimeException('Der NC-Abgleich konnte nicht gestartet werden'.($last_error !== '' ? ': '.$last_error : '.'));
+}

 function bratonien_tools_get_tools()
 {
@@ -72,14 +117,13 @@ 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_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_migrate_start' => array('handler' => 'bratonien_tools_nc_connector_migrate_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_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'),
@@ -92,10 +136,7 @@ function bratonien_tools_get_tools()
    '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'),
--- a/js/nc_connector_edit_v2.js
+++ b/js/nc_connector_edit_v2.js
@@ -2,48 +2,53 @@
  'use strict';

  function ready(callback) {
-    if (document.readyState === 'loading') {
-      document.addEventListener('DOMContentLoaded', function () { window.setTimeout(callback, 0); });
-    } else {
-      window.setTimeout(callback, 0);
-    }
+    if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', callback);
+    else callback();
  }

  ready(function () {
    var section = document.getElementById('nc-connector');
    if (!section) return;

-    var pwgTokenInput = section.querySelector('input[name="pwg_token"]');
-    var pwgToken = pwgTokenInput ? pwgTokenInput.value : '';
-    var modeKey = 'bratonienNcWizardMode';
+    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];
+        return {'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&#039;'}[c];
      });
    }

-    function setMode(value) {
-      try { sessionStorage.setItem(modeKey, value); } catch (e) {}
-    }
-
-    function postForm(label, tool, id, mode) {
-      var form = document.createElement('form');
-      form.method = 'post';
-      form.style.display = 'inline';
-      form.dataset.ncV2Action = tool;
-      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>';
-      if (mode) form.addEventListener('submit', function () { setMode(mode); }, true);
-      return form;
-    }
-
    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'}
+        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));
@@ -52,6 +57,16 @@
      });
    }

+    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;
@@ -60,11 +75,11 @@
      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">Alle Daten dieser Verbindung werden hier gepflegt. Eine Migration ist ein eigener Vorgang.</p></div>'
-        + '<button type="button" class="buttonLike" data-edit-v2-close>Schließen</button></div>'
-        + '<div data-edit-v2-content style="margin-top:1rem"></div></div>';
+        + '<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-v2-close]').addEventListener('click', function () { node.close(); });
+      node.querySelector('[data-edit-close]').addEventListener('click', function () { node.close(); });
      node.addEventListener('click', function (event) { if (event.target === node) node.close(); });
      return node;
    }
@@ -78,127 +93,68 @@
        + '<button type="button" class="buttonLike" data-remove-storage>Entfernen</button></div>';
    }

-    function clearValidation(form) {
-      [].slice.call(form.querySelectorAll('[aria-invalid="true"]')).forEach(function (field) {
-        field.removeAttribute('aria-invalid');
-        field.style.borderColor = '';
-        field.style.boxShadow = '';
-      });
-      [].slice.call(form.querySelectorAll('[data-edit-v2-field-error]')).forEach(function (node) { node.remove(); });
-      var box = form.querySelector('[data-edit-v2-error-summary]');
-      if (box) box.remove();
+    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 fieldNodes(form, fieldName) {
-      return [].slice.call(form.querySelectorAll('[name="'+fieldName.replace(/"/g, '\\"')+'"]'));
-    }
-
-    function showValidation(form, data) {
-      clearValidation(form);
-      var message = (data && data.message) ? data.message : 'Die Verbindung konnte nicht gespeichert werden.';
-      var summary = document.createElement('div');
-      summary.dataset.editV2ErrorSummary = '1';
-      summary.className = 'bratonien-main-cache__warning';
-      summary.style.margin = '0 0 1rem';
-      summary.style.padding = '.75rem';
-      summary.style.border = '1px solid currentColor';
-      summary.innerHTML = '<strong>Speichern fehlgeschlagen:</strong> '+escapeHtml(message);
-      form.insertBefore(summary, form.firstChild);
-
-      var first = null;
-      var fields = data && Array.isArray(data.fields) ? data.fields : [];
-      fields.forEach(function (fieldName) {
-        fieldNodes(form, fieldName).forEach(function (field) {
-          field.setAttribute('aria-invalid', 'true');
-          field.style.borderColor = '#d65a5a';
-          field.style.boxShadow = '0 0 0 1px #d65a5a';
-          if (!first) first = field;
-          var note = document.createElement('span');
-          note.dataset.editV2FieldError = '1';
-          note.className = 'bratonien-main-cache__warning';
-          note.style.display = 'block';
-          note.style.marginTop = '.25rem';
-          note.textContent = message;
-          field.insertAdjacentElement('afterend', note);
-        });
-      });
-
-      if (first) {
-        first.scrollIntoView({block:'center', behavior:'smooth'});
-        window.setTimeout(function () { first.focus(); }, 150);
-      } else {
-        summary.scrollIntoView({block:'center', behavior:'smooth'});
-      }
-    }
-
-    function submitEditor(form, editDialog) {
-      clearValidation(form);
+    function submitLocal(form, editDialog) {
      if (!form.reportValidity()) return;
-
-      var submit = form.querySelector('button[type="submit"]');
-      if (submit) submit.disabled = true;
-
-      var body = new FormData(form);
+      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:body
+        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) {
-            showValidation(form, data);
-            return;
-          }
+          if (!response.ok || !data.ok) { showError(form, data); return; }
          editDialog.close();
          window.location.reload();
        });
      }).catch(function (error) {
-        showValidation(form, {message:error.message || String(error), fields:[]});
+        showError(form, {message:error.message || String(error)});
      }).finally(function () {
-        if (submit) submit.disabled = false;
+        if (button) button.disabled = false;
      });
    }

-    function openEditor(id) {
+    function openLocalEditor(id) {
      var editDialog = dialog();
-      var content = editDialog.querySelector('[data-edit-v2-content]');
+      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 Ansicht ist nur für die bestehende Legacy-Verbindung vorgesehen.');
+        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({});
-        var migrationText = webdav.migration_ready
-          ? '<strong>Bereit.</strong> Nextcloud-Zugang und verbindungseigener Piwigo-API-Key sind vollständig gespeichert.'
-          : '<strong>Noch nicht bereit.</strong> Es fehlen: '+escapeHtml((webdav.migration_missing || []).join(', ') || 'WebDAV-Zugangsdaten')+'.';

-        content.innerHTML = '<form method="post" data-edit-v2-form>'
+        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 / WebDAV</h5>'
-          + '<p class="bratonien-base-note">Diese Angaben werden für den neuen WebDAV-Weg benötigt und gehören zu genau dieser Verbindung.</p>'
-          + '<div class="bratonien-form-grid">'
-          + '<label class="bratonien-label">Nextcloud-Adresse</label><input name="nc_nextcloud_url" value="'+escapeHtml(webdav.nextcloud_url || '')+'" placeholder="https://cloud.example.de">'
+          + '<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 API dieser Verbindung</h5>'
-          + '<p class="bratonien-base-note">Der API-Key wird verbindungseigen gespeichert und beim Speichern geprüft.</p>'
-          + '<div class="bratonien-form-grid">'
+          + '<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>'
-          + '<p class="bratonien-base-note"><strong>WebDAV-Migration:</strong> '+migrationText+'</p>'
-          + '<h5 style="margin-top:1.2rem">Bestehender Legacy-Weg</h5><div class="bratonien-form-grid">'
+          + '<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>'
@@ -207,7 +163,7 @@
          + '</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 Legacy-Einstellungen</summary><div class="bratonien-form-grid" style="margin-top:.75rem">'
+          + '<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>'
@@ -215,108 +171,64 @@
          + '<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-edit-v2-cancel>Abbrechen</button></div>'
+          + '<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-v2-form]');
-        form.querySelector('[data-edit-v2-cancel]').addEventListener('click', function () { editDialog.close(); });
+        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) return;
-          var row = remove.closest('[data-storage-row]');
-          if (row) row.remove();
+          if (remove) {
+            var row = remove.closest('[data-storage-row]');
+            if (row) row.remove();
+          }
        });
        form.addEventListener('submit', function (event) {
          event.preventDefault();
-          event.stopPropagation();
-          submitEditor(form, editDialog);
+          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>';
      });
    }

-    function rebuildLocalActions(deleteForm, id, connectionData) {
-      var actions = deleteForm.parentElement;
-      if (!actions) return;
-
-      [].slice.call(actions.querySelectorAll('form')).forEach(function (form) {
-        var migrate = form.querySelector('button[value="nc_connector_migrate_start"]');
-        var editStart = form.querySelector('button[value="nc_connector_edit_start"]');
-        if (migrate || editStart) form.remove();
-      });
-      [].slice.call(actions.children).forEach(function (child) {
-        if (child.tagName === 'BUTTON' && (child.textContent || '').trim() === 'Bearbeiten') child.remove();
-        if (child.dataset && child.dataset.ncMigrationInfo) child.remove();
-      });
-
-      var edit = document.createElement('button');
-      edit.type = 'button';
-      edit.className = 'buttonLike';
-      edit.textContent = 'Bearbeiten';
-      edit.addEventListener('click', function () { openEditor(id); });
-      actions.insertBefore(edit, deleteForm);
-
-      var info = document.createElement('span');
-      info.dataset.ncMigrationInfo = '1';
-      info.className = 'bratonien-base-note';
-      info.textContent = 'WebDAV-Migration wird geprüft …';
-      actions.insertBefore(info, deleteForm);
-
-      var dataPromise = connectionData ? Promise.resolve(connectionData) : loadConnection(id);
-      dataPromise.then(function (data) {
-        var webdav = data.webdav || {};
-        if (webdav.migration_ready) {
-          info.remove();
-          actions.insertBefore(postForm('Auf WebDAV migrieren', 'nc_connector_migrate_start', id, 'migrate'), deleteForm);
-        } else {
-          var missing = (webdav.migration_missing || []).join(', ');
-          info.textContent = 'WebDAV-Migration noch nicht bereit: '+(missing || 'Zugangsdaten fehlen')+'. Zuerst „Bearbeiten“.';
-        }
-      }).catch(function (error) {
-        info.textContent = 'WebDAV-Migration kann nicht geprüft werden: '+(error.message || String(error));
-      });
-    }
-
-    function rebuildRemoteActions(deleteForm, id) {
-      var actions = deleteForm.parentElement;
-      if (!actions) return;
-      [].slice.call(actions.querySelectorAll('form')).forEach(function (form) {
-        var oldEdit = form.querySelector('button[value="nc_connector_edit_start"]');
-        var oldMigrate = form.querySelector('button[value="nc_connector_migrate_start"]');
-        if (oldEdit || oldMigrate) form.remove();
-      });
-      [].slice.call(actions.children).forEach(function (child) {
-        if (child.tagName === 'BUTTON' && (child.textContent || '').trim() === 'Bearbeiten') child.remove();
-        if (child.dataset && child.dataset.ncMigrationInfo) child.remove();
-      });
-      actions.insertBefore(postForm('Bearbeiten', 'nc_connector_edit_start', id, 'edit'), deleteForm);
-    }
-
    [].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) return;
+      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) {
-        if (data.adapter === 'local') rebuildLocalActions(deleteForm, id, data);
-        else rebuildRemoteActions(deleteForm, id);
+        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 actions = deleteForm.parentElement;
-        if (!actions) return;
        var info = document.createElement('span');
        info.className = 'bratonien-main-cache__warning';
-        info.textContent = 'Verbindungstyp konnte nicht geladen werden: '+(error.message || String(error));
+        info.textContent = 'Verbindung konnte nicht geladen werden: '+(error.message || String(error));
        actions.insertBefore(info, deleteForm);
      });
    });
--- a/js/nc_connector_source_ui.js
+++ b/js/nc_connector_source_ui.js
@@ -1,217 +0,0 @@
-(function () {
-  'use strict';
-
-  function escapeHtml(value) {
-    return String(value == null ? '' : value).replace(/[&<>"']/g, function (c) {
-      return {'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&#039;'}[c];
-    });
-  }
-
-  function fieldNodes(form, fieldName) {
-    return [].slice.call(form.querySelectorAll('[name="'+fieldName.replace(/"/g, '\\"')+'"]'));
-  }
-
-  function clearPickerErrors(form) {
-    [].slice.call(form.querySelectorAll('[data-source-picker-error]')).forEach(function (node) { node.remove(); });
-    [].slice.call(form.querySelectorAll('[data-source-picker-invalid="1"]')).forEach(function (field) {
-      field.removeAttribute('data-source-picker-invalid');
-      if (field.getAttribute('aria-invalid') === 'true') field.removeAttribute('aria-invalid');
-      field.style.borderColor = '';
-      field.style.boxShadow = '';
-    });
-  }
-
-  function showPickerError(form, data) {
-    clearPickerErrors(form);
-    var message = data && data.message ? data.message : 'Die Nextcloud-Ordnerauswahl konnte nicht gestartet werden.';
-    var fields = data && Array.isArray(data.fields) ? data.fields : [];
-
-    var summary = document.createElement('div');
-    summary.dataset.sourcePickerError = '1';
-    summary.className = 'bratonien-main-cache__warning';
-    summary.style.margin = '0 0 1rem';
-    summary.style.padding = '.75rem';
-    summary.style.border = '1px solid currentColor';
-    summary.innerHTML = '<strong>Ordnerauswahl nicht möglich:</strong> '+escapeHtml(message);
-    form.insertBefore(summary, form.firstChild);
-
-    var first = null;
-    fields.forEach(function (fieldName) {
-      fieldNodes(form, fieldName).forEach(function (field) {
-        field.dataset.sourcePickerInvalid = '1';
-        field.setAttribute('aria-invalid', 'true');
-        field.style.borderColor = '#d65a5a';
-        field.style.boxShadow = '0 0 0 1px #d65a5a';
-        if (!first) first = field;
-      });
-    });
-
-    if (first) {
-      first.scrollIntoView({block:'center', behavior:'smooth'});
-      window.setTimeout(function () { first.focus(); }, 150);
-    } else {
-      summary.scrollIntoView({block:'center', behavior:'smooth'});
-    }
-  }
-
-  function jsonResponse(response) {
-    return response.json().then(function (data) {
-      if (!response.ok || !data.ok) throw data;
-      return data;
-    });
-  }
-
-  function startSourcePicker(form, button) {
-    clearPickerErrors(form);
-    if (!form.reportValidity()) return;
-
-    button.disabled = true;
-    var originalText = button.textContent;
-    button.textContent = 'Verbindung prüfen …';
-
-    var saveBody = new FormData(form);
-    fetch('plugins/bratonien_tools/nc-connector-edit-save.php', {
-      method:'POST',
-      credentials:'same-origin',
-      cache:'no-store',
-      headers:{'Accept':'application/json'},
-      body:saveBody
-    })
-      .then(jsonResponse)
-      .then(function () {
-        button.textContent = 'Nextcloud-Ordner laden …';
-        var pickerBody = new FormData();
-        var token = form.querySelector('input[name="pwg_token"]');
-        var id = form.querySelector('input[name="connection_id"]');
-        pickerBody.append('pwg_token', token ? token.value : '');
-        pickerBody.append('connection_id', id ? id.value : '');
-        return fetch('plugins/bratonien_tools/nc-connector-source-picker-start.php', {
-          method:'POST',
-          credentials:'same-origin',
-          cache:'no-store',
-          headers:{'Accept':'application/json'},
-          body:pickerBody
-        }).then(jsonResponse);
-      })
-      .then(function () {
-        try {
-          sessionStorage.setItem('bratonienNcWizardMode', 'migrate');
-          sessionStorage.setItem('bratonienNcWizardOpen', '1');
-        } catch (e) {}
-        window.location.reload();
-      })
-      .catch(function (error) {
-        showPickerError(form, error && typeof error === 'object' ? error : {message:String(error), fields:[]});
-        button.disabled = false;
-        button.textContent = originalText;
-      });
-  }
-
-  function enhanceMigrationButtons(root) {
-    [].slice.call(root.querySelectorAll('button[value="nc_connector_migrate_start"]')).forEach(function (button) {
-      button.textContent = 'Nextcloud-Ordner auswählen & migrieren';
-      button.title = 'Die WebDAV-Quelle wird im Nextcloud-Ordnerbrowser ausgewählt. Der bestehende SMB-/Legacy-Speicher wird nicht als WebDAV-Quelle übernommen.';
-    });
-  }
-
-  function enhanceEditor(root) {
-    var form = root.querySelector('[data-edit-v2-form]');
-    if (!form || form.dataset.sourceUiEnhanced === '1') return;
-    form.dataset.sourceUiEnhanced = '1';
-
-    var headings = [].slice.call(form.querySelectorAll('h5'));
-    var webdavHeading = headings.find(function (node) {
-      return (node.textContent || '').trim() === 'Nextcloud / WebDAV';
-    });
-    var legacyHeading = headings.find(function (node) {
-      return (node.textContent || '').trim() === 'Bestehender Legacy-Weg';
-    });
-    var storageHeading = headings.find(function (node) {
-      return (node.textContent || '').trim() === 'Speicherorte';
-    });
-    var storageList = form.querySelector('[data-storage-list]');
-    var addStorage = form.querySelector('[data-add-storage]');
-
-    if (webdavHeading && !form.querySelector('[data-webdav-source-picker]')) {
-      var webdavGrid = webdavHeading.nextElementSibling;
-      while (webdavGrid && !webdavGrid.classList.contains('bratonien-form-grid')) webdavGrid = webdavGrid.nextElementSibling;
-      if (webdavGrid) {
-        var picker = document.createElement('div');
-        picker.dataset.webdavSourcePicker = '1';
-        picker.style.margin = '.8rem 0 1rem';
-        picker.innerHTML = '<p class="bratonien-base-note" style="margin:.25rem 0 .5rem"><strong>WebDAV-Quelle:</strong> Du musst keinen Pfad kennen. Die Ordner des oben eingetragenen Nextcloud-Benutzers werden automatisch geladen und können anschließend ausgewählt werden.</p>';
-        var button = document.createElement('button');
-        button.type = 'button';
-        button.className = 'buttonLike';
-        button.textContent = 'Nextcloud-Ordner automatisch auswählen';
-        button.addEventListener('click', function () { startSourcePicker(form, button); });
-        picker.appendChild(button);
-        webdavGrid.insertAdjacentElement('afterend', picker);
-      }
-    }
-
-    if (legacyHeading && !form.querySelector('[data-webdav-source-note]')) {
-      var note = document.createElement('p');
-      note.dataset.webdavSourceNote = '1';
-      note.className = 'bratonien-main-cache__warning';
-      note.innerHTML = '<strong>Wichtig:</strong> Der folgende SMB-/lokale Speicher gehört ausschließlich zum bisherigen Legacy-Fallback. Er wird <strong>nicht</strong> als WebDAV-Quelle übernommen.';
-      legacyHeading.insertAdjacentElement('beforebegin', note);
-    }
-
-    if (storageHeading && storageList && addStorage) {
-      storageHeading.textContent = 'Legacy-Speicher (nur Fallback)';
-
-      var details = document.createElement('details');
-      details.dataset.legacyStorageTechnical = '1';
-      details.style.marginTop = '.75rem';
-      var summary = document.createElement('summary');
-      summary.textContent = 'Technische Legacy-Speicherzuordnung bearbeiten';
-      details.appendChild(summary);
-
-      var info = document.createElement('p');
-      info.className = 'bratonien-base-note';
-      info.textContent = 'Diese Felder betreffen nur den alten Fallback-Weg. Für WebDAV werden keine SMB-Adressen oder lokalen Mount-Pfade eingegeben.';
-      details.appendChild(info);
-
-      storageHeading.insertAdjacentElement('beforebegin', details);
-      details.appendChild(storageHeading);
-      details.appendChild(storageList);
-      details.appendChild(addStorage);
-
-      addStorage.textContent = 'Legacy-Speicher manuell hinzufügen';
-      addStorage.title = 'Nur für den alten Legacy-Fallback. WebDAV-Ordner werden im Nextcloud-Ordnerbrowser ausgewählt.';
-    }
-  }
-
-  function enhance(root) {
-    if (!root || root.nodeType !== 1) return;
-    enhanceMigrationButtons(root);
-    if (root.matches && root.matches('#bratonien-nc-connection-edit-v2')) enhanceEditor(root);
-    var dialog = root.querySelector ? root.querySelector('#bratonien-nc-connection-edit-v2') : null;
-    if (dialog) enhanceEditor(dialog);
-  }
-
-  function start() {
-    var section = document.getElementById('nc-connector');
-    if (!section) return;
-
-    enhance(section);
-    enhanceMigrationButtons(document);
-
-    var observer = new MutationObserver(function (mutations) {
-      mutations.forEach(function (mutation) {
-        [].slice.call(mutation.addedNodes || []).forEach(function (node) {
-          if (node && node.nodeType === 1) enhance(node);
-        });
-      });
-      var dialog = document.getElementById('bratonien-nc-connection-edit-v2');
-      if (dialog) enhanceEditor(dialog);
-      enhanceMigrationButtons(document);
-    });
-
-    observer.observe(document.body, {childList:true, subtree:true});
-  }
-
-  if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', start);
-  else start();
-})();
--- a/main.inc.php
+++ b/main.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: Bratonien Tools
-Version: 0.9.6.17
+Version: 0.9.6.27
 Description: Erweiterbare Administrationswerkzeuge fuer die Bratonien-Piwigo-Installation.
 Plugin URI: https://github.com/Terranom674/Piwigo_Bratonien_Tools
 Author: Bratonien
--- a/nc-connector-edit-data.php
+++ b/nc-connector-edit-data.php
@@ -27,7 +27,6 @@ if (!function_exists('is_admin') || !is_admin())
 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');
-require_once(BRATONIEN_TOOLS_PATH.'include/nc_connector_edit.inc.php');

 $id = (int)($_GET['connection_id'] ?? 0);
 $connection = bratonien_tools_nc_connector_connection($id, true);
@@ -40,19 +39,13 @@ if (!$connection)

 $config = isset($connection['config']) && is_array($connection['config']) ? $connection['config'] : array();
 $credentials = array();
-$migration = array('ready'=>false, 'missing'=>array());
 try
 {
  $credentials = bratonien_tools_nc_connector_scoped_secret($connection);
-  if ((string)$connection['adapter'] === 'local')
-  {
-    $migration = bratonien_tools_nc_connector_migration_state($connection);
-  }
 }
 catch (Throwable $e)
 {
  $credentials = array();
-  $migration = array('ready'=>false, 'missing'=>array('gespeicherte Zugangsdaten konnten nicht gelesen werden'));
 }

 $storages = array();
@@ -92,8 +85,8 @@ $payload = array(
    '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'] ?? '')) !== '',
-    'migration_ready'=>!empty($migration['ready']),
-    'migration_missing'=>array_values((array)($migration['missing'] ?? array())),
+    'fallback_user'=>(string)($credentials['piwigo_user'] ?? ''),
+    'has_fallback_password'=>(string)($credentials['piwigo_password'] ?? '') !== '',
  ),
 );

--- a/nc-connector-edit-save.php
+++ b/nc-connector-edit-save.php
@@ -258,7 +258,45 @@ try
    }
  }

+  $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.'),
@@ -302,6 +340,12 @@ catch (Throwable $e)
    $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,
--- a/runtime/build-webdav-media.sh
+++ b/runtime/build-webdav-media.sh
@@ -0,0 +1,35 @@
+#!/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_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"
+
+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"
--- a/runtime/reconcile-webdav.php
+++ b/runtime/reconcile-webdav.php
@@ -107,7 +107,7 @@ try
  $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=>$configDir, $publicSourceRoot=>$publicSourceRoot, $publicGalleryRoot=>$publicGalleryRoot) as $dir=>$unused)
+  foreach (array($configDir, $publicSourceRoot, $publicGalleryRoot) as $dir)
  {
    if (!is_dir($dir) && !mkdir($dir, $dir === $configDir ? 0700 : 0755, true)) fail_webdav_reconcile('Runtime-Verzeichnis konnte nicht angelegt werden: '.$dir);
  }
@@ -125,7 +125,6 @@ try
    if (!is_array($config)) $config = array();
    if ((string)$row['adapter'] !== 'remote') continue;
    if ((string)($config['source_mode'] ?? '') !== 'webdav-placeholder') continue;
-    if (empty($config['parallel_test'])) continue;

    try
    {
@@ -164,8 +163,6 @@ try
      }
      if (!is_dir($galleryRoot) && !mkdir($galleryRoot, 0755, true)) fail_webdav_reconcile('WebDAV-Galeriebereich konnte nicht angelegt werden.');
      @chmod($galleryRoot, 0755);
-
-      // Alte technische Wrapper unter ./galleries duerfen nicht als Piwigo-Alben auftauchen.
      webdav_remove_generated_tree($legacyDefault, $legacyGalleryRoot);

      $sourceDir = $publicSourceRoot.'/connection-'.$id;
@@ -189,8 +186,9 @@ try
      {
        $path = trim((string)($root['webdav_path'] ?? ''), '/');
        $display = trim((string)($root['display_name'] ?? ''));
-        if ($path === '' || $display === '' || preg_match('/[\t\r\n]/', $path.$display)) fail_webdav_reconcile('Eine gespeicherte WebDAV-Wurzel ist ungueltig.');
-        $rootLines[] = $path."\t".$display;
+        $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);
@@ -215,21 +213,23 @@ try
      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'=>'parallel-webdav',
+        'mode'=>'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))
+      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"))
      {
-        $escaped = $db->real_escape_string($json);
-        $db->query("UPDATE `{$table}` SET config_json='{$escaped}' WHERE id={$id} LIMIT 1");
+        fail_webdav_reconcile('WebDAV-Runtime-Status konnte nicht gespeichert werden: '.$db->error);
      }
    }
    catch (Throwable $e)
--- a/runtime/run-all.sh
+++ b/runtime/run-all.sh
@@ -17,104 +17,32 @@ read_config_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"
-
+    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" => $argv[5] === "1",
-        "success" => $argv[6] === "1"
+        "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) {
-        fwrite(STDERR, "Route-Status konnte nicht geschrieben werden.\n");
-        exit(1);
-      }
+      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" "$fallback_used" "$success"
+    ' "$ROUTE_STATUS_FILE" "$route" "$label" "$detail" "$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-Verbindungen konnten nicht mit der Runtime abgeglichen werden." >&2
-    exit 1
-fi
-
-if ! php "$SCRIPT_DIR/cleanup-webdav-piwigo.php"; then
-    echo "NC Connector: Piwigo-Inhalte geloeschter WebDAV-Verbindungen konnten nicht bereinigt werden." >&2
-    exit 1
-fi
-
-if ! php "$SCRIPT_DIR/cleanup-stale.php"; then
-    echo "NC Connector: verwaiste Laufzeitdateien konnten nicht bereinigt werden." >&2
-    exit 1
-fi
+php "$SCRIPT_DIR/reconcile.php"
+php "$SCRIPT_DIR/reconcile-webdav.php"
+php "$SCRIPT_DIR/cleanup-webdav-piwigo.php"
+php "$SCRIPT_DIR/cleanup-stale.php"

 configs=("$CONFIG_DIR"/connection-*.conf)
 webdav_configs=("$CONFIG_DIR"/webdav-connection-*.conf)
@@ -133,72 +61,54 @@ 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=""
+failure_count=0
+webdav_count=0
+local_count=0
+summary_parts=()

-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
+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 [[ "$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
+    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

 for config in "${configs[@]}"; do
+    [[ -f "$config" ]] || continue
    name="$(basename "$config")"
-    connection_id=""
+    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

    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"
-
-    if [[ -n "$connection_id" && -f "$tombstone_dir/deleted-$connection_id" ]]; then
+    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" \
@@ -209,33 +119,35 @@ for config in "${configs[@]}"; do
        continue
    fi

-    echo "NC Connector Legacy-Fallback: $name"
-    if ! env PIWIGO_CONFIG="$config" bash "$SCRIPT_DIR/sync.sh"; then
-        legacy_result=1
+    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

-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."
+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: alle Verbindungen wurden erfolgreich verarbeitet."
    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
+write_route_status "failed" "FEHLER - mindestens eine Verbindung" "$summary_detail" "0"
+echo "NC Connector: mindestens eine Verbindung ist fehlgeschlagen." >&2
 exit 1
--- a/runtime/sync-webdav.sh
+++ b/runtime/sync-webdav.sh
@@ -59,10 +59,6 @@ for target in (status_file, public_file):
 PY
 }

-compact_output() {
-    tail -n 12 | tr '\n' ' ' | sed 's/[[:space:]]\+/ /g; s/^[[:space:]]//; s/[[:space:]]$//'
-}
-
 failure() {
    local code="$1" command="$2" line="$3"
    trap - ERR
@@ -94,28 +90,6 @@ python3 "$SCRIPT_DIR/lib/shadow_tree.py" \
    --state "$SHADOW_MAP_FILE"

 trap - ERR
-PREVIEW_CACHE="$PIWIGO_ROOT/_data/bratonien-tools/nc-webdav-preview/connection-$CONNECTION_ID"
-PREVIEW_OUTPUT=""
-PREVIEW_EXIT=0
-if PREVIEW_OUTPUT="$(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" 2>&1)"; then
-    PREVIEW_EXIT=0
-else
-    PREVIEW_EXIT=$?
-fi
-[[ -z "$PREVIEW_OUTPUT" ]] || printf '%s\n' "$PREVIEW_OUTPUT"
-if [[ "$PREVIEW_EXIT" -ne 0 ]]; then
-    DETAIL="Exit-Code: $PREVIEW_EXIT"
-    if [[ -n "$PREVIEW_OUTPUT" ]]; then
-        DETAIL+="; Ausgabe: $(printf '%s\n' "$PREVIEW_OUTPUT" | compact_output)"
-    fi
-    write_status error "WebDAV-Vorschaubilder konnten beim Einlesen nicht erzeugt werden" "$DETAIL"
-    exit "$PREVIEW_EXIT"
-fi

 if [[ "${PIWIGO_SYNC_ENABLED:-0}" == "1" ]]; then
    PIWIGO_OUTPUT=""
@@ -133,7 +107,7 @@ if [[ "${PIWIGO_SYNC_ENABLED:-0}" == "1" ]]; then
    if [[ "$PIWIGO_EXIT" -ne 0 ]]; then
        DETAIL="Exit-Code: $PIWIGO_EXIT"
        if [[ -n "$PIWIGO_OUTPUT" ]]; then
-            DETAIL+="; Ausgabe: $(printf '%s\n' "$PIWIGO_OUTPUT" | compact_output)"
+            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
@@ -160,28 +134,21 @@ if [[ "${PIWIGO_SYNC_ENABLED:-0}" == "1" ]]; then
        exit "$PIWIGO_EXIT"
    fi

-    DERIVATIVE_OUTPUT=""
-    DERIVATIVE_EXIT=0
-    if DERIVATIVE_OUTPUT="$(php "$SCRIPT_DIR/lib/build-webdav-derivatives.php" \
-        --piwigo-root="$PIWIGO_ROOT" \
-        --connection-id="$CONNECTION_ID" 2>&1)"; then
-        DERIVATIVE_EXIT=0
-    else
-        DERIVATIVE_EXIT=$?
-    fi
-    [[ -z "$DERIVATIVE_OUTPUT" ]] || printf '%s\n' "$DERIVATIVE_OUTPUT"
-    if [[ "$DERIVATIVE_EXIT" -ne 0 ]]; then
-        DETAIL="Exit-Code: $DERIVATIVE_EXIT"
-        if [[ -n "$DERIVATIVE_OUTPUT" ]]; then
-            DETAIL+="; Ausgabe: $(printf '%s\n' "$DERIVATIVE_OUTPUT" | compact_output)"
-        fi
-        write_status error "Piwigo-Derivate für WebDAV-Bilder konnten nicht erzeugt werden" "$DETAIL"
-        exit "$DERIVATIVE_EXIT"
+    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

    if grep -q 'Piwigo-Synchronisierung per API erfolgreich' <<<"$PIWIGO_OUTPUT"; then
        write_status ok \
-            "WebDAV eingelesen, Piwigo synchronisiert und Derivate erzeugt" \
+            "WebDAV eingelesen und Piwigo synchronisiert; Bildaufbereitung läuft im Hintergrund" \
            "" \
            "api" \
            "ok" \
@@ -190,7 +157,7 @@ if [[ "${PIWIGO_SYNC_ENABLED:-0}" == "1" ]]; then
            "Fallback wurde nicht benötigt"
    elif grep -q 'Piwigo-Datenbanksynchronisierung per Benutzername/Passwort-Fallback erfolgreich' <<<"$PIWIGO_OUTPUT"; then
        write_status ok \
-            "WebDAV eingelesen, Piwigo über Fallback synchronisiert und Derivate erzeugt" \
+            "WebDAV eingelesen und Piwigo über Fallback synchronisiert; Bildaufbereitung läuft im Hintergrund" \
            "" \
            "fallback" \
            "not_used" \
@@ -198,8 +165,8 @@ if [[ "${PIWIGO_SYNC_ENABLED:-0}" == "1" ]]; then
            "ok" \
            "Benutzername/Passwort-Fallback erfolgreich"
    else
-        write_status ok "WebDAV eingelesen, Piwigo synchronisiert und Derivate erzeugt"
+        write_status ok "WebDAV eingelesen und Piwigo synchronisiert; Bildaufbereitung läuft im Hintergrund"
    fi
 else
-    write_status ok "WebDAV eingelesen und Vorschaubilder erzeugt; Registrierung erfolgt über den bestehenden produktiven Piwigo-Sync"
+    write_status ok "WebDAV eingelesen; Piwigo-Synchronisierung ist für diese Verbindung deaktiviert"
 fi
Author	SHA1	Message	Date
Terranom674	06646ea37f	0.9.6.27: einen NC-Anlageweg und Jetzt-abgleichen 0.9.6.27: einen NC-Anlageweg und Jetzt-abgleichen	2026-08-19 19:29:08 +02:00
Terranom674	8f2b22a376	0.9.6.27: CI-Marker entfernen	2026-08-19 19:28:20 +02:00
Terranom674	2122ab88ac	0.9.6.27: CI-Stand markieren	2026-08-19 19:28:11 +02:00
Terranom674	babe95fae3	0.9.6.27: versehentliche Hilfsdatei entfernen	2026-08-19 19:28:03 +02:00
Terranom674	14a83be190	noop	2026-08-19 19:27:53 +02:00
Terranom674	a1d2163aab	0.9.6.27: CI auf einen NC-JavaScript-Pfad zuruecksetzen	2026-08-19 19:27:06 +02:00
Terranom674	a0606b2553	0.9.6.27: paralleles Run-now-JavaScript entfernen	2026-08-19 19:26:51 +02:00
Terranom674	9543af50d8	0.9.6.27: parallelen NC-Anlageweg entfernen	2026-08-19 19:26:37 +02:00
Terranom674	4af1972353	0.9.6.27: einen einzigen NC-Verbindungsweg anzeigen	2026-08-19 19:26:11 +02:00
Terranom674	0e7070fb04	0.9.6.27: parallelen sudoers-Installer entfernen	2026-08-19 19:24:41 +02:00
Terranom674	ba53bfebe9	0.9.6.27: parallele sudoers-Hilfsstruktur entfernen	2026-08-19 19:24:36 +02:00
Terranom674	4b2fc93e3d	0.9.6.27: unnoetige Markerdatei entfernen	2026-08-19 19:24:06 +02:00
Terranom674	e356d43e5b	0.9.6.27: unnoetige Run-now-Hinweisdatei entfernen	2026-08-19 19:23:56 +02:00
Terranom674	980efc6700	0.9.6.27: Run-now-Setup markieren	2026-08-19 19:23:30 +02:00
Terranom674	a814c18d18	0.9.6.27: sudoers-Setup fuer Jetzt-abgleichen vorbereiten	2026-08-19 19:23:14 +02:00
Terranom674	6737c8989d	0.9.6.27: minimale sudoers-Regel fuer manuellen Abgleich dokumentieren	2026-08-19 19:23:04 +02:00
Terranom674	2e308867ad	0.9.6.27: Hinweis zur manuellen Service-Ausloesung	2026-08-19 19:22:54 +02:00
Terranom674	1d3768b051	0.9.6.27: Jetzt-abgleichen-JavaScript in CI pruefen	2026-08-19 19:22:48 +02:00
Terranom674	cfea5546de	0.9.6.27: Version anheben	2026-08-19 19:22:32 +02:00
Terranom674	8c30edc0ee	0.9.6.27: Jetzt-abgleichen-JavaScript laden	2026-08-19 19:22:11 +02:00
Terranom674	76a182af82	0.9.6.27: Jetzt-abgleichen-Button anzeigen	2026-08-19 19:21:41 +02:00
Terranom674	21e046cf37	0.9.6.27: manuellen NC-Abgleich registrieren	2026-08-19 19:21:16 +02:00
Terranom674	7728e368db	Merge pull request #15 from Terranom674/fix/remove-nc-status-card-09625 0.9.6.26: Connector-Timer nicht mehr durch Bildaufbereitung blockieren	2026-08-19 18:57:07 +02:00
Terranom674	074aa8d99a	0.9.6.26: Version anheben	2026-08-19 18:56:13 +02:00
Terranom674	030634c39d	0.9.6.26: Connector-Lauf nicht mehr durch Bildaufbereitung blockieren	2026-08-19 18:55:50 +02:00
Terranom674	dea1a0ffb2	0.9.6.26: Bildaufbereitung aus Connector-Hauptlauf auslagern	2026-08-19 18:55:30 +02:00
Terranom674	3a3539e55b	0.9.6.25: NC-Status fuer laufenden Sync korrigieren 0.9.6.25: NC-Status fuer laufenden Sync korrigieren	2026-08-19 18:45:58 +02:00
Terranom674	49e74a019b	CI: entfernte NC-Migrations-JavaScriptdatei nicht mehr pruefen	2026-08-19 18:45:22 +02:00
Terranom674	f2f7d39b22	Version 0.9.6.25	2026-08-19 18:44:19 +02:00
Terranom674	2c5bcf6ba2	NC-Status: laufenden Service und naechsten Lauf korrekt anzeigen	2026-08-19 18:43:46 +02:00
Terranom674	2d29cfacfe	0.9.6.24: Migration vollstaendig aus aktivem Connectorpfad entfernen	2026-08-19 18:34:43 +02:00
Terranom674	c5e1b33c2f	0.9.6.24: Uebergabe- und Migrationslogik entfernen	2026-08-19 18:34:21 +02:00
Terranom674	675ccd1df8	0.9.6.24: Migrations-UI-Datei entfernen	2026-08-19 18:34:11 +02:00
Terranom674	aefbe76595	0.9.6.24: WebDAV-Runtime von Migration entkoppeln	2026-08-19 18:33:41 +02:00
Terranom674	65cbc0060f	0.9.6.24: Runtime-Migrationsrouting entfernen	2026-08-19 18:33:04 +02:00
Terranom674	5dce180217	0.9.6.24: Migrationsstatus aus Edit-API entfernen	2026-08-19 18:31:51 +02:00
Terranom674	25ee22b1ef	0.9.6.24: Migrations-UI aus Verbindungseditor entfernen	2026-08-19 18:31:28 +02:00
Terranom674	992ddd3b9b	0.9.6.24: Migrationsfunktionen aus Registry entfernen	2026-08-19 18:30:30 +02:00
Terranom674	0f85958dff	0.9.6.24: WebDAV ohne Migrationspaarung	2026-08-19 18:27:44 +02:00
Terranom674	82af31435e	0.9.6.24: gekoppelte Migrationsloeschung entfernen	2026-08-19 18:25:01 +02:00
Terranom674	462197fc78	0.9.6.23: Versionsnummer aktualisieren	2026-08-19 18:20:30 +02:00
Terranom674	cb445c3f04	0.9.6.23: Status logischer NC-Verbindungen korrekt aggregieren	2026-08-19 18:20:10 +02:00
Terranom674	e1306c110c	Version auf 0.9.6.22 anheben	2026-08-19 18:10:19 +02:00
Terranom674	bbae8ac984	Migration als einmaligen Uebergang begrenzen	2026-08-19 18:10:01 +02:00
Terranom674	5a7f72b24e	Fallback im NC-Verbindungseditor bearbeitbar machen	2026-08-19 18:07:08 +02:00
Terranom674	09027322ef	Piwigo-Fallback im Editor pruefen und speichern	2026-08-19 18:06:34 +02:00
Terranom674	a38152108c	Piwigo-Fallback im Verbindungseditor bereitstellen	2026-08-19 18:05:50 +02:00
Terranom674	036f2a51e6	Version auf 0.9.6.21 anheben	2026-08-19 18:04:00 +02:00
Terranom674	8cabeb3079	Wizard-Dialog ueber Fehler und Redirects offen halten	2026-08-19 18:03:38 +02:00
Terranom674	0767c4fd8f	Gekoppelte NC-Verbindung als Einheit loeschen	2026-08-19 18:03:04 +02:00
Terranom674	de649235ff	NC Connector als logische Verbindungen darstellen	2026-08-19 18:02:44 +02:00
Terranom674	3896933081	Merge pull request #13 from Terranom674/fix/nc-ui-mutation-loop-09620 0.9.6.20: NC-Connector UI-Hänger beheben	2026-08-19 17:38:42 +02:00
Terranom674	72a3267ed3	Bump version to 0.9.6.20	2026-08-19 17:32:12 +02:00
Terranom674	99479d5d03	Fix NC connector MutationObserver loop	2026-08-19 17:31:57 +02:00
Terranom674	51089c3446	Merge 0.9.6.19 migration stabilization WebDAV migration now routes per connection, preserves exact legacy fallbacks, supports API or connection-scoped fallback auth, and passes the final PHP 8.2-8.5 plus script syntax matrix.	2026-08-19 16:11:18 +02:00
Terranom674	c8d846f289	Bump version to 0.9.6.19	2026-08-19 16:09:24 +02:00
Terranom674	2603a8929c	0.9.6.19 preserve fallback-only migration auth	2026-08-19 16:08:57 +02:00
Terranom674	afd8620859	0.9.6.19 allow migration with connection-scoped fallback	2026-08-19 16:08:24 +02:00
Terranom674	72db8b48eb	0.9.6.19 make migration pairing atomic	2026-08-19 16:06:29 +02:00
Terranom674	1a0f8c61e8	0.9.6.19 test supported PHP branches and all admin JS	2026-08-19 16:05:19 +02:00
Terranom674	d4e3e7faab	0.9.6.19 route WebDAV and legacy per connection	2026-08-19 16:04:27 +02:00
Terranom674	03e92b74a7	0.9.6.19 expose exact migration fallback to runtime	2026-08-19 16:03:50 +02:00
Terranom674	88c787c956	0.9.6.19 preserve Nextcloud root selection	2026-08-19 16:02:02 +02:00
Terranom674	3f5f8dc4b4	0.9.6.19 pair migration with selected legacy connection	2026-08-19 16:01:16 +02:00
Terranom674	495edbbb70	Merge pull request #11 from Terranom674/fix/migration-runtime-09618 0.9.6.18: Migration wirklich abschließen und Root-Runtime erzeugen	2026-08-19 15:31:33 +02:00
Terranom674	3d5e6c82ea	0.9.6.18 bump version for migration runtime fix	2026-08-19 15:29:30 +02:00
Terranom674	ae815bc077	0.9.6.18 make selected path lead directly to final migration confirmation	2026-08-19 15:28:41 +02:00
Terranom674	936a1cf3c4	0.9.6.18 allow Nextcloud root in WebDAV runtime	2026-08-19 15:27:39 +02:00
Terranom674	ff0c1e0bec	0.9.6.18 complete migration after WebDAV source selection	2026-08-19 15:26:54 +02:00
Terranom674	a047fc0d83	Merge pull request #10 from Terranom674/fix/root-selection-09617 0.9.6.17: Nextcloud-Stammverzeichnis als WebDAV-Quelle zulassen	2026-08-19 15:19:39 +02:00