0.9.7.16: vorhandene Preview-Caches ohne Massendownload weiterverwenden

0.9.7.16: WebDAV-Bildendpoint wieder auf Originalauslieferung begrenzen
0.9.7.16: native Piwigo-Derivatlogik wiederherstellen
2026-09-19 16:24:33 +00:00 · 2026-08-19 23:06:11 +02:00 · 2026-08-19 23:05:14 +02:00 · 2026-08-19 23:04:51 +02:00 · 2026-08-19 23:04:34 +02:00 · 2026-08-19 23:04:26 +02:00
26 changed files with 1206 additions and 165 deletions
--- a/.ci-trigger-0977
+++ b/.ci-trigger-0977
@@ -0,0 +1 @@
+0.9.7.7
--- a/include/nc_connector_scheduler.inc.php
+++ b/include/nc_connector_scheduler.inc.php
@@ -16,6 +16,7 @@ function bratonien_tools_nc_scheduler_paths()
    'trigger_lock'=>$base.'/nc-connector-scheduler/trigger.lock',
    'worker_lock'=>$base.'/nc-connector-scheduler/worker.lock',
    'log'=>$base.'/nc-connector-scheduler/last-worker.log',
+    'status_root'=>$base.'/nc-connector-status',
  );
 }

@@ -59,6 +60,31 @@ function bratonien_tools_nc_scheduler_write_state(array $state)
  return @rename($tmp, $paths['state']);
 }

+function bratonien_tools_nc_scheduler_write_connection_status($connection_id, $state, $message)
+{
+  $connection_id = (int)$connection_id;
+  if ($connection_id < 1) return false;
+  $paths = bratonien_tools_nc_scheduler_paths();
+  if (!bratonien_tools_nc_scheduler_ensure_dirs()) return false;
+  $target = $paths['status_root'].'/connection-'.$connection_id.'.json';
+  $existing = array();
+  if (is_readable($target))
+  {
+    $decoded = json_decode((string)@file_get_contents($target), true);
+    if (is_array($decoded)) $existing = $decoded;
+  }
+  $existing['state'] = (string)$state;
+  $existing['message'] = (string)$message;
+  $existing['timestamp'] = time();
+  $existing['connection_id'] = $connection_id;
+  $json = json_encode($existing, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT);
+  if (!is_string($json)) return false;
+  $tmp = $target.'.tmp';
+  if (@file_put_contents($tmp, $json."\n", LOCK_EX) === false) return false;
+  @chmod($tmp, 0644);
+  return @rename($tmp, $target);
+}
+
 function bratonien_tools_nc_scheduler_install()
 {
  if (!bratonien_tools_nc_scheduler_ensure_dirs()) return false;
@@ -82,8 +108,9 @@ function bratonien_tools_nc_scheduler_php_binary()
  return '';
 }

-function bratonien_tools_nc_scheduler_spawn($force = false)
+function bratonien_tools_nc_scheduler_spawn($force = false, $connection_id = 0)
 {
+  $connection_id = max(0, (int)$connection_id);
  $paths = bratonien_tools_nc_scheduler_paths();
  if (!bratonien_tools_nc_scheduler_ensure_dirs())
  {
@@ -117,12 +144,21 @@ function bratonien_tools_nc_scheduler_spawn($force = false)

  $state['enabled'] = true;
  $state['mode'] = 'piwigo-native';
+  $state['state'] = 'queued';
+  $state['message'] = $connection_id > 0 ? 'NC-Abgleich für Verbindung #'.$connection_id.' wurde angefordert.' : 'NC-Abgleich für alle Verbindungen wurde angefordert.';
  $state['queued_at'] = $now;
+  $state['timestamp'] = $now;
+  $state['connection_id'] = $connection_id;
  $state['next_due'] = $now + bratonien_tools_nc_scheduler_interval();
  bratonien_tools_nc_scheduler_write_state($state);
+  if ($connection_id > 0)
+  {
+    bratonien_tools_nc_scheduler_write_connection_status($connection_id, 'queued', 'Abgleich wurde angefordert.');
+  }

  $runner = BRATONIEN_TOOLS_PATH.'runtime/native-runner.php';
-  $command = escapeshellarg($php).' '.escapeshellarg($runner).' >> '.escapeshellarg($paths['log']).' 2>&1 &';
+  $runner_args = $connection_id > 0 ? ' --connection-id='.escapeshellarg((string)$connection_id) : '';
+  $command = escapeshellarg($php).' '.escapeshellarg($runner).$runner_args.' >> '.escapeshellarg($paths['log']).' 2>&1 &';
  $spec = array(
    0=>array('file','/dev/null','r'),
    1=>array('file','/dev/null','a'),
@@ -136,10 +172,19 @@ function bratonien_tools_nc_scheduler_spawn($force = false)

  if ($exit !== 0)
  {
+    $state = bratonien_tools_nc_scheduler_read_state();
+    $state['state'] = 'error';
+    $state['message'] = 'Der native NC-Abgleich konnte nicht gestartet werden.';
+    $state['timestamp'] = time();
+    bratonien_tools_nc_scheduler_write_state($state);
+    if ($connection_id > 0)
+    {
+      bratonien_tools_nc_scheduler_write_connection_status($connection_id, 'error', 'Abgleich konnte nicht gestartet werden.');
+    }
    throw new RuntimeException('Der native NC-Abgleich konnte nicht gestartet werden.');
  }

-  return array('started'=>true, 'message'=>'NC-Abgleich wurde gestartet.');
+  return array('started'=>true, 'message'=>$connection_id > 0 ? 'Abgleich für Verbindung #'.$connection_id.' wurde angefordert.' : 'Abgleich für alle Verbindungen wurde angefordert.');
 }

 function bratonien_tools_nc_scheduler_tick()
@@ -151,7 +196,7 @@ function bratonien_tools_nc_scheduler_tick()

  try
  {
-    bratonien_tools_nc_scheduler_spawn(false);
+    bratonien_tools_nc_scheduler_spawn(false, 0);
  }
  catch (Throwable $e)
  {
--- a/include/nc_connector_system.inc.php
+++ b/include/nc_connector_system.inc.php
@@ -67,7 +67,9 @@ function bratonien_tools_nc_connector_system_status(array $connections = array()
 {
  $scheduler = bratonien_tools_nc_scheduler_read_state();
  $enabled = !isset($scheduler['enabled']) || !empty($scheduler['enabled']);
-  $running = (string)($scheduler['state'] ?? '') === 'running';
+  $scheduler_state = (string)($scheduler['state'] ?? '');
+  $running = $scheduler_state === 'running';
+  $queued = $scheduler_state === 'queued';
  $started = (int)($scheduler['started_at'] ?? 0);
  $next = (int)($scheduler['next_due'] ?? 0);
  $last = bratonien_tools_nc_connector_last_status($connections);
@@ -81,10 +83,23 @@ function bratonien_tools_nc_connector_system_status(array $connections = array()
    $next_label = 'Beim nächsten Piwigo-Aufruf';
  }

-  if ((int)$last['timestamp'] <= 0 && !empty($scheduler['finished_at']))
+  $scheduler_timestamp = (int)($scheduler['timestamp'] ?? 0);
+  if ($scheduler_timestamp > (int)$last['timestamp'])
+  {
+    $last['timestamp'] = $scheduler_timestamp;
+    $last['state'] = $scheduler_state;
+    $last['message'] = (string)($scheduler['message'] ?? '');
+    if ($scheduler_state === 'error')
+    {
+      $detail = trim((string)($scheduler['stderr'] ?? ''));
+      if ($detail === '') $detail = trim((string)($scheduler['stdout'] ?? ''));
+      $last['error_detail'] = $detail;
+    }
+  }
+  elseif ((int)$last['timestamp'] <= 0 && !empty($scheduler['finished_at']))
  {
    $last['timestamp'] = (int)$scheduler['finished_at'];
-    $last['state'] = (string)($scheduler['state'] ?? '');
+    $last['state'] = $scheduler_state;
    $last['message'] = (string)($scheduler['message'] ?? '');
    if ((string)$last['state'] === 'error')
    {
@@ -94,13 +109,17 @@ function bratonien_tools_nc_connector_system_status(array $connections = array()
    }
  }

+  $current_label = 'Kein Lauf aktiv';
+  if ($queued) $current_label = 'Abgleich angefordert';
+  if ($running) $current_label = $started > 0 ? 'Läuft seit '.date('d.m.Y H:i:s', $started) : 'Läuft gerade';
+
  return array(
    'timer_name'=>'Piwigo nativer NC-Scheduler',
    'timer_active'=>$enabled,
    'timer_enabled'=>$enabled,
-    'service_active'=>$running,
-    'current_run_timestamp'=>$started,
-    'current_run_label'=>$running ? ($started > 0 ? 'Läuft seit '.date('d.m.Y H:i:s', $started) : 'Läuft gerade') : 'Kein Lauf aktiv',
+    'service_active'=>$running || $queued,
+    'current_run_timestamp'=>$queued ? (int)($scheduler['queued_at'] ?? 0) : $started,
+    'current_run_label'=>$current_label,
    'last_run_timestamp'=>(int)$last['timestamp'],
    'last_run_label'=>(int)$last['timestamp'] > 0 ? date('d.m.Y H:i:s', (int)$last['timestamp']) : 'Nicht verfügbar',
    'last_run_state'=>(string)$last['state'],
--- a/include/nc_connector_wizard_webdav_flow.inc.php
+++ b/include/nc_connector_wizard_webdav_flow.inc.php
@@ -28,7 +28,7 @@ function bratonien_tools_nc_wizard_scan_webdav_first()
  {
    try
    {
-      $response = bratonien_tools_nc_wizard_http($candidate_url.'/status.php');
+      $response = bratonien_tools_nc_transport_http($candidate_url.'/status.php');
      if ($response['status'] < 200 || $response['status'] >= 300) continue;
      $candidate_status = json_decode($response['body'], true);
      if (!is_array($candidate_status) || empty($candidate_status['installed'])) continue;
@@ -44,7 +44,7 @@ function bratonien_tools_nc_wizard_scan_webdav_first()
    throw new RuntimeException('Unter dieser Adresse konnte keine Nextcloud erreicht werden. HTTP und HTTPS wurden automatisch geprüft.');
  }

-  $user_response = bratonien_tools_nc_wizard_http(
+  $user_response = bratonien_tools_nc_transport_http(
    $base_url.'/ocs/v2.php/cloud/user?format=json',
    $username,
    $password,
@@ -104,7 +104,7 @@ function bratonien_tools_nc_wizard_scan_webdav_first()
    'api_error'=>'',
  ));

-  bratonien_tools_nc_wizard_refresh_directory_state($state, '');
+  bratonien_tools_nc_transport_refresh_directory_state($state, '');
  bratonien_tools_nc_wizard_store($state);

  return array('message'=>'Nextcloud und WebDAV wurden bestätigt. Jetzt können die Verzeichnisse des angemeldeten Benutzers ausgewählt werden.');
--- a/include/nc_legacy_reset.inc.php
+++ b/include/nc_legacy_reset.inc.php
@@ -0,0 +1,115 @@
+<?php
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die('Hacking attempt!');
+}
+
+function bratonien_tools_nc_legacy_remove_tree($path, $allowed_root)
+{
+  $path = rtrim(str_replace('\\', '/', (string)$path), '/');
+  $allowed_root = rtrim(str_replace('\\', '/', (string)$allowed_root), '/');
+  if ($path === '' || $allowed_root === '' || $path === $allowed_root || strpos($path, $allowed_root.'/') !== 0)
+  {
+    return 0;
+  }
+  if (!file_exists($path) && !is_link($path)) return 0;
+
+  if (is_link($path) || is_file($path))
+  {
+    return @unlink($path) ? 1 : 0;
+  }
+
+  $removed = 0;
+  $items = @scandir($path);
+  if (is_array($items))
+  {
+    foreach ($items as $item)
+    {
+      if ($item === '.' || $item === '..') continue;
+      $removed += bratonien_tools_nc_legacy_remove_tree($path.'/'.$item, $allowed_root);
+    }
+  }
+  if (@rmdir($path)) $removed++;
+  return $removed;
+}
+
+function bratonien_tools_nc_legacy_remove_state_files($state_root)
+{
+  $removed = 0;
+  foreach (glob(rtrim($state_root, '/').'/connection-*') ?: array() as $connection_dir)
+  {
+    if (!is_dir($connection_dir)) continue;
+    foreach (array('webdav-map.json', 'webdav-manifest.tsv', 'webdav-shadow-map.json') as $name)
+    {
+      $path = $connection_dir.'/'.$name;
+      if (is_file($path) && @unlink($path)) $removed++;
+    }
+  }
+  return $removed;
+}
+
+function bratonien_tools_nc_reset_legacy_imports()
+{
+  include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
+
+  $ids = array();
+  $result = pwg_query(
+    "SELECT id FROM ".IMAGES_TABLE.
+    " WHERE path LIKE '%nc-webdav-source/connection-%'"
+  );
+  while ($row = pwg_db_fetch_assoc($result))
+  {
+    $ids[] = (int)$row['id'];
+  }
+
+  if ($ids)
+  {
+    delete_elements($ids, false);
+  }
+
+  $data_root = rtrim(PHPWG_ROOT_PATH, '/').'/_data';
+  $tool_root = $data_root.'/bratonien-tools';
+  $removed_files = 0;
+  foreach (array(
+    $tool_root.'/nc-webdav-source',
+    $tool_root.'/nc-webdav-preview',
+    $tool_root.'/nc-webdav-gallery',
+  ) as $generated_root)
+  {
+    $removed_files += bratonien_tools_nc_legacy_remove_tree($generated_root, $data_root);
+  }
+
+  if (defined('PWG_DERIVATIVE_DIR'))
+  {
+    $derivative_root = rtrim(PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR, '/');
+    foreach (array(
+      $derivative_root.'/_data/bratonien-tools/nc-webdav-source',
+      $derivative_root.'/_data/bratonien-tools/nc-webdav-gallery',
+    ) as $generated_derivative_root)
+    {
+      $removed_files += bratonien_tools_nc_legacy_remove_tree($generated_derivative_root, $derivative_root);
+    }
+  }
+
+  $removed_state_files = bratonien_tools_nc_legacy_remove_state_files($tool_root.'/nc-connector-state');
+
+  if ($ids)
+  {
+    update_category('all');
+    invalidate_user_cache(true);
+  }
+
+  $result = array(
+    'timestamp'=>time(),
+    'removed_image_records'=>count($ids),
+    'removed_generated_entries'=>$removed_files,
+    'removed_state_files'=>$removed_state_files,
+  );
+
+  if (function_exists('conf_update_param'))
+  {
+    conf_update_param('bratonien_nc_legacy_reset_0977', json_encode($result));
+  }
+
+  return $result;
+}
--- a/include/nc_productive_ws.inc.php
+++ b/include/nc_productive_ws.inc.php
@@ -56,7 +56,6 @@ function bratonien_tools_nc_find_album($parent_id, $dir, $name, $excluded_site_i
 SELECT id, dir, name
  FROM '.CATEGORIES_TABLE.'
  WHERE '.$where_parent.'
-    AND (site_id IS NULL OR site_id <> '.(int)$excluded_site_id.')
    AND (
      dir = \''.$dir_sql.'\'
      OR LOWER(name) = LOWER(\''.$name_sql.'\')
@@ -122,10 +121,9 @@ function bratonien_tools_nc_managed_images($basedir)

 function bratonien_tools_nc_remove_storage_categories($site_id)
 {
-  $ids = query2array('SELECT id FROM '.CATEGORIES_TABLE.' WHERE site_id='.(int)$site_id.' AND dir IS NOT NULL', null, 'id');
-  if (!$ids) return 0;
-  delete_categories(array_map('intval', $ids));
-  return count($ids);
+  // Bestehende Piwigo-Alben gehoeren nicht automatisch dem Connector.
+  // Ohne eindeutige Connector-Eigentumsmarkierung darf hier nichts geloescht werden.
+  return 0;
 }

 function bratonien_tools_ws_nc_sync_productive($params, &$service)
@@ -169,8 +167,6 @@ function bratonien_tools_ws_nc_sync_productive($params, &$service)

  try
  {
-    $counts['removed_duplicate_categories'] = bratonien_tools_nc_remove_storage_categories($site_id);
-
    list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW()'));
    $fs_dirs = $site_reader->get_full_directories($basedir);
    usort($fs_dirs, function($a, $b)
@@ -199,20 +195,10 @@ function bratonien_tools_ws_nc_sync_productive($params, &$service)
    $db_elements = bratonien_tools_nc_managed_images($basedir);
    $db_by_path = array_flip($db_elements);

-    $to_delete = array();
-    foreach ($db_elements as $id=>$path)
-    {
-      if (!array_key_exists($path, $fs)) $to_delete[] = (int)$id;
-    }
-    if ($to_delete)
-    {
-      delete_elements($to_delete, false);
-      $counts['del_elements'] = count($to_delete);
-      foreach ($to_delete as $id)
-      {
-        if (isset($db_elements[$id])) unset($db_by_path[$db_elements[$id]], $db_elements[$id]);
-      }
-    }
+    // Nicht-destruktiver Schutz: Bestehende Piwigo-Bilder werden niemals allein
+    // deshalb geloescht, weil sie im aktuellen WebDAV-Scan nicht vorkommen.
+    // Das Entfernen ist erst wieder zulaessig, wenn Connector-Eigentum eindeutig
+    // und verbindungsbezogen gespeichert wird.

    $next_element_id = pwg_db_nextval('id', IMAGES_TABLE);
    $image_inserts = array();
@@ -232,13 +218,9 @@ function bratonien_tools_ws_nc_sync_productive($params, &$service)

      if (isset($db_by_path[$path]))
      {
-        $id = (int)$db_by_path[$path];
-        $all_ids[] = $id;
-        pwg_query('DELETE FROM '.IMAGE_CATEGORY_TABLE.' WHERE image_id='.$id);
-        if ($category_id !== null)
-        {
-          single_insert(IMAGE_CATEGORY_TABLE, array('image_id'=>$id, 'category_id'=>$category_id));
-        }
+        // Altbestand niemals umhaengen. Vorhandene Bild-Album-Zuordnungen bleiben
+        // exakt bestehen; der Connector darf nur neue Datensaetze ergaenzen.
+        $all_ids[] = (int)$db_by_path[$path];
        continue;
      }

@@ -276,8 +258,10 @@ function bratonien_tools_ws_nc_sync_productive($params, &$service)
      $counts['new_elements'] = count($new_ids);
    }

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

 function bratonien_tools_nc_connector_run_now()
 {
-  $result = bratonien_tools_nc_scheduler_spawn(true);
-  return array('message'=>(string)($result['message'] ?? 'NC-Abgleich wurde gestartet.'));
+  $connection_id = isset($_POST['connection_id']) ? max(0, (int)$_POST['connection_id']) : 0;
+  if ($connection_id > 0)
+  {
+    $connection = bratonien_tools_nc_connector_connection($connection_id, false);
+    if (!$connection)
+    {
+      throw new RuntimeException('Die ausgewählte Verbindung existiert nicht.');
+    }
+  }
+  $result = bratonien_tools_nc_scheduler_spawn(true, $connection_id);
+  return array('message'=>(string)($result['message'] ?? ($connection_id > 0 ? 'Abgleich wurde gestartet.' : 'Abgleich für alle Verbindungen wurde gestartet.')));
 }

 function bratonien_tools_get_tools()
@@ -74,7 +84,7 @@ function bratonien_tools_get_tools()
    '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_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_edit_start' => array('handler' => 'bratonien_tools_nc_transport_edit_start'),
    'nc_connector_update_local' => array('handler' => 'bratonien_tools_nc_connector_update_local_friendly'),
    'nc_connector_delete' => array('handler' => 'bratonien_tools_nc_connector_delete_safe'),
    'nc_connector_update_name' => array('handler' => 'bratonien_tools_nc_connector_update_name'),
@@ -82,7 +92,7 @@ function bratonien_tools_get_tools()
    'nc_connector_run_now' => array('handler' => 'bratonien_tools_nc_connector_run_now'),
    'nc_connector_wizard_scan' => array('handler' => 'bratonien_tools_nc_wizard_scan_webdav_first'),
    'nc_connector_wizard_save_technical' => array('handler' => 'bratonien_tools_nc_wizard_save_technical_flow'),
-    'nc_connector_wizard_directory_browse' => array('handler' => 'bratonien_tools_nc_wizard_directory_browse'),
+    'nc_connector_wizard_directory_browse' => array('handler' => 'bratonien_tools_nc_transport_wizard_directory_browse'),
    'nc_connector_wizard_directory_add' => array('handler' => 'bratonien_tools_nc_wizard_directory_add'),
    'nc_connector_wizard_directory_remove' => array('handler' => 'bratonien_tools_nc_wizard_directory_remove'),
    'nc_connector_wizard_save_mounts' => array('handler' => 'bratonien_tools_nc_wizard_save_sources_dispatch'),
--- a/include/watermark_engine.inc.php
+++ b/include/watermark_engine.inc.php
@@ -8,12 +8,22 @@ require_once(BRATONIEN_TOOLS_PATH . 'include/watermark_base.inc.php');

 function bratonien_tools_watermark_engine_enabled()
 {
+  static $initialized = false;
+  static $enabled = false;
+
+  if ($initialized)
+  {
+    return $enabled;
+  }
+
  $config = bratonien_tools_get_watermark_engine_config();
  $enabled = !empty($config['enabled']);
+  $initialized = true;

  // Piwigo recalculates use_watermark for custom derivatives from the native
  // watermark file itself. Therefore an active Bratonien engine must keep the
  // native watermark file empty, not only the stored use_watermark flags false.
+  // This initialization is required only once per PHP request.
  if ($enabled)
  {
    bratonien_tools_disable_piwigo_watermarks();
--- a/include/watermark_runtime.inc.php
+++ b/include/watermark_runtime.inc.php
@@ -27,6 +27,72 @@ function bratonien_tools_runtime_category_id()
  return 0;
 }

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

-  $rule = bratonien_tools_runtime_effective_rule(bratonien_tools_runtime_category_id());
+  $rule = bratonien_tools_runtime_effective_rule(bratonien_tools_runtime_derivative_category_id($src_image));
  if ($rule['mode'] !== 'profile' || empty($rule['profile_id']))
  {
    return $url;
--- a/include/webdav_image_runtime.inc.php
+++ b/include/webdav_image_runtime.inc.php
@@ -7,6 +7,9 @@ if (!defined('PHPWG_ROOT_PATH'))
 function bratonien_tools_webdav_image_source_info($image_id)
 {
  static $cache = array();
+  static $connection_cache = array();
+  static $mapping_cache = array();
+
  $image_id = (int)$image_id;
  if ($image_id < 1) return null;
  if (array_key_exists($image_id, $cache)) return $cache[$image_id];
@@ -20,12 +23,12 @@ function bratonien_tools_webdav_image_source_info($image_id)
  $absolute = $path;
  if (strpos($absolute, '/') !== 0)
  {
-    $absolute = PHPWG_ROOT_PATH.ltrim(preg_replace('#^\./#', '', $absolute), '/');
+    $absolute = PHPWG_ROOT_PATH.ltrim(preg_replace('#^\\./#', '', $absolute), '/');
  }
  $resolved = realpath($absolute);
  if ($resolved === false) return $cache[$image_id] = null;

-  $normalized = str_replace('\\', '/', $resolved);
+  $normalized = str_replace('\\\\', '/', $resolved);
  if (!preg_match('#/nc-webdav-source/connection-([0-9]+)/root-([0-9]+)/(.*)$#', $normalized, $match))
  {
    return $cache[$image_id] = null;
@@ -36,60 +39,82 @@ function bratonien_tools_webdav_image_source_info($image_id)
  $relative_path = trim((string)$match[3], '/');
  if ($relative_path === '') return $cache[$image_id] = null;

-  $table = defined('BRATONIEN_TOOLS_NC_CONNECTIONS_TABLE')
-    ? BRATONIEN_TOOLS_NC_CONNECTIONS_TABLE
-    : $GLOBALS['prefixeTable'].'bratonien_tools_nc_connections';
-  $connection_result = pwg_query('SELECT config_json FROM `'.$table.'` WHERE id='.$connection_id.' LIMIT 1');
-  if (!pwg_db_num_rows($connection_result)) return $cache[$image_id] = null;
-  $connection_row = pwg_db_fetch_assoc($connection_result);
-  $config = json_decode((string)$connection_row['config_json'], true);
+  if (!array_key_exists($connection_id, $connection_cache))
+  {
+    $table = defined('BRATONIEN_TOOLS_NC_CONNECTIONS_TABLE')
+      ? BRATONIEN_TOOLS_NC_CONNECTIONS_TABLE
+      : $GLOBALS['prefixeTable'].'bratonien_tools_nc_connections';
+    $connection_result = pwg_query('SELECT config_json FROM `'.$table.'` WHERE id='.$connection_id.' LIMIT 1');
+    if (!pwg_db_num_rows($connection_result))
+    {
+      $connection_cache[$connection_id] = null;
+    }
+    else
+    {
+      $connection_row = pwg_db_fetch_assoc($connection_result);
+      $decoded = json_decode((string)$connection_row['config_json'], true);
+      $connection_cache[$connection_id] = is_array($decoded) ? $decoded : null;
+    }
+  }
+
+  $config = $connection_cache[$connection_id];
  if (!is_array($config) || (string)($config['source_mode'] ?? '') !== 'webdav-placeholder')
  {
    return $cache[$image_id] = null;
  }

  $root_path = '';
+  $root_found = false;
  $roots = isset($config['roots']) && is_array($config['roots']) ? $config['roots'] : array();
  foreach ($roots as $root)
  {
    if ((int)($root['fileid'] ?? 0) === $root_fileid)
    {
      $root_path = trim((string)($root['webdav_path'] ?? ''), '/');
+      $root_found = true;
      break;
    }
  }
-  if ($root_path === '') return $cache[$image_id] = null;
+  if (!$root_found) return $cache[$image_id] = null;

-  $webdav_path = $root_path.'/'.$relative_path;
+  $root_is_base = $root_path === '';
+  $webdav_path = $root_is_base ? $relative_path : $root_path.'/'.$relative_path;
  $content_type = '';
  $size = 0;
  $etag = '';

-  $state_dir = rtrim((string)($config['state_dir'] ?? ''), '/');
-  if ($state_dir !== '')
+  if (!array_key_exists($connection_id, $mapping_cache))
  {
-    $mapping_file = $state_dir.'/webdav-map.json';
-    if (is_readable($mapping_file))
+    $mapping_cache[$connection_id] = array();
+    $state_dir = rtrim((string)($config['state_dir'] ?? ''), '/');
+    if ($state_dir !== '')
    {
-      $mapping = json_decode((string)file_get_contents($mapping_file), true);
-      if (is_array($mapping) && isset($mapping['files']) && is_array($mapping['files']))
+      $mapping_file = $state_dir.'/webdav-map.json';
+      if (is_readable($mapping_file))
      {
-        $entry = $mapping['files'][$resolved] ?? $mapping['files'][$normalized] ?? null;
-        if (is_array($entry) && (string)($entry['kind'] ?? '') === 'file')
+        $mapping = json_decode((string)file_get_contents($mapping_file), true);
+        if (is_array($mapping) && isset($mapping['files']) && is_array($mapping['files']))
        {
-          $webdav_path = trim((string)($entry['webdav_path'] ?? $webdav_path), '/');
-          $content_type = (string)($entry['content_type'] ?? '');
-          $size = (int)($entry['size'] ?? 0);
-          $etag = (string)($entry['etag'] ?? '');
+          $mapping_cache[$connection_id] = $mapping['files'];
        }
      }
    }
  }

+  $entry = $mapping_cache[$connection_id][$resolved] ?? $mapping_cache[$connection_id][$normalized] ?? null;
+  if (is_array($entry) && (string)($entry['kind'] ?? '') === 'file')
+  {
+    $webdav_path = trim((string)($entry['webdav_path'] ?? $webdav_path), '/');
+    $content_type = (string)($entry['content_type'] ?? '');
+    $size = (int)($entry['size'] ?? 0);
+    $etag = (string)($entry['etag'] ?? '');
+  }
+
  return $cache[$image_id] = array(
    'image_id'=>$image_id,
    'connection_id'=>$connection_id,
    'webdav_path'=>$webdav_path,
+    'root_is_base'=>$root_is_base,
    'content_type'=>$content_type,
    'size'=>$size,
    'etag'=>$etag,
@@ -412,8 +437,16 @@ function bratonien_tools_filter_webdav_src_url($url, $src_image)
 function bratonien_tools_filter_webdav_derivative_url($url, $params, $src_image, $rel_url)
 {
  if (!is_object($src_image) || empty($src_image->id)) return $url;
-  $info = bratonien_tools_webdav_image_source_info((int)$src_image->id);
-  if (!$info) return $url;
+
+  // Hotpath: Bei einem bereits vorbereiteten WebDAV-Derivat keinerlei
+  // Connection-DB oder Mapping-Datei mehr anfassen. Der reale Quellpfad
+  // reicht aus, um Connector-Bilder sicher zu erkennen.
+  $source_path = $src_image->get_path();
+  $resolved_source = $source_path !== '' ? realpath($source_path) : false;
+  if ($resolved_source === false || !preg_match('#/nc-webdav-source/connection-[0-9]+/root-[0-9]+/#', str_replace('\\\\', '/', $resolved_source)))
+  {
+    return $url;
+  }

  try
  {
--- a/main.inc.php
+++ b/main.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: Bratonien Tools
-Version: 0.9.6.30
+Version: 0.9.7.16
 Description: Erweiterbare Administrationswerkzeuge fuer die Bratonien-Piwigo-Installation.
 Plugin URI: https://github.com/Terranom674/Piwigo_Bratonien_Tools
 Author: Bratonien
@@ -27,16 +27,16 @@ require_once(BRATONIEN_TOOLS_PATH . 'include/nc_productive_ws.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_scheduler.inc.php');

 add_event_handler('get_admin_plugin_menu_links', 'bratonien_tools_admin_menu');
+add_event_handler('loc_end_index_category_thumbnails', 'bratonien_tools_watermark_prepare_album_overview');
 add_event_handler('get_derivative_url', 'bratonien_tools_filter_derivative_url', EVENT_HANDLER_PRIORITY_NEUTRAL, 4);
 add_event_handler('get_src_image_url', 'bratonien_tools_filter_webdav_src_url', EVENT_HANDLER_PRIORITY_NEUTRAL + 50, 2);
-add_event_handler('get_derivative_url', 'bratonien_tools_filter_webdav_derivative_url', EVENT_HANDLER_PRIORITY_NEUTRAL + 50, 4);
 add_event_handler('loc_end_element_set_global', 'bratonien_tools_batch_titles_register_action');
 add_event_handler('element_set_global_action', 'bratonien_tools_batch_titles_apply', EVENT_HANDLER_PRIORITY_NEUTRAL, 2);
+add_event_handler('init', 'bratonien_tools_watermark_cache_upgrade', EVENT_HANDLER_PRIORITY_NEUTRAL - 40);
 add_event_handler('init', 'bratonien_tools_prepare_connector_private_import', EVENT_HANDLER_PRIORITY_NEUTRAL - 30);
 add_event_handler('init', 'bratonien_tools_prepare_private_album_permissions', EVENT_HANDLER_PRIORITY_NEUTRAL - 20);
 add_event_handler('init', 'bratonien_tools_preserve_private_album_access', EVENT_HANDLER_PRIORITY_NEUTRAL - 10);
 add_event_handler('init', 'bratonien_tools_album_shares_init');
-add_event_handler('init', 'bratonien_tools_nc_scheduler_tick', EVENT_HANDLER_PRIORITY_NEUTRAL + 100);
 add_event_handler('delete_categories', 'bratonien_tools_album_shares_on_delete_categories');
 add_event_handler('ws_add_methods', 'bratonien_tools_register_ws_methods');
 add_event_handler('ws_add_methods', 'bratonien_tools_register_nc_orphan_ws_methods');
--- a/maintain.class.php
+++ b/maintain.class.php
@@ -9,6 +9,7 @@ require_once(dirname(__FILE__) . '/include/database.class.php');
 require_once(dirname(__FILE__) . '/tools/watermark_profiles.inc.php');
 require_once(dirname(__FILE__) . '/include/dependencies.inc.php');
 require_once(dirname(__FILE__) . '/include/nc_connector_scheduler.inc.php');
+require_once(dirname(__FILE__) . '/include/nc_legacy_reset.inc.php');

 class bratonien_tools_maintain extends PluginMaintain
 {
@@ -51,6 +52,18 @@ class bratonien_tools_maintain extends PluginMaintain
  public function update($old_version, $new_version, &$errors = array())
  {
    $this->prepare($errors);
+
+    if (version_compare((string)$old_version, '0.9.7.7', '<') && version_compare((string)$new_version, '0.9.7.7', '>='))
+    {
+      try
+      {
+        bratonien_tools_nc_reset_legacy_imports();
+      }
+      catch (Throwable $e)
+      {
+        $errors[] = 'Connector-Altbestand konnte nicht vollständig bereinigt werden: '.$e->getMessage();
+      }
+    }
  }

  public function uninstall()
--- a/runtime/build-webdav-media.sh
+++ b/runtime/build-webdav-media.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
+umask 0002

 CONFIG_FILE="${PIWIGO_CONFIG:-}"
 [[ -n "$CONFIG_FILE" && -r "$CONFIG_FILE" ]] || { echo "WebDAV-Konfiguration fehlt: ${CONFIG_FILE:-<leer>}" >&2; exit 1; }
@@ -22,6 +23,38 @@ exec 9>"$LOCK_FILE"
 flock -n 9 || exit 0

 PREVIEW_CACHE="$PIWIGO_ROOT/_data/bratonien-tools/nc-webdav-preview/connection-$CONNECTION_ID"
+SOURCE_CACHE="$PIWIGO_ROOT/_data/bratonien-tools/nc-webdav-gallery/connection-$CONNECTION_ID"
+DERIVATIVE_CACHE="$PIWIGO_ROOT/_data/i/_data/bratonien-tools/nc-webdav-gallery/connection-$CONNECTION_ID"
+PIWIGO_DATA="$PIWIGO_ROOT/_data"
+
+normalize_connector_cache_permissions() {
+    [[ -d "$PIWIGO_DATA" ]] || return 0
+
+    local data_uid data_gid current_uid path
+    data_uid="$(stat -c '%u' "$PIWIGO_DATA")"
+    data_gid="$(stat -c '%g' "$PIWIGO_DATA")"
+    current_uid="$(id -u)"
+
+    for path in "$SOURCE_CACHE" "$PREVIEW_CACHE" "$DERIVATIVE_CACHE"; do
+        [[ -e "$path" ]] || continue
+
+        if [[ "$current_uid" -eq 0 ]]; then
+            chown -R "$data_uid:$data_gid" -- "$path"
+        fi
+
+        if ! find "$path" -type d -exec chmod 2775 {} + 2>/dev/null; then
+            echo "Hinweis: Verzeichnisrechte konnten ohne Root-Rechte nicht vollständig repariert werden: $path" >&2
+        fi
+        if ! find "$path" -type f -exec chmod 0664 {} + 2>/dev/null; then
+            echo "Hinweis: Dateirechte konnten ohne Root-Rechte nicht vollständig repariert werden: $path" >&2
+        fi
+    done
+}
+
+# Altbestände aus früheren root/systemd-Läufen werden repariert, sobald dieser
+# Lauf mit ausreichenden Rechten ausgeführt wird. Bei normalen Webserver-Läufen
+# werden zumindest alle eigenen Dateien gruppenschreibbar gehalten.
+normalize_connector_cache_permissions

 php "$SCRIPT_DIR/lib/precache-webdav-previews.php" \
    --mapping="$WEBDAV_MAPPING_FILE" \
@@ -33,3 +66,5 @@ php "$SCRIPT_DIR/lib/precache-webdav-previews.php" \
 php "$SCRIPT_DIR/lib/build-webdav-derivatives.php" \
    --piwigo-root="$PIWIGO_ROOT" \
    --connection-id="$CONNECTION_ID"
+
+normalize_connector_cache_permissions
--- a/runtime/lib/build-webdav-derivatives.php
+++ b/runtime/lib/build-webdav-derivatives.php
@@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli')
  exit(1);
 }

-const BRATONIEN_WEBDAV_DERIVATIVE_BUILDER_VERSION = '0.9.6.1';
+const BRATONIEN_WEBDAV_DERIVATIVE_BUILDER_VERSION = '0.9.7.8';

 $options = getopt('', array('piwigo-root:', 'connection-id:'));
 $piwigo_root = rtrim((string)($options['piwigo-root'] ?? ''), '/');
@@ -46,20 +46,84 @@ if (!function_exists('bratonien_tools_webdav_image_source_info') || !function_ex
  exit(1);
 }

+function bratonien_tools_webdav_modus_config()
+{
+  global $conf;
+
+  $modus = $conf['modus_theme'] ?? array();
+  if (is_string($modus) && $modus !== '')
+  {
+    $decoded = @unserialize($modus);
+    if (is_array($decoded)) $modus = $decoded;
+  }
+  if (!is_array($modus)) $modus = array();
+
+  return array_merge(
+    array(
+      'index_photo_deriv'=>'2small',
+      'index_photo_deriv_hdpi'=>'xsmall',
+    ),
+    $modus
+  );
+}
+
+function bratonien_tools_webdav_gallery_base_params()
+{
+  $modus = bratonien_tools_webdav_modus_config();
+  $type = trim((string)($modus['index_photo_deriv'] ?? '2small'));
+  $params = $type !== '' ? @ImageStdParams::get_by_type($type) : null;
+  if ($params) return $params;
+
+  $params = ImageStdParams::get_by_type(IMG_THUMB);
+  if (!$params)
+  {
+    throw new RuntimeException('Piwigo-Galeriederivat ist nicht konfiguriert.');
+  }
+  return $params;
+}
+
+function bratonien_tools_webdav_modus_gallery_params(SrcImage $src, $base_params)
+{
+  $row_height = (int)$base_params->max_height();
+  $candidates = array($base_params);
+
+  foreach (ImageStdParams::get_defined_type_map() as $params)
+  {
+    if (
+      $params->max_height() > $row_height
+      && $params->sizing->max_crop == $base_params->sizing->max_crop
+    )
+    {
+      $candidates[] = $params;
+      if (count($candidates) === 3) break;
+    }
+  }
+
+  $selected = $base_params;
+  foreach ($candidates as $params)
+  {
+    $selected = $params;
+    $probe = new DerivativeImage($params, $src);
+    $size = $probe->get_size();
+    if ((int)$size[1] >= $row_height - 2) break;
+  }
+
+  return $selected;
+}
+
 try
 {
-  $variants = bratonien_tools_webdav_derivative_variants();
-  if (!$variants)
-  {
-    throw new RuntimeException('Keine Piwigo-Derivate konfiguriert.');
-  }
+  $gallery_base_params = bratonien_tools_webdav_gallery_base_params();
+  $gallery_base_type = (string)$gallery_base_params->type;

  $images = 0;
  $generated_or_ready = 0;
  $identity = 0;
  $metadata_repaired = 0;
+  $legacy_derivatives_rebuilt = 0;
  $errors = 0;
  $error_lines = array();
+  $variant_counts = array();

  $result = pwg_query('SELECT * FROM '.IMAGES_TABLE.' ORDER BY id');
  while ($row = pwg_db_fetch_assoc($result))
@@ -109,34 +173,59 @@ try
    }

    $src = new SrcImage($row);
-    foreach ($variants as $variant_name => $params)
+    try
    {
-      try
-      {
-        $probe = new DerivativeImage($params, $src);
-        if ($probe->same_as_source())
-        {
-          $identity++;
-          continue;
-        }
+      $gallery_params = bratonien_tools_webdav_modus_gallery_params($src, $gallery_base_params);
+      $variant = (string)$gallery_params->type;
+      if ($variant === '') $variant = 'custom';
+      $variant_counts[$variant] = ($variant_counts[$variant] ?? 0) + 1;

-        $detail = '';
-        if (bratonien_tools_webdav_generate_derivative($params, $src, $detail))
+      $probe = new DerivativeImage($gallery_params, $src);
+      if ($probe->same_as_source())
+      {
+        $identity++;
+        continue;
+      }
+
+      $target = $probe->get_path();
+      if ($target !== '' && is_file($target) && is_readable($target))
+      {
+        $expected_size = $gallery_params->compute_final_size(array($preview_width, $preview_height));
+        $existing_size = @getimagesize($target);
+        if (
+          is_array($expected_size)
+          && isset($expected_size[0], $expected_size[1])
+          && is_array($existing_size)
+          && isset($existing_size[0], $existing_size[1])
+          && ((int)$existing_size[0] !== (int)$expected_size[0] || (int)$existing_size[1] !== (int)$expected_size[1])
+        )
        {
-          $generated_or_ready++;
-        }
-        else
-        {
-          $errors++;
-          $error_lines[] = 'Bild #'.$image_id.' '.$variant_name.': '.($detail !== '' ? $detail : 'Derivat konnte nicht erzeugt werden.');
+          if (!@unlink($target))
+          {
+            $errors++;
+            $error_lines[] = 'Bild #'.$image_id.' Galerie: falsches Alt-Derivat konnte nicht entfernt werden: '.$target;
+            continue;
+          }
+          $legacy_derivatives_rebuilt++;
        }
      }
-      catch (Throwable $e)
+
+      $detail = '';
+      if (bratonien_tools_webdav_generate_derivative($gallery_params, $src, $detail))
+      {
+        $generated_or_ready++;
+      }
+      else
      {
        $errors++;
-        $error_lines[] = 'Bild #'.$image_id.' '.$variant_name.': '.get_class($e).': '.$e->getMessage();
+        $error_lines[] = 'Bild #'.$image_id.' Galerie: '.($detail !== '' ? $detail : 'Galeriederivat konnte nicht erzeugt werden.');
      }
    }
+    catch (Throwable $e)
+    {
+      $errors++;
+      $error_lines[] = 'Bild #'.$image_id.' Galerie: '.get_class($e).': '.$e->getMessage();
+    }
  }

  if ($metadata_repaired > 0)
@@ -157,12 +246,22 @@ try
    }
  }

+  ksort($variant_counts);
+  $variant_parts = array();
+  foreach ($variant_counts as $type=>$count)
+  {
+    $variant_parts[] = $type.':'.$count;
+  }
+
  echo 'WebDAV-Derivative-Builder: version='.BRATONIEN_WEBDAV_DERIVATIVE_BUILDER_VERSION.
    ' bilder='.$images.
-    ' varianten='.count($variants).
+    ' varianten_pro_bild=1'.
+    ' modus_basis='.$gallery_base_type.
+    ' modus_varianten='.implode(',', $variant_parts).
    ' bereit='.$generated_or_ready.
    ' identisch='.$identity.
    ' metadaten_repariert='.$metadata_repaired.
+    ' alt_derivate_neu='.$legacy_derivatives_rebuilt.
    ' fehler='.$errors."\n";

  exit($errors > 0 ? 1 : 0);
--- a/runtime/lib/build_webdav_placeholder_source.py
+++ b/runtime/lib/build_webdav_placeholder_source.py
@@ -14,6 +14,7 @@ import getpass
 import json
 import os
 import shutil
+import socket
 import ssl
 import sys
 import tempfile
@@ -21,6 +22,7 @@ import urllib.error
 import urllib.parse
 import urllib.request
 import xml.etree.ElementTree as ET
+from contextlib import contextmanager
 from pathlib import Path, PurePosixPath

 DAV = "DAV:"
@@ -52,9 +54,37 @@ def safe_local_name(name: str) -> str:
    return name


+@contextmanager
+def pinned_resolution(host: str, ip: str):
+    host = host.strip("[]").lower()
+    ip = ip.strip("[]")
+    if not host or not ip or host == ip:
+        yield
+        return
+
+    original = socket.getaddrinfo
+
+    def resolve(name, port, family=0, type=0, proto=0, flags=0):
+        normalized = str(name).strip("[]").lower()
+        if normalized == host:
+            return original(ip, port, family, type, proto, flags)
+        return original(name, port, family, type, proto, flags)
+
+    socket.getaddrinfo = resolve
+    try:
+        yield
+    finally:
+        socket.getaddrinfo = original
+
+
 class WebDavClient:
-    def __init__(self, base_url: str, user: str, password: str, timeout: int = 30) -> None:
+    def __init__(self, base_url: str, user: str, password: str, timeout: int = 30, connect_ip: str = "") -> None:
        self.base_url = base_url.rstrip("/")
+        parsed = urllib.parse.urlparse(self.base_url)
+        if parsed.scheme not in {"http", "https"} or not parsed.hostname:
+            fail("Nextcloud base URL must use HTTP or HTTPS and contain a host")
+        self.host = parsed.hostname.strip("[]")
+        self.connect_ip = connect_ip.strip("[]") or self.host
        self.user = user
        self.password = password
        self.timeout = timeout
@@ -84,9 +114,10 @@ class WebDavClient:
        request.add_header("Depth", "1")
        request.add_header("Content-Type", "application/xml; charset=utf-8")
        try:
-            with urllib.request.urlopen(request, timeout=self.timeout, context=self.context) as response:
-                status = response.status
-                payload = response.read()
+            with pinned_resolution(self.host, self.connect_ip):
+                with urllib.request.urlopen(request, timeout=self.timeout, context=self.context) as response:
+                    status = response.status
+                    payload = response.read()
        except urllib.error.HTTPError as error:
            if error.code in {401, 403}:
                fail("Nextcloud rejected the WebDAV credentials or directory access")
@@ -96,14 +127,14 @@ class WebDavClient:
        if status != 207:
            fail(f"Nextcloud PROPFIND returned HTTP {status}")

+        base_path = urllib.parse.unquote(urllib.parse.urlparse(url).path).rstrip("/")
+        current: dict[str, object] | None = None
+        children: list[dict[str, object]] = []
        try:
            root = ET.fromstring(payload)
        except ET.ParseError as error:
            raise RuntimeError("Nextcloud returned invalid WebDAV XML") from error

-        base_path = urllib.parse.unquote(urllib.parse.urlparse(url).path).rstrip("/")
-        current: dict[str, object] | None = None
-        children: list[dict[str, object]] = []
        for response in root.findall(f"{{{DAV}}}response"):
            href = response.findtext(f"{{{DAV}}}href", default="")
            href_path = urllib.parse.unquote(urllib.parse.urlparse(href).path).rstrip("/")
@@ -213,6 +244,7 @@ def atomic_text(path: Path, text: str) -> None:
 def main() -> int:
    parser = argparse.ArgumentParser()
    parser.add_argument("--base-url", required=True)
+    parser.add_argument("--connect-ip", default="", help="IP address used for the TCP connection while preserving the URL host for HTTP Host and TLS SNI")
    parser.add_argument("--user", required=True)
    parser.add_argument("--password-file", type=Path)
    parser.add_argument("--root", action="append", required=True, help="WebDAV path relative to the authenticated user's files root")
@@ -241,7 +273,7 @@ def main() -> int:
            shutil.rmtree(staging)
        staging.mkdir(parents=True)

-        client = WebDavClient(args.base_url, args.user, password, max(1, args.timeout))
+        client = WebDavClient(args.base_url, args.user, password, max(1, args.timeout), args.connect_ip)
        mapping: dict[str, dict[str, object]] = {}
        manifest: list[str] = []
        total_files = total_folders = total_skipped = 0
@@ -303,6 +335,7 @@ def main() -> int:
        atomic_json(args.mapping, {
            "version": 1,
            "base_url": args.base_url.rstrip("/"),
+            "connect_ip": client.connect_ip,
            "user": args.user,
            "files": final_mapping,
        })
@@ -311,6 +344,7 @@ def main() -> int:
            "files": total_files,
            "folders": total_folders,
            "skipped": total_skipped,
+            "connect_ip": client.connect_ip,
            "source_dir": str(source_dir),
            "manifest": str(args.manifest),
            "mapping": str(args.mapping),
--- a/runtime/lib/precache-webdav-previews.php
+++ b/runtime/lib/precache-webdav-previews.php
@@ -6,6 +6,8 @@ if (PHP_SAPI !== 'cli')
  exit(1);
 }

+require_once(dirname(__DIR__, 2).'/include/nc_transport.inc.php');
+
 const BRATONIEN_WEBDAV_PREVIEW_VERSION = 2;
 const BRATONIEN_WEBDAV_PREVIEW_MAX_EDGE = 4096;
 const BRATONIEN_WEBDAV_PREVIEW_JPEG_QUALITY = 88;
@@ -24,7 +26,7 @@ function quote_webdav_path($path)
 function fetch_remote_blob($url, $user, $password)
 {
  $ch = curl_init($url);
-  curl_setopt_array($ch, array(
+  $options = array(
    CURLOPT_RETURNTRANSFER => true,
    CURLOPT_FOLLOWLOCATION => false,
    CURLOPT_CONNECTTIMEOUT => 10,
@@ -32,8 +34,10 @@ function fetch_remote_blob($url, $user, $password)
    CURLOPT_HTTPAUTH => CURLAUTH_BASIC,
    CURLOPT_USERPWD => $user.':'.$password,
    CURLOPT_FAILONERROR => false,
-    CURLOPT_USERAGENT => 'Bratonien-Tools-WebDAV-Precache/0.9.6.1',
-  ));
+    CURLOPT_USERAGENT => 'Bratonien-Tools-WebDAV-Precache/0.9.7.16',
+  );
+  bratonien_tools_nc_transport_apply_curl($options, $url);
+  curl_setopt_array($ch, $options);
  $body = curl_exec($ch);
  $errno = curl_errno($ch);
  $error = curl_error($ch);
@@ -48,12 +52,11 @@ function fetch_remote_blob($url, $user, $password)

 function preview_extension_for_entry(array $entry)
 {
-  $content_type = strtolower(trim((string)($entry['content_type'] ?? '')));
  $path = strtolower((string)($entry['webdav_path'] ?? ''));
-  if ($content_type === 'image/png' || preg_match('/\.png$/', $path))
-  {
-    return 'png';
-  }
+  $extension = strtolower(pathinfo($path, PATHINFO_EXTENSION));
+  if ($extension === 'png') return 'png';
+  if ($extension === 'gif') return 'gif';
+  if ($extension === 'webp') return 'webp';
  return 'jpg';
 }

@@ -64,7 +67,7 @@ function preview_target_for_entry($cache_dir, $key, array $entry)

 function remove_other_preview_format($cache_dir, $key, $keep_target)
 {
-  foreach (array('jpg', 'png', 'webp') as $ext)
+  foreach (array('jpg', 'png', 'gif', 'webp') as $ext)
  {
    $candidate = $cache_dir.'/'.$key.'.'.$ext;
    if ($candidate !== $keep_target && is_file($candidate)) @unlink($candidate);
@@ -86,13 +89,19 @@ function write_preview_imagick($blob, $target, $extension)
    {
      $image->setImageFormat('png');
    }
+    elseif ($extension === 'gif')
+    {
+      $image->setImageFormat('gif');
+    }
+    elseif ($extension === 'webp')
+    {
+      $image->setImageFormat('webp');
+      $image->setImageCompressionQuality(BRATONIEN_WEBDAV_PREVIEW_JPEG_QUALITY);
+    }
    else
    {
      $image->setImageBackgroundColor('white');
-      if (method_exists($image, 'mergeImageLayers'))
-      {
-        $image = $image->mergeImageLayers(Imagick::LAYERMETHOD_FLATTEN);
-      }
+      if (method_exists($image, 'mergeImageLayers')) $image = $image->mergeImageLayers(Imagick::LAYERMETHOD_FLATTEN);
      $image->setImageFormat('jpeg');
      $image->setImageCompression(Imagick::COMPRESSION_JPEG);
      $image->setImageCompressionQuality(BRATONIEN_WEBDAV_PREVIEW_JPEG_QUALITY);
@@ -127,7 +136,7 @@ function write_preview_gd($blob, $target, $extension)

    try
    {
-      if ($extension === 'png')
+      if (in_array($extension, array('png', 'gif', 'webp'), true))
      {
        imagealphablending($preview, false);
        imagesavealpha($preview, true);
@@ -145,10 +154,12 @@ function write_preview_gd($blob, $target, $extension)
        fail_preview('GD konnte das Preview nicht skalieren.');
      }

-      $written = $extension === 'png'
-        ? imagepng($preview, $target, 6)
-        : imagejpeg($preview, $target, BRATONIEN_WEBDAV_PREVIEW_JPEG_QUALITY);
-      if (!$written) fail_preview('GD konnte das Preview nicht schreiben.');
+      if ($extension === 'png') $written = imagepng($preview, $target, 6);
+      elseif ($extension === 'gif') $written = function_exists('imagegif') ? imagegif($preview, $target) : false;
+      elseif ($extension === 'webp') $written = function_exists('imagewebp') ? imagewebp($preview, $target, BRATONIEN_WEBDAV_PREVIEW_JPEG_QUALITY) : false;
+      else $written = imagejpeg($preview, $target, BRATONIEN_WEBDAV_PREVIEW_JPEG_QUALITY);
+
+      if (!$written) fail_preview('GD konnte das Preview im Format '.$extension.' nicht schreiben.');
    }
    finally
    {
@@ -164,7 +175,7 @@ function write_preview_gd($blob, $target, $extension)
 function write_preview($blob, $target, $extension)
 {
  $dir = dirname($target);
-  if (!is_dir($dir) && !mkdir($dir, 0755, true) && !is_dir($dir)) fail_preview('Preview-Verzeichnis konnte nicht angelegt werden.');
+  if (!is_dir($dir) && !mkdir($dir, 0775, true) && !is_dir($dir)) fail_preview('Preview-Verzeichnis konnte nicht angelegt werden.');

  if (class_exists('Imagick'))
  {
@@ -186,7 +197,48 @@ function write_preview($blob, $target, $extension)
    @unlink($target);
    fail_preview('Das erzeugte Preview ist ungültig.');
  }
-  @chmod($target, 0644);
+  @chmod($target, 0664);
+}
+
+function local_source_is_hydrated($source_path, $preview)
+{
+  if (!is_file($source_path) || !is_readable($source_path)) return false;
+  $source_size = @getimagesize($source_path);
+  $preview_size = @getimagesize($preview);
+  if (!is_array($source_size) || !is_array($preview_size)) return false;
+  if ((int)$source_size[0] !== (int)$preview_size[0] || (int)$source_size[1] !== (int)$preview_size[1]) return false;
+  $source_bytes = @filesize($source_path);
+  $preview_bytes = @filesize($preview);
+  return $source_bytes !== false && $preview_bytes !== false && (int)$source_bytes === (int)$preview_bytes;
+}
+
+function hydrate_local_source($source_path, $preview)
+{
+  $normalized = str_replace('\\', '/', (string)$source_path);
+  if (!preg_match('#/nc-webdav-source/connection-[0-9]+/root-[0-9]+/#', $normalized))
+  {
+    fail_preview('Unsicherer lokaler Connector-Quellpfad: '.$source_path);
+  }
+  if (!is_file($preview) || !is_readable($preview)) fail_preview('Preview für lokale Quelle fehlt: '.$preview);
+  if (local_source_is_hydrated($source_path, $preview)) return false;
+
+  $dir = dirname($source_path);
+  if (!is_dir($dir) && !mkdir($dir, 0775, true) && !is_dir($dir)) fail_preview('Lokales Connector-Verzeichnis konnte nicht angelegt werden: '.$dir);
+
+  $tmp = $source_path.'.bratonien-next-'.getmypid();
+  if (!@copy($preview, $tmp)) fail_preview('Preview konnte nicht in lokale Piwigo-Quelle kopiert werden: '.$source_path);
+  @chmod($tmp, 0664);
+  $mtime = @filemtime($preview);
+  if ($mtime) @touch($tmp, $mtime);
+  if (!@rename($tmp, $source_path))
+  {
+    @unlink($tmp);
+    fail_preview('Lokale Piwigo-Quelle konnte nicht ersetzt werden: '.$source_path);
+  }
+  clearstatcache(true, $source_path);
+  $size = @getimagesize($source_path);
+  if (!is_array($size) || empty($size[0]) || empty($size[1])) fail_preview('Lokale Piwigo-Quelle ist nach dem Ersetzen ungültig: '.$source_path);
+  return true;
 }

 try
@@ -208,8 +260,8 @@ try
  $mapping = json_decode((string)file_get_contents($mapping_file), true);
  if (!is_array($mapping) || !isset($mapping['files']) || !is_array($mapping['files'])) fail_preview('WebDAV-Mapping ist ungültig.');

-  if (!is_dir($cache_dir) && !mkdir($cache_dir, 0755, true) && !is_dir($cache_dir)) fail_preview('Preview-Cache konnte nicht angelegt werden.');
-  @chmod($cache_dir, 0755);
+  if (!is_dir($cache_dir) && !mkdir($cache_dir, 0775, true) && !is_dir($cache_dir)) fail_preview('Preview-Cache konnte nicht angelegt werden.');
+  @chmod($cache_dir, 2775);

  $state_file = $cache_dir.'/state.json';
  $old_state = array();
@@ -222,9 +274,10 @@ try
  $new_state = array();
  $generated = 0;
  $cached = 0;
+  $hydrated = 0;
  $errors = 0;

-  foreach ($mapping['files'] as $entry)
+  foreach ($mapping['files'] as $local_path=>$entry)
  {
    if (!is_array($entry) || (string)($entry['kind'] ?? '') !== 'file') continue;
    $webdav_path = trim((string)($entry['webdav_path'] ?? ''), '/');
@@ -241,26 +294,29 @@ try
      'version' => BRATONIEN_WEBDAV_PREVIEW_VERSION,
    );

-    $old = $old_state[$key] ?? null;
-    if (
-      is_file($target)
-      && is_array($old)
-      && (string)($old['etag'] ?? '') === $etag
-      && (string)($old['format'] ?? '') === $extension
-      && (int)($old['version'] ?? 0) === BRATONIEN_WEBDAV_PREVIEW_VERSION
-    )
-    {
-      $cached++;
-      continue;
-    }
-
    try
    {
-      $url = $base_url.'/remote.php/dav/files/'.rawurlencode($user).'/'.quote_webdav_path($webdav_path);
-      $blob = fetch_remote_blob($url, $user, $password);
-      write_preview($blob, $target, $extension);
-      remove_other_preview_format($cache_dir, $key, $target);
-      $generated++;
+      $old = $old_state[$key] ?? null;
+      $valid_cached = is_file($target)
+        && is_array($old)
+        && (string)($old['etag'] ?? '') === $etag
+        && (string)($old['format'] ?? '') === $extension
+        && (int)($old['version'] ?? 0) === BRATONIEN_WEBDAV_PREVIEW_VERSION;
+
+      if (!$valid_cached)
+      {
+        $url = $base_url.'/remote.php/dav/files/'.rawurlencode($user).'/'.quote_webdav_path($webdav_path);
+        $blob = fetch_remote_blob($url, $user, $password);
+        write_preview($blob, $target, $extension);
+        remove_other_preview_format($cache_dir, $key, $target);
+        $generated++;
+      }
+      else
+      {
+        $cached++;
+      }
+
+      if (hydrate_local_source((string)$local_path, $target)) $hydrated++;
    }
    catch (Throwable $e)
    {
@@ -273,14 +329,14 @@ try
  {
    if (!is_file($file) || basename($file) === 'state.json') continue;
    $name = basename($file);
-    if (!preg_match('/^([a-f0-9]{40})\.(jpg|png|webp)$/', $name, $m)) continue;
+    if (!preg_match('/^([a-f0-9]{40})\.(jpg|png|gif|webp)$/', $name, $m)) continue;
    if (!isset($new_state[$m[1]])) @unlink($file);
  }

  file_put_contents($state_file, json_encode($new_state, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT)."\n", LOCK_EX);
-  @chmod($state_file, 0644);
+  @chmod($state_file, 0664);

-  echo 'WebDAV-Previews: erzeugt='.$generated.' vorhanden='.$cached.' fehler='.$errors."\n";
+  echo 'WebDAV-Previews: erzeugt='.$generated.' vorhanden='.$cached.' lokale_quellen='.$hydrated.' fehler='.$errors."\n";
  exit($errors > 0 ? 1 : 0);
 }
 catch (Throwable $e)
--- a/runtime/lib/resolve-nextcloud-target.php
+++ b/runtime/lib/resolve-nextcloud-target.php
@@ -0,0 +1,24 @@
+#!/usr/bin/env php
+<?php
+if (PHP_SAPI !== 'cli')
+{
+  fwrite(STDERR, "CLI only\n");
+  exit(1);
+}
+
+require_once(dirname(__DIR__, 2).'/include/nc_transport.inc.php');
+
+try
+{
+  if ($argc !== 2) throw new RuntimeException('Aufruf: resolve-nextcloud-target.php <nextcloud-url>');
+  $url = rtrim(trim((string)$argv[1]), '/');
+  bratonien_tools_nc_transport_scheme($url);
+  $host = bratonien_tools_nc_transport_host($url);
+  echo bratonien_tools_nc_transport_public_ip($host)."\n";
+  exit(0);
+}
+catch (Throwable $e)
+{
+  fwrite(STDERR, $e->getMessage()."\n");
+  exit(1);
+}
--- a/runtime/native-runner.php
+++ b/runtime/native-runner.php
@@ -6,6 +6,9 @@ if (PHP_SAPI !== 'cli')
  exit(1);
 }

+$options = getopt('', array('connection-id::'));
+$connectionId = isset($options['connection-id']) ? (int)$options['connection-id'] : 0;
+
 $pluginRoot = dirname(__DIR__);
 $piwigoRoot = dirname($pluginRoot, 2);
 $base = rtrim($piwigoRoot, '/').'/_data/bratonien-tools';
@@ -44,9 +47,10 @@ $state = native_scheduler_state($stateFile);
 $state['enabled'] = true;
 $state['mode'] = 'piwigo-native';
 $state['state'] = 'running';
-$state['message'] = 'NC-Abgleich läuft.';
+$state['message'] = $connectionId > 0 ? 'NC-Abgleich für Verbindung #'.$connectionId.' läuft.' : 'NC-Abgleich läuft.';
 $state['started_at'] = time();
 $state['timestamp'] = time();
+$state['connection_id'] = $connectionId;
 native_scheduler_write($stateFile, $state);

 $env = $_ENV;
@@ -55,6 +59,7 @@ $env['BRATONIEN_NC_NATIVE'] = '1';
 $env['BRATONIEN_NC_PIWIGO_ROOT'] = $piwigoRoot;
 $env['BRATONIEN_NC_CONFIG_DIR'] = $runtimeDir;
 $env['BRATONIEN_NC_STATE_ROOT'] = $stateRoot;
+$env['BRATONIEN_NC_CONNECTION_ID'] = (string)$connectionId;
 $env['LC_ALL'] = 'C';
 $env['LANG'] = 'C';

@@ -86,10 +91,13 @@ $state = native_scheduler_state($stateFile);
 $state['enabled'] = true;
 $state['mode'] = 'piwigo-native';
 $state['state'] = $exit === 0 ? 'success' : 'error';
-$state['message'] = $exit === 0 ? 'NC-Abgleich erfolgreich abgeschlossen.' : 'NC-Abgleich fehlgeschlagen.';
+$state['message'] = $exit === 0
+  ? ($connectionId > 0 ? 'NC-Abgleich für Verbindung #'.$connectionId.' erfolgreich abgeschlossen.' : 'NC-Abgleich erfolgreich abgeschlossen.')
+  : ($connectionId > 0 ? 'NC-Abgleich für Verbindung #'.$connectionId.' fehlgeschlagen.' : 'NC-Abgleich fehlgeschlagen.');
 $state['timestamp'] = time();
 $state['finished_at'] = time();
 $state['exit_code'] = $exit;
+$state['connection_id'] = $connectionId;
 $state['stdout'] = trim($stdout);
 $state['stderr'] = trim($stderr);
 if (empty($state['next_due']) || (int)$state['next_due'] < time())
--- a/runtime/repair-webdav-cache-permissions.sh
+++ b/runtime/repair-webdav-cache-permissions.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+PIWIGO_ROOT="${1:-/var/www/piwigo}"
+PIWIGO_ROOT="${PIWIGO_ROOT%/}"
+DATA_DIR="$PIWIGO_ROOT/_data"
+
+[[ -d "$DATA_DIR" ]] || { echo "Piwigo-_data wurde nicht gefunden: $DATA_DIR" >&2; exit 1; }
+[[ "$(id -u)" -eq 0 ]] || { echo "Die Reparatur muss als root ausgeführt werden." >&2; exit 1; }
+
+DATA_UID="$(stat -c '%u' "$DATA_DIR")"
+DATA_GID="$(stat -c '%g' "$DATA_DIR")"
+
+PATHS=(
+  "$DATA_DIR/bratonien-tools/nc-webdav-gallery"
+  "$DATA_DIR/bratonien-tools/nc-webdav-preview"
+  "$DATA_DIR/i/_data/bratonien-tools/nc-webdav-gallery"
+  "$DATA_DIR/i/bratonien-watermark"
+)
+
+found=0
+for path in "${PATHS[@]}"; do
+  [[ -e "$path" ]] || continue
+  found=1
+  echo "Repariere: $path"
+  chown -R "$DATA_UID:$DATA_GID" -- "$path"
+  find "$path" -type d -exec chmod 2775 {} +
+  find "$path" -type f -exec chmod 0664 {} +
+done
+
+if [[ "$found" -eq 0 ]]; then
+  echo "Keine Bratonien-Cache-Verzeichnisse gefunden."
+  exit 0
+fi
+
+echo "Bratonien-Cache-Rechte wurden an $DATA_DIR angeglichen (UID $DATA_UID, GID $DATA_GID)."
--- a/runtime/run-all.sh
+++ b/runtime/run-all.sh
@@ -5,6 +5,7 @@ SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
 PIWIGO_ROOT_DEFAULT="${BRATONIEN_NC_PIWIGO_ROOT:-$(cd -- "$SCRIPT_DIR/../../.." && pwd)}"
 CONFIG_DIR="${BRATONIEN_NC_CONFIG_DIR:-/etc/bratonien-tools/nc-connector}"
 NATIVE_MODE="${BRATONIEN_NC_NATIVE:-0}"
+TARGET_CONNECTION_ID="${BRATONIEN_NC_CONNECTION_ID:-0}"
 GLOBAL_LOCK_DIR="${PIWIGO_ROOT_DEFAULT%/}/_data/bratonien-tools/nc-connector-scheduler"
 GLOBAL_LOCK_FILE="$GLOBAL_LOCK_DIR/worker.lock"
 mkdir -p -- "$GLOBAL_LOCK_DIR"
@@ -15,6 +16,11 @@ if ! flock -n 8; then
 fi
 shopt -s nullglob

+if [[ ! "$TARGET_CONNECTION_ID" =~ ^[0-9]+$ ]]; then
+    echo "NC Connector: ungültige Ziel-Verbindungs-ID: $TARGET_CONNECTION_ID" >&2
+    exit 1
+fi
+
 read_config_value() {
    local key="$1"
    local file="$2"
@@ -69,6 +75,10 @@ fi
 route_piwigo_root=""
 for candidate in "${webdav_configs[@]}" "${configs[@]}"; do
    [[ -f "$candidate" ]] || continue
+    candidate_id="$(read_config_value CONNECTION_ID "$candidate")"
+    if [[ "$TARGET_CONNECTION_ID" -gt 0 && "$candidate_id" != "$TARGET_CONNECTION_ID" ]]; then
+        continue
+    fi
    route_piwigo_root="$(read_config_value PIWIGO_ROOT "$candidate")"
    [[ -n "$route_piwigo_root" ]] && break
 done
@@ -79,6 +89,7 @@ failure_count=0
 webdav_count=0
 local_count=0
 summary_parts=()
+matched_count=0

 for config in "${webdav_configs[@]}"; do
    [[ -f "$config" ]] || continue
@@ -90,7 +101,11 @@ for config in "${webdav_configs[@]}"; do
        summary_parts+=("$name: ungueltige Verbindungs-ID")
        continue
    fi
+    if [[ "$TARGET_CONNECTION_ID" -gt 0 && "$connection_id" != "$TARGET_CONNECTION_ID" ]]; then
+        continue
+    fi

+    matched_count=$((matched_count + 1))
    webdav_count=$((webdav_count + 1))
    echo "NC Connector WebDAV #$connection_id: $name"
    output=""
@@ -119,7 +134,11 @@ if [[ "$NATIVE_MODE" != "1" ]]; then
            summary_parts+=("$name: ungueltige Verbindungs-ID")
            continue
        fi
+        if [[ "$TARGET_CONNECTION_ID" -gt 0 && "$connection_id" != "$TARGET_CONNECTION_ID" ]]; then
+            continue
+        fi

+        matched_count=$((matched_count + 1))
        piwigo_root="$(read_config_value PIWIGO_ROOT "$config")"
        [[ -n "$piwigo_root" ]] || piwigo_root="$PIWIGO_ROOT_DEFAULT"
        tombstone_dir="${piwigo_root%/}/_data/bratonien-tools/nc-connector-status"
@@ -145,6 +164,12 @@ if [[ "$NATIVE_MODE" != "1" ]]; then
    done
 fi

+if [[ "$TARGET_CONNECTION_ID" -gt 0 && "$matched_count" -eq 0 ]]; then
+    write_route_status "failed" "FEHLER - Verbindung #$TARGET_CONNECTION_ID" "Keine Laufzeitkonfiguration für Verbindung #$TARGET_CONNECTION_ID gefunden." "0"
+    echo "NC Connector: keine Laufzeitkonfiguration für Verbindung #$TARGET_CONNECTION_ID gefunden." >&2
+    exit 1
+fi
+
 summary_detail="$(IFS='; '; printf '%s' "${summary_parts[*]}")"
 [[ -n "$summary_detail" ]] || summary_detail="Keine Verbindung wurde ausgefuehrt."

@@ -160,10 +185,10 @@ if [[ "$failure_count" -eq 0 ]]; then
        label="Local"
    fi
    write_route_status "$route" "$label" "$summary_detail" "1"
-    echo "NC Connector: alle Verbindungen wurden erfolgreich verarbeitet."
+    echo "NC Connector: angeforderte Verbindung wurde erfolgreich verarbeitet."
    exit 0
 fi

-write_route_status "failed" "FEHLER - mindestens eine Verbindung" "$summary_detail" "0"
-echo "NC Connector: mindestens eine Verbindung ist fehlgeschlagen." >&2
+write_route_status "failed" "FEHLER - angeforderte Verbindung" "$summary_detail" "0"
+echo "NC Connector: die angeforderte Verbindung ist fehlgeschlagen." >&2
 exit 1
--- a/runtime/sync-webdav.sh
+++ b/runtime/sync-webdav.sh
@@ -75,8 +75,12 @@ done < "$WEBDAV_ROOTS_FILE"

 [[ ${#ROOT_ARGS[@]} -gt 0 ]] || { write_status error "Keine WebDAV-Wurzeln konfiguriert"; exit 1; }

+WEBDAV_CONNECT_IP="$(php "$SCRIPT_DIR/lib/resolve-nextcloud-target.php" "$WEBDAV_BASE_URL")"
+[[ -n "$WEBDAV_CONNECT_IP" ]] || { write_status error "Nextcloud-Zieladresse konnte nicht ermittelt werden"; exit 1; }
+
 python3 "$SCRIPT_DIR/lib/build_webdav_placeholder_source.py" \
    --base-url "$WEBDAV_BASE_URL" \
+    --connect-ip "$WEBDAV_CONNECT_IP" \
    --user "$WEBDAV_USER" \
    --password-file "$WEBDAV_PASSWORD_FILE" \
    "${ROOT_ARGS[@]}" \
--- a/tools/album_rules.inc.php
+++ b/tools/album_rules.inc.php
@@ -61,6 +61,7 @@ function bratonien_tools_save_album_rule()
    )));
  }

+  bratonien_tools_clear_watermark_cache();
  return array('message'=>'Albumregel gespeichert.');
 }

@@ -93,7 +94,34 @@ function bratonien_tools_resolve_album_rule($category_id, array $categories, arr
    $by_id[(int)$category['id']] = $category;
  }

-  $current = (int)$category_id;
+  $category_id = (int)$category_id;
+  $root = $by_id[$category_id] ?? null;
+  $is_private = $root && isset($root['status']) && $root['status'] === 'private';
+
+  if ($is_private)
+  {
+    if (isset($rules[$category_id]))
+    {
+      $rule = $rules[$category_id];
+      if ($rule['mode'] === 'disabled')
+      {
+        return array('mode'=>'disabled','profile_id'=>null,'source'=>'album');
+      }
+      if ($rule['mode'] === 'profile')
+      {
+        return array('mode'=>'profile','profile_id'=>(int)$rule['profile_id'],'source'=>'album');
+      }
+    }
+
+    $profile_id = $defaults['private_profile'] ?? null;
+    if (empty($profile_id))
+    {
+      return array('mode'=>'disabled','profile_id'=>null,'source'=>'global');
+    }
+    return array('mode'=>'profile','profile_id'=>(int)$profile_id,'source'=>'global');
+  }
+
+  $current = $category_id;
  $visited = array();

  while ($current > 0 && isset($by_id[$current]) && !isset($visited[$current]))
@@ -116,10 +144,7 @@ function bratonien_tools_resolve_album_rule($category_id, array $categories, arr
    $current = (int)($by_id[$current]['id_uppercat'] ?? 0);
  }

-  $root = $by_id[(int)$category_id] ?? null;
-  $is_private = $root && isset($root['status']) && $root['status'] === 'private';
-  $profile_id = $is_private ? ($defaults['private_profile'] ?? null) : ($defaults['public_profile'] ?? null);
-
+  $profile_id = $defaults['public_profile'] ?? null;
  if (empty($profile_id))
  {
    return array('mode'=>'disabled','profile_id'=>null,'source'=>'global');
--- a/tools/watermark_profiles.inc.php
+++ b/tools/watermark_profiles.inc.php
@@ -128,6 +128,7 @@ function bratonien_tools_save_watermark_profile()
    mass_inserts($table, array_keys($data), array($data));
  }

+  bratonien_tools_clear_watermark_cache();
  return array('message'=>'Wasserzeichenprofil gespeichert.');
 }

@@ -158,6 +159,7 @@ function bratonien_tools_delete_watermark_profile()
  }

  pwg_query('DELETE FROM '.bratonien_tools_table('watermark_profiles').' WHERE id='.$id);
+  bratonien_tools_clear_watermark_cache();
  return array('message'=>'Wasserzeichenprofil geloescht.');
 }

@@ -174,6 +176,7 @@ function bratonien_tools_duplicate_watermark_profile()
  $profile['name'] .= ' (Kopie)';
  $profile['created'] = date('Y-m-d H:i:s');
  mass_inserts(bratonien_tools_table('watermark_profiles'), array_keys($profile), array($profile));
+  bratonien_tools_clear_watermark_cache();

  return array('message'=>'Wasserzeichenprofil dupliziert.');
 }
--- a/tools/watermark_settings.inc.php
+++ b/tools/watermark_settings.inc.php
@@ -4,6 +4,59 @@ if (!defined('PHPWG_ROOT_PATH'))
  die('Hacking attempt!');
 }

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

  conf_update_param('bratonien_watermark_defaults', json_encode($config));
+  bratonien_tools_clear_watermark_cache();

  return array('message'=>'Globale Wasserzeichenregeln gespeichert.');
 }
--- a/webdav-image.php
+++ b/webdav-image.php
@@ -8,6 +8,7 @@ if (!defined('BRATONIEN_TOOLS_PATH'))
  define('BRATONIEN_TOOLS_PATH', PHPWG_ROOT_PATH.'plugins/'.BRATONIEN_TOOLS_ID.'/');
 }
 require_once(BRATONIEN_TOOLS_PATH.'include/webdav_image_runtime.inc.php');
+require_once(BRATONIEN_TOOLS_PATH.'include/nc_transport.inc.php');

 function bratonien_tools_webdav_image_abort($status, $message)
 {
@@ -120,7 +121,7 @@ $options = array(
  CURLOPT_USERPWD => $user.':'.$password,
  CURLOPT_RETURNTRANSFER => false,
  CURLOPT_FAILONERROR => false,
-  CURLOPT_USERAGENT => 'Bratonien-Tools-WebDAV-Image/0.9.6.1',
+  CURLOPT_USERAGENT => 'Bratonien-Tools-WebDAV-Image/0.9.7.16',
  CURLOPT_HEADERFUNCTION => function($ch, $line)
  {
    $length = strlen($line);
@@ -147,6 +148,7 @@ $options = array(
    return strlen($data);
  },
 );
+bratonien_tools_nc_transport_apply_curl($options, $url);
 if (!empty($_SERVER['HTTP_RANGE']))
 {
  $range = trim((string)$_SERVER['HTTP_RANGE']);
Author	SHA1	Message	Date
Terranom674	fb6c1a03d2	0.9.7.16: vorhandene Preview-Caches ohne Massendownload weiterverwenden	2026-08-19 23:06:11 +02:00
Terranom674	98d0471683	0.9.7.16: WebDAV-Bildendpoint wieder auf Originalauslieferung begrenzen	2026-08-19 23:05:14 +02:00
Terranom674	63eba888f8	0.9.7.16: native Piwigo-Derivatlogik wiederherstellen	2026-08-19 23:04:51 +02:00
Terranom674	748b0e986d	0.9.7.16: widersprüchlichen WebDAV-Derivat-Hook entfernen	2026-08-19 23:04:34 +02:00
Terranom674	c1281ad077	0.9.7.16: eigenen WebDAV-Derivat-Endpunkt entfernen	2026-08-19 23:04:26 +02:00
Terranom674	bc0593642c	0.9.7.16: echte NC-Previews als lokale Piwigo-Quelle verwenden	2026-08-19 23:04:06 +02:00
Terranom674	9052076fd7	Merge pull request #37 from Terranom674/fix/09715-piwigo-ajax-loader 0.9.7.15: Piwigo-AJAX-Lader für WebDAV-Bilder reparieren	2026-08-19 22:59:33 +02:00
Terranom674	5772a59b55	Bump version to 0.9.7.15	2026-08-19 22:58:34 +02:00
Terranom674	84762154d6	Return JSON for Piwigo AJAX image loader	2026-08-19 22:58:17 +02:00
Terranom674	1580c235a8	Fix Piwigo AJAX loader response for WebDAV derivatives	2026-08-19 22:57:56 +02:00
Terranom674	4aac5ca4a2	Merge pull request #36 from Terranom674/fix/09714-cache-permissions 0.9.7.14: WebDAV-Cache-Rechte reparieren	2026-08-19 22:48:56 +02:00
Terranom674	ab1f20beef	0.9.7.14: Einmalige Cache-Rechtereparatur	2026-08-19 22:48:00 +02:00
Terranom674	f94a001006	Version 0.9.7.14	2026-08-19 22:47:45 +02:00
Terranom674	3f64895f8e	0.9.7.14: Connector-Cache-Rechte normalisieren	2026-08-19 22:47:20 +02:00
Terranom674	48f1eacce7	Merge pull request #35 from Terranom674/fix/09713-watermark-album-overview 0.9.7.13: Wasserzeichen in Albumübersicht nach Albumregel	2026-08-19 22:43:07 +02:00
Terranom674	7c8c7ab98a	Purge stale watermark cache once on 0.9.7.13	2026-08-19 22:42:24 +02:00
Terranom674	ade38ff2d1	Clear watermark cache after profile changes	2026-08-19 22:42:01 +02:00
Terranom674	6a013fe875	Clear watermark cache after album rule changes	2026-08-19 22:41:36 +02:00
Terranom674	c71112d94e	Invalidate watermark cache on rule changes	2026-08-19 22:41:20 +02:00
Terranom674	7d97e1b515	Register album overview watermark context	2026-08-19 22:39:08 +02:00
Terranom674	47afbc7f43	Fix watermark context for album overview covers	2026-08-19 22:38:54 +02:00
Terranom674	706639a57e	Merge pull request #34 from Terranom674/fix/09712-ondemand-missing-preview 0.9.7.12: On-Demand-Altbilder nicht mehr auf 404 hängen lassen	2026-08-19 22:36:50 +02:00
Terranom674	c7b14add33	0.9.7.12: Version anheben	2026-08-19 22:35:53 +02:00
Terranom674	f9e87df305	0.9.7.12: fehlende On-Demand-Previews auf echtes WebDAV-Bild zurueckfallen	2026-08-19 22:35:25 +02:00
Terranom674	6ba5eb4d7f	Merge pull request #33 from Terranom674/fix/09711-fotorama-ondemand 0.9.7.11: Fotorama-Derivate on demand erzeugen	2026-08-19 22:32:15 +02:00
Terranom674	85369fa15e	Version 0.9.7.11	2026-08-19 22:31:13 +02:00
Terranom674	981ba6c18b	0.9.7.11: On-Demand WebDAV Derivat Endpoint	2026-08-19 22:30:52 +02:00
Terranom674	77e20af977	0.9.7.11: Fotorama Derivate erst bei Abruf erzeugen	2026-08-19 22:30:34 +02:00
Terranom674	e187c517da	Merge pull request #32 from Terranom674/fix/09710-never-serve-connector-placeholders 0.9.7.10: Connector-Platzhalter nie im Frontend ausliefern	2026-08-19 22:27:47 +02:00
Terranom674	28e34d6c73	0.9.7.10: Version anheben	2026-08-19 22:26:54 +02:00
Terranom674	b8852310bd	0.9.7.10: Connector-Platzhalter nie als Derivat ausliefern	2026-08-19 22:26:37 +02:00
Terranom674	ae96fc2e3e	Merge pull request #31 from Terranom674/fix/0979-picture-derivatives 0.9.7.9: Picture-Viewer lädt WebDAV-Derivate lokal	2026-08-19 22:17:54 +02:00
Terranom674	ebf4fc7e74	0.9.7.9: Plugin-Version anheben	2026-08-19 22:16:46 +02:00
Terranom674	d798b82ec7	0.9.7.9: Picture-Derivate lokal aus NC-Preview erzeugen	2026-08-19 22:16:26 +02:00
Terranom674	9e282af1b4	Merge pull request #30 from Terranom674/fix/0978-modus-gallery-derivative 0.9.7.8: Modus-Galeriederivat beim Sync vorbauen	2026-08-19 22:03:53 +02:00
Terranom674	d7628d1dac	Version auf 0.9.7.8 setzen	2026-08-19 22:02:59 +02:00
Terranom674	7e9c3ae05f	0.9.7.8: Modus-Galeriederivat vorab erzeugen	2026-08-19 22:02:43 +02:00
Terranom674	b64e46a549	Merge pull request #29 from Terranom674/fix/0974-gallery-derivative-only 0.9.7.7: Connector-Altbestand einmalig zurücksetzen	2026-08-19 21:50:57 +02:00
Terranom674	779ba80dfe	Jetzt-abgleichen global und verbindungsbezogen erlauben	2026-08-19 21:50:18 +02:00
Terranom674	ebbc183f87	Globalen Jetzt-abgleichen-Lauf erhalten	2026-08-19 21:49:45 +02:00
Terranom674	f3b5002f4d	run-all auf angeforderte Verbindung filtern	2026-08-19 21:48:05 +02:00
Terranom674	6c393bbcfc	Native Runner auf einzelne Verbindung begrenzen	2026-08-19 21:47:40 +02:00
Terranom674	829381676d	Manuellen Abgleich auf ausgewählte Verbindung begrenzen	2026-08-19 21:47:25 +02:00
Terranom674	6382cee491	Jetzt-abgleichen verbindungsbezogen starten	2026-08-19 21:47:01 +02:00
Terranom674	69c3932e9b	CI für 0.9.7.7 auslösen	2026-08-19 21:45:16 +02:00
Terranom674	747a76c066	Altbestand beim Update auf 0.9.7.7 einmalig bereinigen	2026-08-19 21:45:06 +02:00
Terranom674	5024757136	Einmaligen Connector-Altbestand-Reset ergänzen	2026-08-19 21:44:52 +02:00
Terranom674	5125d2e247	0.9.7.7 vorbereiten	2026-08-19 21:44:39 +02:00
Terranom674	6607c4aefe	Merge pull request #28 from Terranom674/fix/0974-gallery-derivative-only 0.9.7.6: Galerie-Hotpath entlasten	2026-08-19 21:38:09 +02:00
Terranom674	32f2ceaaec	cleanup: temporaeren CI-Trigger entfernen	2026-08-19 21:37:19 +02:00
Terranom674	5a5669d976	ci: trigger 0.9.7.6	2026-08-19 21:36:46 +02:00
Terranom674	e4ab277cfc	0.9.7.6: Wasserzeichen-Engine pro Request nur einmal initialisieren	2026-08-19 21:36:37 +02:00
Terranom674	9e07cd8042	0.9.7.6: Request-Scheduler aus Galeriepfad entfernen	2026-08-19 21:35:50 +02:00
Terranom674	588f1fc100	0.9.7.6: WebDAV-Hotpath pro Request cachen	2026-08-19 21:35:06 +02:00
Terranom674	a23fc81190	Merge pull request #27 from Terranom674/fix/0974-gallery-derivative-only 0.9.7.5: Alt-Derivate reparieren und Galerie beschleunigen	2026-08-19 21:30:24 +02:00
Terranom674	ff5af83e65	Rebuild only mismatched legacy gallery derivatives	2026-08-19 21:29:31 +02:00
Terranom674	c61d8e32cc	Use fast WebDAV gallery derivative filter	2026-08-19 21:28:47 +02:00
Terranom674	38c4955f70	Add fast WebDAV gallery derivative path	2026-08-19 21:28:29 +02:00
Terranom674	5c217288a8	Bump version to 0.9.7.5	2026-08-19 21:27:17 +02:00
Terranom674	17c79ce8ab	Restore branch to 0.9.7.4 baseline	2026-08-19 21:27:03 +02:00
Terranom674	7746d26c9f	Remove accidental temporary file	2026-08-19 21:26:47 +02:00
Terranom674	d05ab28549	noop	2026-08-19 21:26:19 +02:00
Terranom674	55b5be56b6	Merge pull request #26 from Terranom674/fix/0974-gallery-derivative-only 0.9.7.4: nur Galeriederivat beim WebDAV-Import	2026-08-19 21:23:35 +02:00
Terranom674	ba0b5af417	Release 0.9.7.4	2026-08-19 21:12:39 +02:00
Terranom674	315af9641c	Build only gallery derivative from WebDAV preview	2026-08-19 21:12:24 +02:00
Terranom674	77ae007a28	Merge pull request #25 from Terranom674/fix/0973-webdav-root-altimports 0.9.7.3: Altimporte aus WebDAV-Stammverzeichnis reparieren	2026-08-19 21:02:13 +02:00
Terranom674	e5be2b3043	Release 0.9.7.3	2026-08-19 21:01:26 +02:00
Terranom674	3fe9527537	Fix root WebDAV alt-import derivative detection	2026-08-19 21:01:00 +02:00
Terranom674	fb1f12d608	0.9.7.2: sichtbarer Abgleich und sicherer WebDAV-Import 0.9.7.2: sichtbarer Abgleich und sicherer WebDAV-Import	2026-08-19 20:53:28 +02:00
Terranom674	017cbdbd3b	0.9.7.2: private Alben nicht von öffentlichen Regeln erben lassen	2026-08-19 20:52:16 +02:00
Terranom674	9aaa1a47b3	0.9.7.2: WebDAV-Sync nicht-destruktiv machen	2026-08-19 20:51:23 +02:00
Terranom674	fc3d855e5e	0.9.7.2: Version anheben	2026-08-19 20:49:18 +02:00
Terranom674	4847d2ff11	0.9.7.2: aktuellen Schedulerstatus in Statuskarte spiegeln	2026-08-19 20:48:48 +02:00
Terranom674	0b405e9efb	0.9.7.2: Abgleich sofort als angefordert markieren	2026-08-19 20:48:25 +02:00
Terranom674	2c302b356d	Merge pull request #23 from Terranom674/fix/0971-webdav-public-ip 0.9.7.1: WebDAV über öffentliche Ziel-IP	2026-08-19 20:43:19 +02:00
Terranom674	5c62dbd9be	0.9.7.1: clean pinned WebDAV resolver implementation	2026-08-19 20:41:46 +02:00
Terranom674	5f81cc9ce9	0.9.7.1: bump plugin version	2026-08-19 20:40:57 +02:00
Terranom674	a5be16f88e	0.9.7.1: stream WebDAV originals through resolved target IP	2026-08-19 20:40:40 +02:00
Terranom674	6b082ba8b5	0.9.7.1: fetch WebDAV previews through resolved target IP	2026-08-19 20:40:19 +02:00
Terranom674	5396f50bc0	0.9.7.1: resolve remote Nextcloud target before WebDAV scan	2026-08-19 20:39:54 +02:00
Terranom674	a54df74e67	0.9.7.1: pin WebDAV runtime to resolved target IP	2026-08-19 20:39:27 +02:00
Terranom674	986eb530d7	0.9.7.1: scan remote Nextcloud through resolved IP transport	2026-08-19 20:38:52 +02:00
Terranom674	b9adcbddac	0.9.7.1: use transport-aware WebDAV wizard handlers	2026-08-19 20:38:25 +02:00
Terranom674	bb434b9b02	0.9.7.1: route wizard and WebDAV calls through resolved target IP	2026-08-19 20:37:59 +02:00
Terranom674	aa5c2f7f0c	0.9.7.1: add runtime Nextcloud target resolver	2026-08-19 20:37:23 +02:00
Terranom674	aa803a4149	0.9.7.1: add generic Nextcloud transport resolver	2026-08-19 20:35:40 +02:00
Terranom674	ad39b9f0d2	Merge pull request #22 from Terranom674/fix/09630-native-piwigo-scheduler 0.9.6.30: NC Connector nativ in Piwigo ausführen	2026-08-19 20:18:39 +02:00