Remove accidental temp file

noop
2026-09-19 22:14:33 +00:00 · 2026-08-19 14:30:40 +02:00 · 2026-08-19 14:30:14 +02:00
11 changed files with 158 additions and 626 deletions
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -5,12 +5,8 @@ on:
  pull_request:

 jobs:
-  php-syntax:
+  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
@@ -18,7 +14,7 @@ jobs:
      - name: PHP installieren
        uses: shivammathur/setup-php@v2
        with:
-          php-version: ${{ matrix.php-version }}
+          php-version: '8.2'
          coverage: none

      - name: PHP Syntax pruefen
@@ -40,12 +36,6 @@ 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: |
@@ -53,7 +43,6 @@ jobs:
          sed -n '/<script>/,/<\/script>/p' template/admin_tabs.tpl | sed '1d;$d' > /tmp/bratonien-admin-tabs.js
          node --check /tmp/bratonien-admin-tabs.js
          node --check js/nc_connector_edit_v2.js
-          node --check js/nc_connector_source_ui.js

      - name: Python Syntax pruefen
        shell: bash
--- a/include/nc_connector_edit.inc.php
+++ b/include/nc_connector_edit.inc.php
@@ -13,22 +13,12 @@ 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';
-
-  $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';
+  if (trim((string)($credentials['api_key_id'] ?? '')) === '') $missing[] = 'Piwigo-API-Schluessel-ID';
+  if (trim((string)($credentials['api_key_secret'] ?? '')) === '') $missing[] = 'Piwigo-API-Geheimnis';

  return array(
    'ready'=>!$missing,
    'missing'=>$missing,
-    'api_available'=>$api_complete,
-    'fallback_available'=>$fallback_complete,
  );
 }

@@ -122,7 +112,7 @@ function bratonien_tools_nc_connector_prepare_webdav_wizard_from_connection(arra
  {
    $path = trim((string)($root['webdav_path'] ?? ''), '/');
    $fileid = (int)($root['fileid'] ?? 0);
-    if ($fileid < 1) continue;
+    if ($path === '' || $fileid < 1) continue;
    $selected[] = $path;
    $selected_ids[$path] = $fileid;
  }
--- a/include/nc_connector_webdav.inc.php
+++ b/include/nc_connector_webdav.inc.php
@@ -5,25 +5,46 @@ if (!defined('PHPWG_ROOT_PATH'))
 }

 /**
- * Link a WebDAV successor with the exact legacy connection selected for migration.
- * The caller must execute this inside the same transaction that creates the successor.
+ * Return the only existing local connector as migration fallback.
 */
-function bratonien_tools_nc_connector_pair_migration_fallback($legacy_id, $webdav_id, array &$webdav_config, $now)
+function bratonien_tools_nc_connector_single_local_fallback()
 {
-  $legacy_id = (int)$legacy_id;
-  $webdav_id = (int)$webdav_id;
-  if ($legacy_id < 1 || $webdav_id < 1 || $legacy_id === $webdav_id)
+  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))
  {
-    throw new RuntimeException('Die Migrationszuordnung ist ungueltig.');
+    $rows[] = $row;
+    if (count($rows) > 1) return null;
  }

-  $legacy = bratonien_tools_nc_connector_connection($legacy_id, false);
-  if (!$legacy || (string)$legacy['adapter'] !== 'local')
-  {
-    throw new RuntimeException('Die ausgewaehlte Legacy-Verbindung fuer die Migration ist nicht mehr verfuegbar.');
-  }
+  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;

-  $legacy_config = isset($legacy['config']) && is_array($legacy['config']) ? $legacy['config'] : array();
  $webdav_config['migration'] = array(
    'role'=>'webdav-primary-candidate',
    'legacy_fallback_connection_id'=>$legacy_id,
@@ -31,9 +52,11 @@ function bratonien_tools_nc_connector_pair_migration_fallback($legacy_id, $webda
    'paired_at'=>(string)$now,
    'cutover_state'=>'parallel',
  );
+
+  $legacy_config = $legacy['config'];
  $legacy_config['migration'] = array(
    'role'=>'legacy-fallback',
-    'webdav_successor_connection_id'=>$webdav_id,
+    'webdav_successor_connection_id'=>(int)$webdav_id,
    'fallback_policy'=>'keep-running',
    'paired_at'=>(string)$now,
    'cutover_state'=>'parallel',
@@ -46,7 +69,7 @@ function bratonien_tools_nc_connector_pair_migration_fallback($legacy_id, $webda
  }

  $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." AND adapter='local' LIMIT 1");
+  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;
 }
@@ -54,8 +77,9 @@ function bratonien_tools_nc_connector_pair_migration_fallback($legacy_id, $webda
 /**
 * Create or update a WebDAV-backed connector from the user-facing wizard.
 *
- * Remote connections are updated in place. A legacy connection is paired only
- * when the wizard was explicitly opened in migration mode for that connection.
+ * Remote connections are updated in place. When the editor was opened for a
+ * legacy connection, a WebDAV successor is created and the legacy connection
+ * stays available as fallback.
 */
 function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
 {
@@ -63,7 +87,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 vollstaendig vorbereitet.');
+    throw new RuntimeException('Die WebDAV-Verbindung wurde im Assistenten noch nicht vollständig vorbereitet.');
  }

  $base_url = rtrim(trim((string)($state['base_url'] ?? '')), '/');
@@ -71,7 +95,7 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
  $password = (string)($state['_password'] ?? '');
  if ($base_url === '' || $username === '' || $password === '')
  {
-    throw new RuntimeException('Fuer den WebDAV-Zugang fehlen Nextcloud-Adresse oder Zugangsdaten.');
+    throw new RuntimeException('Für den WebDAV-Zugang fehlen Nextcloud-Adresse oder Zugangsdaten.');
  }

  $selected = isset($state['directory_selected']) && is_array($state['directory_selected'])
@@ -80,19 +104,17 @@ 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 auswaehlen.');
+  $selected = array_values(array_filter($selected, function($path) { return $path !== ''; }));
+  if (!$selected) throw new RuntimeException('Bitte mindestens ein Nextcloud-Verzeichnis auswählen.');

  $roots = array();
  foreach ($selected as $path)
  {
    $fileid = isset($selected_ids[$path]) ? (int)$selected_ids[$path] : 0;
-    if ($fileid < 1) throw new RuntimeException('Fuer ein ausgewaehltes Nextcloud-Verzeichnis fehlt die eindeutige Datei-ID.');
-    $display_name = $path === ''
-      ? (trim((string)($state['display_name'] ?? '')) !== '' ? trim((string)$state['display_name']) : $username)
-      : basename($path);
+    if ($fileid < 1) throw new RuntimeException('Für ein ausgewähltes Nextcloud-Verzeichnis fehlt die eindeutige Datei-ID.');
    $roots[] = array(
      'fileid'=>$fileid,
-      'display_name'=>$display_name,
+      'display_name'=>basename($path),
      'webdav_path'=>$path,
    );
  }
@@ -115,14 +137,6 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
    && (string)$editing_connection['adapter'] === 'remote'
    && (string)($editing_connection['config']['source_mode'] ?? '') === 'webdav-placeholder'
    && $editing_mode === 'update';
-  $migrating_legacy = $editing_connection
-    && (string)$editing_connection['adapter'] === 'local'
-    && $editing_mode === 'migrate';
-
-  if ($editing_mode === 'migrate' && !$migrating_legacy)
-  {
-    throw new RuntimeException('Die fuer die Migration ausgewaehlte Legacy-Verbindung ist nicht mehr verfuegbar.');
-  }

  $config = array(
    'origin'=>'native',
@@ -186,12 +200,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." AND adapter='remote' 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." LIMIT 1");
    unset($_SESSION['bratonien_nc_wizard']);

    return array(
      'connection_id'=>$editing_id,
-      'message'=>'WebDAV-Verbindung #'.$editing_id.' wurde gespeichert. Der naechste Connector-Lauf verwendet die neuen Einstellungen.',
+      'message'=>'WebDAV-Verbindung #'.$editing_id.' wurde gespeichert. Der nächste Connector-Lauf verwendet die neuen Einstellungen.',
    );
  }

@@ -199,41 +213,33 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
  if (!is_string($config_json)) throw new RuntimeException('WebDAV-Konfiguration konnte nicht serialisiert werden.');

  $connection_key = 'webdav-'.bin2hex(random_bytes(12));
-  $legacy_fallback_id = null;
-  $id = 0;
+  pwg_query("INSERT INTO `$table` (connection_key,name,adapter,enabled,takeover_state,config_json,secret_blob,created,updated) VALUES ('"
+    .pwg_db_real_escape_string($connection_key)."','"
+    .pwg_db_real_escape_string($name)."','remote',0,'disabled','"
+    .pwg_db_real_escape_string($config_json)."','"
+    .pwg_db_real_escape_string($secret_blob)."','"
+    .pwg_db_real_escape_string($now)."','"
+    .pwg_db_real_escape_string($now)."')");
+
+  $id = (int)pwg_db_insert_id();
+  if ($id < 1) throw new RuntimeException('Die WebDAV-Verbindung konnte nicht eindeutig angelegt werden.');

-  pwg_query('START TRANSACTION');
  try
  {
-    pwg_query("INSERT INTO `$table` (connection_key,name,adapter,enabled,takeover_state,config_json,secret_blob,created,updated) VALUES ('"
-      .pwg_db_real_escape_string($connection_key)."','"
-      .pwg_db_real_escape_string($name)."','remote',0,'disabled','"
-      .pwg_db_real_escape_string($config_json)."','"
-      .pwg_db_real_escape_string($secret_blob)."','"
-      .pwg_db_real_escape_string($now)."','"
-      .pwg_db_real_escape_string($now)."')");
-
-    $id = (int)pwg_db_insert_id();
-    if ($id < 1) throw new RuntimeException('Die WebDAV-Verbindung konnte nicht eindeutig angelegt werden.');
-
    $config['state_dir'] = '/var/lib/bratonien-tools/nc-connector/connection-'.$id;
    $config['status_file'] = $config['state_dir'].'/connector-status.json';
-    if ($migrating_legacy)
-    {
-      $legacy_fallback_id = bratonien_tools_nc_connector_pair_migration_fallback($editing_id, $id, $config, $now);
-    }
+    $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." AND adapter='remote' LIMIT 1");
-    pwg_query('COMMIT');
+    pwg_query("UPDATE `$table` SET config_json='".pwg_db_real_escape_string($config_json)."' WHERE id=".$id." LIMIT 1");
  }
  catch (Throwable $e)
  {
-    pwg_query('ROLLBACK');
+    pwg_query("DELETE FROM `$table` WHERE id=".$id." LIMIT 1");
    throw $e;
  }

--- a/include/nc_connector_wizard_webdav_flow.inc.php
+++ b/include/nc_connector_wizard_webdav_flow.inc.php
@@ -126,6 +126,7 @@ function bratonien_tools_nc_wizard_save_sources_dispatch()
  $selected = isset($state['directory_selected']) && is_array($state['directory_selected'])
    ? array_values(array_unique(array_map(function($path) { return trim((string)$path, '/'); }, $state['directory_selected'])))
    : array();
+  $selected = array_values(array_filter($selected, function($path) { return $path !== ''; }));
  if (!$selected)
  {
    throw new RuntimeException('Bitte mindestens ein Nextcloud-Verzeichnis auswählen.');
@@ -142,12 +143,9 @@ function bratonien_tools_nc_wizard_save_sources_dispatch()
    {
      throw new RuntimeException('Für eine Auswahl fehlt die eindeutige Nextcloud-Datei-ID. Bitte das Verzeichnis erneut auswählen.');
    }
-    $display_name = $path === ''
-      ? (trim((string)($state['display_name'] ?? '')) !== '' ? trim((string)$state['display_name']) : (string)$state['username'])
-      : basename($path);
    $roots[] = array(
      'fileid'=>$fileid,
-      'display_name'=>$display_name,
+      'display_name'=>basename($path),
      'webdav_path'=>$path,
    );
  }
@@ -158,35 +156,9 @@ function bratonien_tools_nc_wizard_save_sources_dispatch()
  $state['technical_source'] = 'WebDAV-Verzeichnisse ausgewählt';
  $state['technical_error'] = '';
  $state['directory_selection_ready'] = false;
-
-  if ((string)($state['editing_mode'] ?? '') === 'migrate')
-  {
-    $editing_id = (int)($state['editing_connection_id'] ?? 0);
-    $connection = $editing_id > 0 ? bratonien_tools_nc_connector_connection($editing_id, true) : null;
-    if (!$connection || (string)$connection['adapter'] !== 'local')
-    {
-      throw new RuntimeException('Die zu migrierende Legacy-Verbindung ist nicht mehr verfügbar.');
-    }
-
-    $migration = bratonien_tools_nc_connector_migration_state($connection);
-    if (empty($migration['ready']))
-    {
-      throw new RuntimeException('Die WebDAV-Migration kann noch nicht abgeschlossen werden. Es fehlen: '.implode(', ', $migration['missing']).'.');
-    }
-
-    $credentials = bratonien_tools_nc_connector_scoped_secret($connection);
-    $state['_api_key_id'] = (string)($credentials['api_key_id'] ?? '');
-    $state['_api_key_secret'] = (string)($credentials['api_key_secret'] ?? '');
-    $state['api_status'] = !empty($migration['api_available']) ? 'ok' : 'skipped';
-    $state['api_error'] = '';
-    $state['step'] = 4;
-    bratonien_tools_nc_wizard_store($state);
-
-    return array('message'=>'WebDAV-Quelle wurde übernommen. Mit „Migration starten“ wird jetzt der WebDAV-Nachfolger angelegt; die Legacy-Verbindung bleibt als Fallback erhalten.');
-  }
-
  bratonien_tools_nc_wizard_store($state);
-  return array('message'=>'WebDAV-Verzeichnisse wurden übernommen. Die Verbindung ist für den nächsten Einrichtungsschritt vorbereitet.');
+
+  return array('message'=>'WebDAV-Verzeichnisse wurden übernommen. Die Verbindung ist für den parallelen Testweg vorbereitet.');
 }

 function bratonien_tools_nc_wizard_finish_dispatch()
--- a/include/tool_registry.inc.php
+++ b/include/tool_registry.inc.php
@@ -6,18 +6,11 @@ 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';
  $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,
+    'version'=>function_exists('bratonien_tools_current_version') ? bratonien_tools_current_version() : '0.9.6.10',
  ));
 }

--- a/js/nc_connector_edit_v2.js
+++ b/js/nc_connector_edit_v2.js
@@ -19,7 +19,7 @@

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

@@ -239,14 +239,13 @@
      });
    }

-    function rebuildLocalActions(deleteForm, id, connectionData) {
+    function rebuildLocalActions(deleteForm, id) {
      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();
+        if (migrate) form.remove();
      });
      [].slice.call(actions.children).forEach(function (child) {
        if (child.tagName === 'BUTTON' && (child.textContent || '').trim() === 'Bearbeiten') child.remove();
@@ -266,8 +265,7 @@
      info.textContent = 'WebDAV-Migration wird geprüft …';
      actions.insertBefore(info, deleteForm);

-      var dataPromise = connectionData ? Promise.resolve(connectionData) : loadConnection(id);
-      dataPromise.then(function (data) {
+      loadConnection(id).then(function (data) {
        var webdav = data.webdav || {};
        if (webdav.migration_ready) {
          info.remove();
@@ -281,44 +279,15 @@
      });
    }

-    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_delete"]')).forEach(function (deleteButton) {
      var deleteForm = deleteButton.closest('form');
-      if (!deleteForm) return;
+      var card = deleteButton.closest('details');
+      if (!deleteForm || !card) return;
      var idInput = deleteForm.querySelector('input[name="connection_id"]');
      if (!idInput) return;
-      var id = idInput.value;
-
-      loadConnection(id).then(function (data) {
-        if (data.adapter === 'local') rebuildLocalActions(deleteForm, id, data);
-        else rebuildRemoteActions(deleteForm, id);
-      }).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));
-        actions.insertBefore(info, deleteForm);
-      });
+      var text = card.textContent || '';
+      var isLocal = text.indexOf('bestehende Legacy-Konfiguration') !== -1;
+      if (isLocal) rebuildLocalActions(deleteForm, idInput.value);
    });
  });
 })();
--- 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.19
+Version: 0.9.6.13
 Description: Erweiterbare Administrationswerkzeuge fuer die Bratonien-Piwigo-Installation.
 Plugin URI: https://github.com/Terranom674/Piwigo_Bratonien_Tools
 Author: Bratonien
--- a/nc-connector-source-picker-start.php
+++ b/nc-connector-source-picker-start.php
@@ -1,104 +0,0 @@
-<?php
-$piwigo_root = realpath(dirname(__DIR__, 2));
-if ($piwigo_root === false)
-{
-  http_response_code(500);
-  exit;
-}
-define('PHPWG_ROOT_PATH', rtrim($piwigo_root, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR);
-include_once(PHPWG_ROOT_PATH.'include/common.inc.php');
-
-header('Content-Type: application/json; charset=utf-8');
-header('Cache-Control: no-store, max-age=0');
-
-function bratonien_tools_nc_source_picker_json($status, array $payload)
-{
-  http_response_code((int)$status);
-  echo json_encode($payload, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
-  exit;
-}
-
-function bratonien_tools_nc_source_picker_fail($message, array $fields = array())
-{
-  bratonien_tools_nc_source_picker_json(422, array(
-    'ok'=>false,
-    'message'=>(string)$message,
-    'fields'=>array_values(array_unique($fields)),
-  ));
-}
-
-if (!defined('BRATONIEN_TOOLS_PATH'))
-{
-  bratonien_tools_nc_source_picker_json(404, array('ok'=>false, 'message'=>'Bratonien Tools ist nicht aktiv.', 'fields'=>array()));
-}
-if (!function_exists('is_admin') || !is_admin())
-{
-  bratonien_tools_nc_source_picker_json(403, array('ok'=>false, 'message'=>'Administratorrechte erforderlich.', 'fields'=>array()));
-}
-if (($_SERVER['REQUEST_METHOD'] ?? '') !== 'POST')
-{
-  bratonien_tools_nc_source_picker_json(405, array('ok'=>false, 'message'=>'Nur POST ist erlaubt.', 'fields'=>array()));
-}
-
-try
-{
-  check_pwg_token();
-  require_once(BRATONIEN_TOOLS_PATH.'include/tool_registry.inc.php');
-
-  $id = (int)($_POST['connection_id'] ?? 0);
-  $connection = bratonien_tools_nc_connector_connection($id, true);
-  if (!$connection)
-  {
-    bratonien_tools_nc_source_picker_fail('Die zu bearbeitende Verbindung wurde nicht gefunden.');
-  }
-  if ((string)$connection['adapter'] !== 'local')
-  {
-    bratonien_tools_nc_source_picker_fail('Die automatische Migrationsauswahl ist nur für die bestehende Legacy-Verbindung vorgesehen.');
-  }
-
-  $config = isset($connection['config']) && is_array($connection['config']) ? $connection['config'] : array();
-  $credentials = bratonien_tools_nc_connector_scoped_secret($connection);
-
-  $base_url = trim((string)($config['nextcloud_url'] ?? ''));
-  $username = trim((string)($credentials['nextcloud_user'] ?? ''));
-  $password = (string)($credentials['nextcloud_password'] ?? '');
-
-  $missing = array();
-  if ($base_url === '') $missing[] = 'nc_nextcloud_url';
-  if ($username === '') $missing[] = 'nc_nextcloud_user';
-  if ($password === '') $missing[] = 'nc_nextcloud_password';
-  if ($missing)
-  {
-    bratonien_tools_nc_source_picker_fail(
-      'Für die automatische Ordnerauswahl müssen Nextcloud-Adresse, Benutzer und Passwort gespeichert sein.',
-      $missing
-    );
-  }
-
-  bratonien_tools_nc_connector_prepare_webdav_wizard_from_connection($connection, 'migrate');
-
-  $state = bratonien_tools_nc_wizard_state();
-  if ((int)($state['step'] ?? 0) !== 2 || empty($state['scan_ok']) || empty($state['directory_selection_ready']))
-  {
-    $detail = trim((string)($state['technical_error'] ?? ''));
-    bratonien_tools_nc_source_picker_fail(
-      $detail !== '' ? 'Die Nextcloud-Ordner konnten nicht geladen werden: '.$detail : 'Die Nextcloud-Ordner konnten nicht geladen werden.',
-      array('nc_nextcloud_url','nc_nextcloud_user','nc_nextcloud_password')
-    );
-  }
-
-  bratonien_tools_nc_source_picker_json(200, array(
-    'ok'=>true,
-    'message'=>'Nextcloud-Ordner wurden geladen. Die Auswahl wird geöffnet.',
-    'fields'=>array(),
-  ));
-}
-catch (Throwable $e)
-{
-  $message = trim($e->getMessage());
-  if ($message === '') $message = 'Die Nextcloud-Ordnerauswahl konnte nicht vorbereitet werden.';
-  bratonien_tools_nc_source_picker_fail(
-    $message,
-    array('nc_nextcloud_url','nc_nextcloud_user','nc_nextcloud_password')
-  );
-}
--- a/runtime/reconcile-webdav.php
+++ b/runtime/reconcile-webdav.php
@@ -134,17 +134,6 @@ try
      if ($baseUrl === '') fail_webdav_reconcile('Nextcloud-Adresse fehlt.');
      if (!$roots) fail_webdav_reconcile('Keine WebDAV-Wurzeln gespeichert.');

-      $migration = isset($config['migration']) && is_array($config['migration']) ? $config['migration'] : array();
-      $legacyFallbackId = 0;
-      if ((string)($migration['role'] ?? '') === 'webdav-primary-candidate')
-      {
-        $legacyFallbackId = (int)($migration['legacy_fallback_connection_id'] ?? 0);
-        if ($legacyFallbackId < 1 || $legacyFallbackId === $id)
-        {
-          fail_webdav_reconcile('Die gespeicherte Migrationszuordnung zur Legacy-Verbindung ist ungueltig.');
-        }
-      }
-
      $credentials = decrypt_webdav_credentials((string)$row['secret_blob'], $hexKey);
      $user = trim($credentials['nextcloud_user']);
      $password = $credentials['nextcloud_password'];
@@ -176,6 +165,7 @@ 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;
@@ -199,9 +189,8 @@ try
      {
        $path = trim((string)($root['webdav_path'] ?? ''), '/');
        $display = trim((string)($root['display_name'] ?? ''));
-        $runtimePath = $path === '' ? '/' : $path;
-        if ($display === '' || preg_match('/[\t\r\n]/', $runtimePath.$display)) fail_webdav_reconcile('Eine gespeicherte WebDAV-Wurzel ist ungueltig.');
-        $rootLines[] = $runtimePath."\t".$display;
+        if ($path === '' || $display === '' || preg_match('/[\t\r\n]/', $path.$display)) fail_webdav_reconcile('Eine gespeicherte WebDAV-Wurzel ist ungueltig.');
+        $rootLines[] = $path."\t".$display;
      }
      file_put_contents($rootsPath, implode("\n", $rootLines)."\n", LOCK_EX);
      @chmod($rootsPath, 0600);
@@ -209,7 +198,6 @@ try
      $lines = array(
        'PIWIGO_ROOT='.webdav_shell_value($piwigoRoot),
        'CONNECTION_ID='.$id,
-        'MIGRATION_LEGACY_CONNECTION_ID='.$legacyFallbackId,
        'SOURCE_MODE=webdav-placeholder',
        'WEBDAV_BASE_URL='.webdav_shell_value($baseUrl),
        'WEBDAV_USER='.webdav_shell_value($user),
@@ -235,15 +223,13 @@ try
        'mode'=>'parallel-webdav',
        'config'=>$configPath,
        'piwigo_sync_enabled'=>true,
-        'legacy_fallback_connection_id'=>$legacyFallbackId,
        'reconciled_at'=>date('Y-m-d H:i:s'),
      );
      $json = json_encode($config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
-      if (!is_string($json)) fail_webdav_reconcile('WebDAV-Runtime-Konfiguration konnte nicht serialisiert werden.');
-      $escaped = $db->real_escape_string($json);
-      if (!$db->query("UPDATE `{$table}` SET config_json='{$escaped}' WHERE id={$id} AND adapter='remote' LIMIT 1"))
+      if (is_string($json))
      {
-        fail_webdav_reconcile('WebDAV-Runtime-Status konnte nicht gespeichert werden: '.$db->error);
+        $escaped = $db->real_escape_string($json);
+        $db->query("UPDATE `{$table}` SET config_json='{$escaped}' WHERE id={$id} LIMIT 1");
      }
    }
    catch (Throwable $e)
--- a/runtime/run-all.sh
+++ b/runtime/run-all.sh
@@ -5,10 +5,6 @@ CONFIG_DIR="/etc/bratonien-tools/nc-connector"
 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
 shopt -s nullglob

-declare -A webdav_success_for_legacy=()
-declare -A webdav_failure_for_legacy=()
-declare -A legacy_seen=()
-
 read_config_value() {
    local key="$1"
    local file="$2"
@@ -21,15 +17,6 @@ read_config_value() {
    printf '%s' "$value"
 }

-numeric_connection_id() {
-    local value="${1:-}"
-    if [[ "$value" =~ ^[0-9]+$ ]]; then
-        printf '%s' "$value"
-    else
-        printf '0'
-    fi
-}
-
 compact_text() {
    printf '%s\n' "$1" | tail -n 20 | tr '\n' ' ' | sed 's/[[:space:]]\+/ /g; s/^[[:space:]]//; s/[[:space:]]$//'
 }
@@ -146,76 +133,72 @@ 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_count=0
-webdav_failure_count=0
-legacy_run_count=0
-legacy_failure_count=0
-fallback_used=0
-unpaired_webdav_failure=0
-summary_parts=()
+webdav_success=0
+webdav_failed=0
+webdav_failure_detail=""

-for config in "${webdav_configs[@]}"; do
-    name="$(basename "$config")"
-    connection_id="$(numeric_connection_id "$(read_config_value CONNECTION_ID "$config")")"
-    legacy_id="$(numeric_connection_id "$(read_config_value MIGRATION_LEGACY_CONNECTION_ID "$config")")"
-
-    if [[ "$connection_id" -lt 1 ]]; then
-        echo "NC Connector: $name besitzt keine gueltige WebDAV-Verbindungs-ID." >&2
-        webdav_failure_count=$((webdav_failure_count + 1))
-        unpaired_webdav_failure=1
-        summary_parts+=("$name: ungueltige Verbindungs-ID")
-        continue
-    fi
-
-    echo "NC Connector WebDAV #$connection_id: $name"
-    webdav_output=""
-    if webdav_output="$(env PIWIGO_CONFIG="$config" bash "$SCRIPT_DIR/sync-webdav.sh" 2>&1)"; then
-        webdav_success_count=$((webdav_success_count + 1))
-        [[ -z "$webdav_output" ]] || printf '%s\n' "$webdav_output"
-        if [[ "$legacy_id" -gt 0 ]]; then
-            webdav_success_for_legacy["$legacy_id"]="$connection_id"
-            summary_parts+=("WebDAV #$connection_id erfolgreich; Legacy #$legacy_id uebersprungen")
+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
-            summary_parts+=("WebDAV #$connection_id erfolgreich")
+            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
-    else
-        webdav_exit=$?
-        webdav_failure_count=$((webdav_failure_count + 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 #$connection_id fehlgeschlagen: $webdav_failure_detail" >&2
+    done
+fi

-        if [[ "$legacy_id" -gt 0 ]]; then
-            webdav_failure_for_legacy["$legacy_id"]="$webdav_failure_detail"
-            echo "NC Connector: Nur Legacy-Verbindung #$legacy_id ist fuer diesen WebDAV-Lauf als Fallback vorgesehen." >&2
-        else
-            unpaired_webdav_failure=1
-            summary_parts+=("WebDAV #$connection_id fehlgeschlagen ohne Legacy-Fallback")
-        fi
-    fi
-done
+if [[ "$webdav_success" -eq 1 ]]; then
+    write_route_status \
+        "webdav" \
+        "WebDAV (primaer)" \
+        "WebDAV erfolgreich. Legacy-Fallback wurde in diesem Lauf nicht ausgefuehrt." \
+        "0" \
+        "1"
+    echo "NC Connector: WebDAV erfolgreich; Legacy-Verbindung wird in diesem Lauf nicht ausgefuehrt."
+    exit 0
+fi
+
+if [[ ${#configs[@]} -eq 0 ]]; then
+    [[ -n "$webdav_failure_detail" ]] || webdav_failure_detail="WebDAV ist fehlgeschlagen; Ursache konnte nicht ermittelt werden."
+    write_route_status \
+        "failed" \
+        "FEHLER - kein Datenweg" \
+        "WebDAV-Fehler: $webdav_failure_detail Keine Legacy-Fallback-Verbindung vorhanden." \
+        "0" \
+        "0"
+    echo "NC Connector: WebDAV ist fehlgeschlagen und es ist keine Legacy-Fallback-Verbindung vorhanden." >&2
+    exit 1
+fi
+
+echo "NC Connector: kein erfolgreicher WebDAV-Lauf; Legacy-Fallback wird ausgefuehrt."
+legacy_result=0

 for config in "${configs[@]}"; do
    name="$(basename "$config")"
-    connection_id="0"
+    connection_id=""
    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 Legacy-Verbindungs-ID." >&2
-        legacy_failure_count=$((legacy_failure_count + 1))
-        summary_parts+=("$name: ungueltige Legacy-Verbindungs-ID")
-        continue
-    fi
-    legacy_seen["$connection_id"]=1
-
    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 [[ -f "$tombstone_dir/deleted-$connection_id" ]]; then
+    if [[ -n "$connection_id" && -f "$tombstone_dir/deleted-$connection_id" ]]; then
        echo "NC Connector: Verbindung $connection_id wurde geloescht; Laufzeitdateien werden entfernt."
        rm -f -- "$CONFIG_DIR/connection-$connection_id.conf" \
            "$CONFIG_DIR/connection-$connection_id.db-password" \
@@ -226,68 +209,33 @@ for config in "${configs[@]}"; do
        continue
    fi

-    if [[ -n "${webdav_success_for_legacy[$connection_id]:-}" ]]; then
-        echo "NC Connector: Legacy #$connection_id wird nicht ausgefuehrt, weil der zugeordnete WebDAV-Nachfolger #${webdav_success_for_legacy[$connection_id]} erfolgreich war."
-        continue
-    fi
-
-    legacy_run_count=$((legacy_run_count + 1))
-    if [[ -n "${webdav_failure_for_legacy[$connection_id]:-}" ]]; then
-        echo "NC Connector Legacy-Fallback #$connection_id nach WebDAV-Fehler: $name"
-        fallback_used=1
-    else
-        echo "NC Connector Legacy #$connection_id: $name"
-    fi
-
-    if env PIWIGO_CONFIG="$config" bash "$SCRIPT_DIR/sync.sh"; then
-        if [[ -n "${webdav_failure_for_legacy[$connection_id]:-}" ]]; then
-            summary_parts+=("WebDAV fuer Legacy #$connection_id fehlgeschlagen; Legacy-Fallback erfolgreich")
-        else
-            summary_parts+=("Legacy #$connection_id erfolgreich")
-        fi
-    else
-        legacy_failure_count=$((legacy_failure_count + 1))
-        summary_parts+=("Legacy #$connection_id fehlgeschlagen")
+    echo "NC Connector Legacy-Fallback: $name"
+    if ! env PIWIGO_CONFIG="$config" bash "$SCRIPT_DIR/sync.sh"; then
+        legacy_result=1
    fi
 done

-for legacy_id in "${!webdav_failure_for_legacy[@]}"; do
-    if [[ -z "${legacy_seen[$legacy_id]:-}" ]]; then
-        echo "NC Connector: WebDAV fuer Legacy #$legacy_id ist fehlgeschlagen, aber die zugeordnete Legacy-Runtime fehlt." >&2
-        legacy_failure_count=$((legacy_failure_count + 1))
-        summary_parts+=("Fallback #$legacy_id fehlt")
-    fi
-done
-
-summary_detail="$(IFS='; '; printf '%s' "${summary_parts[*]}")"
-[[ -n "$summary_detail" ]] || summary_detail="Keine Connector-Route wurde ausgefuehrt."
-
-if [[ "$unpaired_webdav_failure" -eq 0 && "$legacy_failure_count" -eq 0 ]]; then
-    if [[ "$fallback_used" -eq 1 ]]; then
-        route="mixed_fallback"
-        label="MIGRATION - FALLBACK AKTIV"
-    elif [[ "$webdav_success_count" -gt 0 && "$legacy_run_count" -gt 0 ]]; then
-        route="mixed"
-        label="WebDAV + Legacy"
-    elif [[ "$webdav_success_count" -gt 0 ]]; then
-        route="webdav"
-        label="WebDAV"
-    else
-        route="legacy"
-        label="Legacy"
-    fi
-
-    write_route_status "$route" "$label" "$summary_detail" "$fallback_used" "1"
-    echo "NC Connector: alle erforderlichen Verbindungen wurden erfolgreich verarbeitet."
+if [[ "$legacy_result" -eq 0 ]]; then
+    [[ -n "$webdav_failure_detail" ]] || webdav_failure_detail="WebDAV war nicht erfolgreich; Ursache konnte nicht ermittelt werden."
+    write_route_status \
+        "legacy_fallback" \
+        "LEGACY-FALLBACK AKTIV" \
+        "WebDAV-Fehler: $webdav_failure_detail Legacy-Fallback wurde erfolgreich ausgefuehrt." \
+        "1" \
+        "1"
+    echo "NC Connector: Legacy-Fallback erfolgreich."
    exit 0
 fi

+[[ -n "$webdav_failure_detail" ]] || webdav_failure_detail="WebDAV war nicht erfolgreich; Ursache konnte nicht ermittelt werden."
 write_route_status \
    "failed" \
-    "FEHLER - mindestens eine Verbindung" \
-    "$summary_detail" \
-    "$fallback_used" \
+    "FEHLER - WebDAV und Fallback" \
+    "WebDAV-Fehler: $webdav_failure_detail Legacy-Fallback ist ebenfalls fehlgeschlagen." \
+    "1" \
    "0"

-echo "NC Connector: mindestens eine erforderliche Verbindung ist fehlgeschlagen." >&2
+if [[ "$webdav_failed" -eq 1 ]]; then
+    echo "NC Connector: WebDAV und Legacy-Fallback sind fehlgeschlagen." >&2
+fi
 exit 1
Author	SHA1	Message	Date
Terranom674	f6f83bde60	Remove accidental temp file	2026-08-19 14:30:40 +02:00
Terranom674	1663794d9c	noop	2026-08-19 14:30:14 +02:00