Version auf 0.9.6.29 anheben

.ci-trigger-0977

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

include/nc_connector_delete_safe.inc.php

@@ -4,84 +4,42 @@ if (!defined('PHPWG_ROOT_PATH'))
   die('Hacking attempt!');
 }
 
-function bratonien_tools_nc_connector_db_prefix_from_absolute($path)
+function bratonien_tools_nc_connector_webdav_site_id(array $connection)
 {
-  $path = rtrim(str_replace('\\', '/', (string)$path), '/');
-  $piwigo_root = rtrim(str_replace('\\', '/', PHPWG_ROOT_PATH), '/');
-  if ($path === '' || strpos($path, $piwigo_root.'/') !== 0) return '';
-
-  $relative = ltrim(substr($path, strlen($piwigo_root)), '/');
-  return $relative === '' ? '' : './'.rtrim($relative, '/').'/';
-}
-
-function bratonien_tools_nc_connector_owned_db_prefixes(array $connection)
-{
-  $id = (int)($connection['id'] ?? 0);
-  if ($id < 1) return array();
-
-  $prefixes = array(
-    './_data/bratonien-tools/nc-webdav-gallery/connection-'.$id.'/',
-    './_data/bratonien-tools/nc-webdav-source/connection-'.$id.'/',
-    './galleries/bratonien-webdav-'.$id.'/',
-  );
-
   $config = isset($connection['config']) && is_array($connection['config']) ? $connection['config'] : array();
-  $configured = bratonien_tools_nc_connector_db_prefix_from_absolute($config['parallel_gallery_root'] ?? '');
-  if ($configured !== '') $prefixes[] = $configured;
+  if ((string)($connection['adapter'] ?? '') !== 'remote') return 0;
+  if ((string)($config['source_mode'] ?? '') !== 'webdav-placeholder') return 0;
 
-  return array_values(array_unique($prefixes));
-}
+  $gallery_root = rtrim((string)($config['parallel_gallery_root'] ?? ''), '/');
+  $piwigo_root = rtrim(PHPWG_ROOT_PATH, '/');
+  if ($gallery_root === '' || strpos($gallery_root, $piwigo_root.'/') !== 0) return 0;
 
-function bratonien_tools_nc_connector_owned_site_urls(array $connection)
-{
-  $id = (int)($connection['id'] ?? 0);
-  if ($id < 1) return array();
+  $relative = ltrim(substr($gallery_root, strlen($piwigo_root)), '/');
+  if ($relative === '') return 0;
+  $site_url = './'.rtrim($relative, '/').'/';
 
-  $urls = array(
-    './_data/bratonien-tools/nc-webdav-gallery/connection-'.$id.'/',
-    './galleries/bratonien-webdav-'.$id.'/',
+  $result = pwg_query(
+    "SELECT id FROM ".SITES_TABLE.
+    " WHERE galleries_url='".pwg_db_real_escape_string($site_url)."' LIMIT 1"
   );
+  if (!pwg_db_num_rows($result)) return 0;
 
-  $config = isset($connection['config']) && is_array($connection['config']) ? $connection['config'] : array();
-  $configured = bratonien_tools_nc_connector_db_prefix_from_absolute($config['parallel_gallery_root'] ?? '');
-  if ($configured !== '') $urls[] = $configured;
-
-  return array_values(array_unique($urls));
+  $row = pwg_db_fetch_assoc($result);
+  return (int)$row['id'];
 }
 
 function bratonien_tools_nc_connector_remove_webdav_piwigo_content(array $connection)
 {
+  $site_id = bratonien_tools_nc_connector_webdav_site_id($connection);
+  if ($site_id < 1) return array('site_id'=>0, 'images'=>0);
+
   include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
 
-  $prefixes = bratonien_tools_nc_connector_owned_db_prefixes($connection);
-  if (!$prefixes) return array('sites'=>0, 'images'=>0);
-
-  $where = array();
-  foreach ($prefixes as $prefix)
-  {
-    $escaped = pwg_db_real_escape_string(addcslashes($prefix, '_%\\'));
-    $where[] = "path LIKE '".$escaped."%' ESCAPE '\\\\'";
-  }
-
   $image_rows = array();
-  $result = pwg_query(
-    'SELECT id, path, representative_ext FROM '.IMAGES_TABLE.
-    ' WHERE '.implode(' OR ', $where)
-  );
+  $query = '\nSELECT DISTINCT i.id, i.path, i.representative_ext\n  FROM '.IMAGES_TABLE.' AS i\n  LEFT JOIN '.CATEGORIES_TABLE.' AS sc ON sc.id = i.storage_category_id\n  LEFT JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON ic.image_id = i.id\n  LEFT JOIN '.CATEGORIES_TABLE.' AS vc ON vc.id = ic.category_id\n  WHERE sc.site_id = '.$site_id.' OR vc.site_id = '.$site_id.'\n;';
+  $result = pwg_query($query);
   while ($row = pwg_db_fetch_assoc($result))
   {
-    $path = (string)$row['path'];
-    $owned = false;
-    foreach ($prefixes as $prefix)
-    {
-      if (strpos($path, $prefix) === 0)
-      {
-        $owned = true;
-        break;
-      }
-    }
-    if (!$owned) continue;
-
     $row['id'] = (int)$row['id'];
     $image_rows[$row['id']] = $row;
   }
@@ -98,28 +56,24 @@ function bratonien_tools_nc_connector_remove_webdav_piwigo_content(array $connec
     }
   }
 
+  delete_site($site_id);
+
   if ($image_rows)
   {
-    delete_elements(array_map('intval', array_keys($image_rows)), false);
-  }
-
-  $site_count = 0;
-  foreach (bratonien_tools_nc_connector_owned_site_urls($connection) as $site_url)
-  {
-    $result = pwg_query(
-      "SELECT id FROM ".SITES_TABLE.
-      " WHERE galleries_url='".pwg_db_real_escape_string($site_url)."'"
+    $ids = array_keys($image_rows);
+    $remaining = query2array(
+      'SELECT id FROM '.IMAGES_TABLE.' WHERE id IN ('.implode(',', array_map('intval', $ids)).')',
+      null,
+      'id'
     );
-    while ($row = pwg_db_fetch_assoc($result))
+    if ($remaining)
     {
-      delete_site((int)$row['id']);
-      $site_count++;
+      delete_elements(array_map('intval', $remaining), false);
     }
   }
 
-  update_category('all');
   invalidate_user_cache(true);
-  return array('sites'=>$site_count, 'images'=>count($image_rows));
+  return array('site_id'=>$site_id, 'images'=>count($image_rows));
 }
 
 /**
@@ -135,7 +89,7 @@ function bratonien_tools_nc_connector_delete_safe()
     throw new RuntimeException('Connector-Verbindung wurde nicht gefunden.');
   }
 
-  $cleanup = array('sites'=>0, 'images'=>0);
+  $cleanup = array('site_id'=>0, 'images'=>0);
   if (
     (string)($connection['adapter'] ?? '') === 'remote'
     && (string)($connection['config']['source_mode'] ?? '') === 'webdav-placeholder'
@@ -156,7 +110,14 @@ function bratonien_tools_nc_connector_delete_safe()
     @file_put_contents($status_dir.'/deleted-'.$id, date('c')."\n", LOCK_EX);
   }
 
+  if ((int)$cleanup['site_id'] > 0)
+  {
+    return array(
+      'message'=>'Verbindung wurde gelöscht. Die zugehörigen Piwigo-Alben und '.(int)$cleanup['images'].' Bilder wurden aus Piwigo entfernt. Nextcloud-Dateien blieben unverändert.',
+    );
+  }
+
   return array(
-    'message'=>'Verbindung wurde gelöscht. '.(int)$cleanup['images'].' eindeutig zu dieser Verbindung gehörende Bilder wurden aus Piwigo entfernt. Nextcloud-Dateien blieben unverändert.',
+    'message'=>'Verbindung wurde gelöscht. Verbliebene Laufzeitdaten werden automatisch bereinigt. Quelldateien blieben unverändert.',
   );
 }

include/nc_connector_scheduler.inc.php

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

include/nc_connector_system.inc.php

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

include/nc_connector_wizard_webdav_flow.inc.php

@@ -28,7 +28,7 @@ function bratonien_tools_nc_wizard_scan_webdav_first()
   {
     try
     {
-      $response = bratonien_tools_nc_transport_http($candidate_url.'/status.php');
+      $response = bratonien_tools_nc_wizard_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_transport_http(
+  $user_response = bratonien_tools_nc_wizard_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_transport_refresh_directory_state($state, '');
+  bratonien_tools_nc_wizard_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.');

include/nc_productive_ws.inc.php

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

include/nc_transport.inc.php

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

include/tool_registry.inc.php

@@ -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.7.1';
+  $script_version = function_exists('bratonien_tools_current_version') ? bratonien_tools_current_version() : '0.9.6.27';
   $GLOBALS['template']->func_combine_script(array(
     'id'=>'bratonien_nc_connector_edit_v2',
     'path'=>BRATONIEN_TOOLS_PATH.'js/nc_connector_edit_v2.js',
@@ -41,23 +41,57 @@ require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_delete_safe.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_webdav.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_wizard_webdav_flow.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_edit.inc.php');
-require_once(BRATONIEN_TOOLS_PATH . 'include/nc_transport.inc.php');
-require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_scheduler.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_system.inc.php');
 
 function bratonien_tools_nc_connector_run_now()
 {
-  $connection_id = isset($_POST['connection_id']) ? max(0, (int)$_POST['connection_id']) : 0;
-  if ($connection_id > 0)
+  $service = 'bratonien-nc-connector.service';
+  $active = bratonien_tools_nc_connector_systemctl_value(array('is-active', $service));
+  if ($active === 'active' || $active === 'activating')
   {
-    $connection = bratonien_tools_nc_connector_connection($connection_id, false);
-    if (!$connection)
-    {
-      throw new RuntimeException('Die ausgewählte Verbindung existiert nicht.');
-    }
+    return array('message'=>'Der NC-Abgleich läuft bereits.');
   }
-  $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.')));
+
+  if (!function_exists('proc_open'))
+  {
+    throw new RuntimeException('Der NC-Abgleich konnte nicht gestartet werden: proc_open ist nicht verfügbar.');
+  }
+
+  $commands = array(
+    array('/usr/bin/sudo', '-n', '/usr/bin/systemctl', 'start', '--no-block', $service),
+    array('/usr/bin/systemctl', 'start', '--no-block', $service),
+  );
+  $last_error = '';
+
+  foreach ($commands as $command)
+  {
+    if (!is_executable($command[0]))
+    {
+      continue;
+    }
+    $spec = array(
+      0=>array('file','/dev/null','r'),
+      1=>array('pipe','w'),
+      2=>array('pipe','w'),
+    );
+    $process = @proc_open($command, $spec, $pipes, null, array_merge($_ENV, array('LC_ALL'=>'C','LANG'=>'C')));
+    if (!is_resource($process))
+    {
+      continue;
+    }
+    $stdout = trim((string)stream_get_contents($pipes[1]));
+    $stderr = trim((string)stream_get_contents($pipes[2]));
+    fclose($pipes[1]);
+    fclose($pipes[2]);
+    $exit = proc_close($process);
+    if ($exit === 0)
+    {
+      return array('message'=>'NC-Abgleich wurde gestartet.');
+    }
+    $last_error = $stderr !== '' ? $stderr : $stdout;
+  }
+
+  throw new RuntimeException('Der NC-Abgleich konnte nicht gestartet werden'.($last_error !== '' ? ': '.$last_error : '.'));
 }
 
 function bratonien_tools_get_tools()
@@ -84,7 +118,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_transport_edit_start'),
+    'nc_connector_edit_start' => array('handler' => 'bratonien_tools_nc_connector_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'),
@@ -92,7 +126,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_transport_wizard_directory_browse'),
+    'nc_connector_wizard_directory_browse' => array('handler' => 'bratonien_tools_nc_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'),

include/watermark_engine.inc.php

@@ -8,17 +8,8 @@ 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

js/admin_tabs.js

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

js/nc_connector_edit_v2.js

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

main.inc.php

@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: Bratonien Tools
-Version: 0.9.7.20
+Version: 0.9.6.29
 Description: Erweiterbare Administrationswerkzeuge fuer die Bratonien-Piwigo-Installation.
 Plugin URI: https://github.com/Terranom674/Piwigo_Bratonien_Tools
 Author: Bratonien
@@ -24,7 +24,6 @@ require_once(BRATONIEN_TOOLS_PATH . 'include/album_shares.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_ws.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_orphan_ws.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_productive_ws.inc.php');
-require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_scheduler.inc.php');
 
 add_event_handler('get_admin_plugin_menu_links', 'bratonien_tools_admin_menu');
 add_event_handler('get_derivative_url', 'bratonien_tools_filter_derivative_url', EVENT_HANDLER_PRIORITY_NEUTRAL, 4);

maintain.class.php

@@ -8,7 +8,6 @@ require_once(dirname(__FILE__) . '/include/album_shares.inc.php');
 require_once(dirname(__FILE__) . '/include/database.class.php');
 require_once(dirname(__FILE__) . '/tools/watermark_profiles.inc.php');
 require_once(dirname(__FILE__) . '/include/dependencies.inc.php');
-require_once(dirname(__FILE__) . '/include/nc_connector_scheduler.inc.php');
 
 class bratonien_tools_maintain extends PluginMaintain
 {
@@ -19,14 +18,9 @@ class bratonien_tools_maintain extends PluginMaintain
 
     $dependency_messages = array();
     bratonien_tools_ensure_dependencies($dependency_messages);
-    if (!bratonien_tools_nc_scheduler_install())
-    {
-      $dependency_messages[] = 'Der native NC-Scheduler konnte sein Piwigo-Laufzeitverzeichnis nicht anlegen.';
-    }
 
     if (function_exists('conf_update_param'))
     {
-      conf_update_param('bratonien_nc_scheduler_interval', 60);
       conf_update_param('bratonien_dependency_status', json_encode(array(
         'checked_at' => time(),
         'messages' => $dependency_messages,

nc-connector-edit-data.php

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

nc-connector-edit-save.php

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

nc-connector-source-picker-start.php

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

runtime/build-webdav-media.sh

@@ -1,7 +1,35 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-# Seit 0.9.7.20 greift der NC Connector nicht mehr in Piwigos Bild-/Derivatlogik ein.
-# Der Shadowtree dient nur der Piwigo-Synchronisation; die Bild-URL wird zur Laufzeit
-# ueber den bestehenden WebDAV-URL-Hook auf Nextcloud aufgeloest.
-exit 0
+CONFIG_FILE="${PIWIGO_CONFIG:-}"
+[[ -n "$CONFIG_FILE" && -r "$CONFIG_FILE" ]] || { echo "WebDAV-Konfiguration fehlt: ${CONFIG_FILE:-<leer>}" >&2; exit 1; }
+
+# shellcheck source=/dev/null
+source "$CONFIG_FILE"
+
+: "${PIWIGO_ROOT:?PIWIGO_ROOT fehlt}"
+: "${CONNECTION_ID:?CONNECTION_ID fehlt}"
+: "${WEBDAV_BASE_URL:?WEBDAV_BASE_URL fehlt}"
+: "${WEBDAV_USER:?WEBDAV_USER fehlt}"
+: "${WEBDAV_PASSWORD_FILE:?WEBDAV_PASSWORD_FILE fehlt}"
+: "${WEBDAV_MAPPING_FILE:?WEBDAV_MAPPING_FILE fehlt}"
+: "${STATE_DIR:?STATE_DIR fehlt}"
+
+SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+LOCK_FILE="$STATE_DIR/webdav-media.lock"
+mkdir -p -- "$STATE_DIR"
+exec 9>"$LOCK_FILE"
+flock -n 9 || exit 0
+
+PREVIEW_CACHE="$PIWIGO_ROOT/_data/bratonien-tools/nc-webdav-preview/connection-$CONNECTION_ID"
+
+php "$SCRIPT_DIR/lib/precache-webdav-previews.php" \
+    --mapping="$WEBDAV_MAPPING_FILE" \
+    --base-url="$WEBDAV_BASE_URL" \
+    --user="$WEBDAV_USER" \
+    --password-file="$WEBDAV_PASSWORD_FILE" \
+    --cache-dir="$PREVIEW_CACHE"
+
+php "$SCRIPT_DIR/lib/build-webdav-derivatives.php" \
+    --piwigo-root="$PIWIGO_ROOT" \
+    --connection-id="$CONNECTION_ID"

runtime/cleanup-missing-webdav-images.php

@@ -1,142 +0,0 @@
-#!/usr/bin/env php
-<?php
-if (PHP_SAPI !== 'cli')
-{
-  fwrite(STDERR, "CLI only\n");
-  exit(1);
-}
-
-$options = getopt('', array('piwigo-root:', 'connection-id:'));
-$piwigo_root = rtrim((string)($options['piwigo-root'] ?? ''), '/');
-$connection_id = (int)($options['connection-id'] ?? 0);
-if ($piwigo_root === '' || $connection_id < 1)
-{
-  fwrite(STDERR, "Parameter --piwigo-root und --connection-id werden benoetigt.\n");
-  exit(1);
-}
-
-$db_config = $piwigo_root.'/local/config/database.inc.php';
-if (!is_readable($db_config))
-{
-  fwrite(STDERR, "Piwigo-Datenbankkonfiguration ist nicht lesbar.\n");
-  exit(1);
-}
-
-$conf = array();
-$prefixeTable = 'piwigo_';
-require $db_config;
-foreach (array('db_host','db_user','db_password','db_base') as $key)
-{
-  if (!isset($conf[$key]))
-  {
-    fwrite(STDERR, "Piwigo-Datenbankkonfiguration ist unvollstaendig: $key\n");
-    exit(1);
-  }
-}
-
-$db = new mysqli($conf['db_host'], $conf['db_user'], $conf['db_password'], $conf['db_base']);
-if ($db->connect_errno)
-{
-  fwrite(STDERR, "Piwigo-Datenbank ist nicht erreichbar: ".$db->connect_error."\n");
-  exit(1);
-}
-$db->set_charset('utf8mb4');
-
-$table = $prefixeTable.'bratonien_tools_nc_connections';
-$result = $db->query('SELECT config_json FROM `'.$table.'` WHERE id='.$connection_id.' LIMIT 1');
-if (!$result || !$result->num_rows)
-{
-  fwrite(STDERR, "Connector-Verbindung #$connection_id wurde nicht gefunden.\n");
-  exit(1);
-}
-$config = json_decode((string)$result->fetch_assoc()['config_json'], true);
-if (!is_array($config) || (string)($config['source_mode'] ?? '') !== 'webdav-placeholder')
-{
-  echo "Keine WebDAV-Bereinigung erforderlich.\n";
-  exit(0);
-}
-
-$prefixes = array(
-  './_data/bratonien-tools/nc-webdav-gallery/connection-'.$connection_id.'/',
-  './_data/bratonien-tools/nc-webdav-source/connection-'.$connection_id.'/',
-  './galleries/bratonien-webdav-'.$connection_id.'/',
-);
-
-$gallery_root = rtrim(str_replace('\\', '/', (string)($config['parallel_gallery_root'] ?? '')), '/');
-$normalized_piwigo_root = rtrim(str_replace('\\', '/', $piwigo_root), '/');
-if ($gallery_root !== '' && strpos($gallery_root, $normalized_piwigo_root.'/') === 0)
-{
-  $relative = ltrim(substr($gallery_root, strlen($normalized_piwigo_root)), '/');
-  if ($relative !== '') $prefixes[] = './'.rtrim($relative, '/').'/';
-}
-$prefixes = array_values(array_unique($prefixes));
-
-$where = array();
-foreach ($prefixes as $prefix)
-{
-  $escaped = $db->real_escape_string(addcslashes($prefix, "_%\\"));
-  $where[] = "path LIKE '{$escaped}%' ESCAPE '\\\\'";
-}
-
-$images_table = $prefixeTable.'images';
-$rows = $db->query("SELECT id, path FROM `{$images_table}` WHERE ".implode(' OR ', $where));
-if (!$rows)
-{
-  fwrite(STDERR, "Connector-Bilder konnten nicht gelesen werden: ".$db->error."\n");
-  exit(1);
-}
-
-$missing_ids = array();
-while ($row = $rows->fetch_assoc())
-{
-  $path = (string)$row['path'];
-  $owned = false;
-  foreach ($prefixes as $prefix)
-  {
-    if (strpos($path, $prefix) === 0)
-    {
-      $owned = true;
-      break;
-    }
-  }
-  if (!$owned) continue;
-
-  $absolute = $piwigo_root.'/'.ltrim(preg_replace('#^\./#', '', $path), '/');
-  if (!is_file($absolute))
-  {
-    $missing_ids[] = (int)$row['id'];
-  }
-}
-$db->close();
-
-if (!$missing_ids)
-{
-  echo "WebDAV-Bereinigung: keine fehlenden Piwigo-Bilder.\n";
-  exit(0);
-}
-
-// Dieser Prozess wird ausschliesslich nach einem erfolgreich abgeschlossenen
-// WebDAV-Aufbau und erfolgreicher Piwigo-Synchronisierung gestartet. Eine
-// nicht erreichbare Verbindung kann deshalb niemals ueber diesen Pfad Bilder
-// entfernen.
-define('PHPWG_ROOT_PATH', $piwigo_root.'/');
-$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
-$_SERVER['SERVER_ADDR'] = '127.0.0.1';
-$_SERVER['SERVER_NAME'] = 'localhost';
-$_SERVER['HTTP_HOST'] = 'localhost';
-$_SERVER['SERVER_PORT'] = '80';
-$_SERVER['REQUEST_METHOD'] = 'GET';
-$_SERVER['REQUEST_URI'] = '/';
-$_SERVER['SCRIPT_NAME'] = '/plugins/bratonien_tools/runtime/cleanup-missing-webdav-images.php';
-$_SERVER['PHP_SELF'] = $_SERVER['SCRIPT_NAME'];
-$_SERVER['QUERY_STRING'] = '';
-$_SERVER['HTTPS'] = 'off';
-
-require_once(PHPWG_ROOT_PATH.'include/common.inc.php');
-include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
-
-$deleted = delete_elements(array_values(array_unique(array_map('intval', $missing_ids))), false);
-update_category('all');
-invalidate_user_cache(true);
-
-echo 'WebDAV-Bereinigung: '.(int)$deleted." nicht mehr freigegebene/vorhandene Bilder aus Piwigo entfernt.\n";

runtime/cleanup-webdav-piwigo.php

@@ -47,31 +47,24 @@ function bratonien_cleanup_tree($path, $allowed_root)
   @rmdir($path);
 }
 
-function bratonien_connection_id_from_owned_path($path)
+function bratonien_webdav_site_images($site_id)
 {
-  $path = (string)$path;
-  foreach (array(
-    '#^\./_data/bratonien-tools/nc-webdav-gallery/connection-([0-9]+)/#',
-    '#^\./_data/bratonien-tools/nc-webdav-source/connection-([0-9]+)/#',
-    '#^\./galleries/bratonien-webdav-([0-9]+)/#',
-  ) as $pattern)
+  $rows = array();
+  $query = '
+SELECT DISTINCT i.id, i.path, i.representative_ext
+  FROM '.IMAGES_TABLE.' AS i
+  LEFT JOIN '.CATEGORIES_TABLE.' AS sc ON sc.id = i.storage_category_id
+  LEFT JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON ic.image_id = i.id
+  LEFT JOIN '.CATEGORIES_TABLE.' AS vc ON vc.id = ic.category_id
+  WHERE sc.site_id = '.(int)$site_id.' OR vc.site_id = '.(int)$site_id.'
+;';
+  $result = pwg_query($query);
+  while ($row = pwg_db_fetch_assoc($result))
   {
-    if (preg_match($pattern, $path, $match)) return (int)$match[1];
+    $row['id'] = (int)$row['id'];
+    $rows[$row['id']] = $row;
   }
-  return 0;
-}
-
-function bratonien_connection_id_from_site_url($url)
-{
-  $url = (string)$url;
-  foreach (array(
-    '#^\./_data/bratonien-tools/nc-webdav-gallery/connection-([0-9]+)/$#',
-    '#^\./galleries/bratonien-webdav-([0-9]+)/$#',
-  ) as $pattern)
-  {
-    if (preg_match($pattern, $url, $match)) return (int)$match[1];
-  }
-  return 0;
+  return $rows;
 }
 
 try
@@ -91,24 +84,24 @@ try
     }
   }
 
-  $removed_images = 0;
-  $stale_by_connection = array();
+  $site_prefix = './_data/bratonien-tools/nc-webdav-gallery/connection-';
   $result = pwg_query(
-    "SELECT id, path, representative_ext FROM ".IMAGES_TABLE.
-    " WHERE path LIKE './_data/bratonien-tools/nc-webdav-gallery/connection-%'".
-    " OR path LIKE './_data/bratonien-tools/nc-webdav-source/connection-%'".
-    " OR path LIKE './galleries/bratonien-webdav-%'"
+    "SELECT id, galleries_url FROM ".SITES_TABLE.
+    " WHERE galleries_url LIKE '".pwg_db_real_escape_string($site_prefix)."%'"
   );
-  while ($row = pwg_db_fetch_assoc($result))
-  {
-    $connection_id = bratonien_connection_id_from_owned_path($row['path'] ?? '');
-    if ($connection_id < 1 || isset($active[$connection_id])) continue;
-    $row['id'] = (int)$row['id'];
-    $stale_by_connection[$connection_id][$row['id']] = $row;
-  }
 
-  foreach ($stale_by_connection as $connection_id=>$images)
+  $removed_sites = 0;
+  $removed_images = 0;
+  while ($site = pwg_db_fetch_assoc($result))
   {
+    $site_id = (int)$site['id'];
+    $site_url = (string)$site['galleries_url'];
+    if (!preg_match('#^\./_data/bratonien-tools/nc-webdav-gallery/connection-([0-9]+)/$#', $site_url, $match)) continue;
+
+    $connection_id = (int)$match[1];
+    if ($connection_id < 1 || isset($active[$connection_id])) continue;
+
+    $images = bratonien_webdav_site_images($site_id);
     foreach ($images as $row)
     {
       try
@@ -121,60 +114,48 @@ try
       }
     }
 
-    delete_elements(array_map('intval', array_keys($images)), false);
-    $removed_images += count($images);
-    echo 'NC WebDAV: entferne '.count($images).' verwaiste Bilder der gelöschten Verbindung '.$connection_id.".\n";
-  }
+    delete_site($site_id);
 
-  $removed_sites = 0;
-  $result = pwg_query('SELECT id, galleries_url FROM '.SITES_TABLE);
-  $stale_sites = array();
-  while ($site = pwg_db_fetch_assoc($result))
-  {
-    $connection_id = bratonien_connection_id_from_site_url($site['galleries_url'] ?? '');
-    if ($connection_id < 1 || isset($active[$connection_id])) continue;
-    $stale_sites[] = array('id'=>(int)$site['id'], 'connection_id'=>$connection_id);
-  }
+    if ($images)
+    {
+      $ids = array_keys($images);
+      $remaining = query2array(
+        'SELECT id FROM '.IMAGES_TABLE.' WHERE id IN ('.implode(',', array_map('intval', $ids)).')',
+        null,
+        'id'
+      );
+      if ($remaining)
+      {
+        delete_elements(array_map('intval', $remaining), false);
+      }
+    }
 
-  foreach ($stale_sites as $site)
-  {
-    delete_site($site['id']);
     $removed_sites++;
-    echo 'NC WebDAV: entferne verwaiste Piwigo-Site '.$site['id'].' der gelöschten Verbindung '.$site['connection_id'].".\n";
-  }
+    $removed_images += count($images);
+    echo 'NC WebDAV: entferne verwaiste Piwigo-Site '.$site_id.' für gelöschte Verbindung '.$connection_id.".\n";
 
-  $stale_connection_ids = array_unique(array_merge(
-    array_map('intval', array_keys($stale_by_connection)),
-    array_map(function($site) { return (int)$site['connection_id']; }, $stale_sites)
-  ));
-
-  $gallery_root = PHPWG_ROOT_PATH.'_data/bratonien-tools/nc-webdav-gallery';
-  $source_root = PHPWG_ROOT_PATH.'_data/bratonien-tools/nc-webdav-source';
-  $preview_root = PHPWG_ROOT_PATH.'_data/bratonien-tools/nc-webdav-preview';
-  $legacy_root = PHPWG_ROOT_PATH.'galleries';
-  $state_root = '/var/lib/bratonien-tools/nc-connector';
-  $status_root = PHPWG_ROOT_PATH.'_data/bratonien-tools/nc-connector-status';
-
-  foreach ($stale_connection_ids as $connection_id)
-  {
-    if ($connection_id < 1) continue;
+    $gallery_root = PHPWG_ROOT_PATH.'_data/bratonien-tools/nc-webdav-gallery';
+    $source_root = PHPWG_ROOT_PATH.'_data/bratonien-tools/nc-webdav-source';
+    $preview_root = PHPWG_ROOT_PATH.'_data/bratonien-tools/nc-webdav-preview';
     bratonien_cleanup_tree($gallery_root.'/connection-'.$connection_id, $gallery_root);
     bratonien_cleanup_tree($source_root.'/connection-'.$connection_id, $source_root);
     bratonien_cleanup_tree($preview_root.'/connection-'.$connection_id, $preview_root);
-    bratonien_cleanup_tree($legacy_root.'/bratonien-webdav-'.$connection_id, $legacy_root);
+
+    $state_root = '/var/lib/bratonien-tools/nc-connector';
     bratonien_cleanup_tree($state_root.'/connection-'.$connection_id, $state_root);
 
     foreach (glob('/etc/bratonien-tools/nc-connector/webdav-connection-'.$connection_id.'.*') ?: array() as $file)
     {
       @unlink($file);
     }
+
+    $status_root = PHPWG_ROOT_PATH.'_data/bratonien-tools/nc-connector-status';
     @unlink($status_root.'/connection-'.$connection_id.'.json');
     @unlink($status_root.'/deleted-'.$connection_id);
   }
 
-  if ($removed_sites > 0 || $removed_images > 0)
+  if ($removed_sites > 0)
   {
-    update_category('all');
     invalidate_user_cache(true);
   }
 

runtime/lib/build_webdav_placeholder_source.py

@@ -3,7 +3,7 @@
 
 This creates only tiny placeholder files plus a metadata mapping; no Nextcloud
 original media is downloaded. The authenticated Nextcloud user is never used as
-an album name.
+an album name. Selecting the user's WebDAV root mirrors its children directly.
 """
 
 from __future__ import annotations
@@ -14,7 +14,6 @@ import getpass
 import json
 import os
 import shutil
-import socket
 import ssl
 import sys
 import tempfile
@@ -22,7 +21,6 @@ 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:"
@@ -54,37 +52,9 @@ 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, connect_ip: str = "") -> None:
+    def __init__(self, base_url: str, user: str, password: str, timeout: int = 30) -> 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
@@ -114,10 +84,9 @@ class WebDavClient:
         request.add_header("Depth", "1")
         request.add_header("Content-Type", "application/xml; charset=utf-8")
         try:
-            with pinned_resolution(self.host, self.connect_ip):
-                with urllib.request.urlopen(request, timeout=self.timeout, context=self.context) as response:
-                    status = response.status
-                    payload = response.read()
+            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")
@@ -127,14 +96,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("/")
@@ -244,7 +213,6 @@ 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")
@@ -273,7 +241,7 @@ def main() -> int:
             shutil.rmtree(staging)
         staging.mkdir(parents=True)
 
-        client = WebDavClient(args.base_url, args.user, password, max(1, args.timeout), args.connect_ip)
+        client = WebDavClient(args.base_url, args.user, password, max(1, args.timeout))
         mapping: dict[str, dict[str, object]] = {}
         manifest: list[str] = []
         total_files = total_folders = total_skipped = 0
@@ -281,32 +249,20 @@ def main() -> int:
 
         for remote_root_raw in args.root:
             remote_root = validate_relative(remote_root_raw)
-            current, root_children = client.list_collection(remote_root)
+            current, _ = client.list_collection(remote_root)
             fileid = int(current["fileid"])
             if fileid in used_fileids:
                 fail(f"duplicate selected Nextcloud root fileid: {fileid}")
             used_fileids.add(fileid)
+            # An explicitly selected folder keeps its own name. The authenticated
+            # user's WebDAV root is transparent and must never become an album.
+            display = "" if remote_root == "" else (str(current.get("display_name", "")).strip() or PurePosixPath(remote_root).name)
             local_name = f"root-{fileid}"
             local_root = staging / local_name
             files, folders, skipped = build_root(client, remote_root, local_root, seed, mapping)
             total_files += files
             total_folders += folders
             total_skipped += skipped
-
-            if remote_root == "":
-                for child in sorted(root_children, key=lambda item: str(item.get("display_name", "")).casefold()):
-                    name = safe_local_name(str(child.get("display_name", "")))
-                    child_fileid = int(child.get("fileid", 0))
-                    if child_fileid < 1:
-                        fail(f"Nextcloud returned no stable fileid for root child {name!r}")
-                    child_path = source_dir / local_name / name
-                    if bool(child.get("is_dir")):
-                        manifest.append(f"webdav:{child_fileid}\tfolder\t{name}\t{child_path}")
-                    elif Path(name).suffix.lower() in SUPPORTED_IMAGE_EXTENSIONS:
-                        manifest.append(f"webdav:{child_fileid}\tfile\t{name}\t{child_path}")
-                continue
-
-            display = str(current.get("display_name", "")).strip() or PurePosixPath(remote_root).name
             manifest.append(f"webdav:{fileid}\tfolder\t{display}\t{source_dir / local_name}")
 
         if previous.exists():
@@ -335,7 +291,6 @@ 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,
         })
@@ -344,7 +299,6 @@ 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),

runtime/lib/piwigo-sync.php

@@ -252,8 +252,6 @@ try
       );
       decode_ws(http_request($base_url.'/ws.php?format=json', array('method'=>'bratonien.nc.syncProductive', 'site_id'=>$site_id), $headers));
       $orphan = decode_ws(http_request($base_url.'/ws.php?format=json', array('method'=>'bratonien.nc.syncOrphans', 'site_id'=>$site_id, 'simulate'=>0), $headers));
-      // Entfernt alte technische bratonien-webdav-N Wrapper aus Site 1,
-      // nachdem deren generierte Verzeichnisse beim Reconcile entfernt wurden.
       if ($site_id !== 1)
       {
         decode_ws(http_request($base_url.'/ws.php?format=json', array('method'=>'bratonien.nc.syncOrphans', 'site_id'=>1, 'simulate'=>0), $headers));
@@ -284,16 +282,31 @@ try
   try
   {
     decode_ws(http_request($base_url.'/ws.php?format=json', array('method'=>'pwg.session.login', 'username'=>$fallback_user, 'password'=>$fallback_password), array(), $cookie_file));
-    http_request(
-      $base_url.'/admin.php?page=site_update&site='.$site_id,
-      array('sync'=>'files','display_info'=>1,'privacy_level'=>0,'sync_meta'=>1,'simulate'=>0,'subcats-included'=>1,'bratonien_connector'=>1,'submit'=>1),
+
+    // Der Fallback darf keinen zweiten Strukturpfad benutzen. Auch mit
+    // Benutzer/Passwort wird exakt derselbe Bratonien-Sync wie mit API-Key
+    // ausgefuehrt. Dadurch werden alte technische WebDAV-Kategorien entfernt
+    // und vorhandene Piwigo-Alben wiederverwendet.
+    decode_ws(http_request(
+      $base_url.'/ws.php?format=json',
+      array('method'=>'bratonien.nc.syncProductive', 'site_id'=>$site_id),
       array(),
       $cookie_file
-    );
-    $orphan = decode_ws(http_request($base_url.'/ws.php?format=json', array('method'=>'bratonien.nc.syncOrphans', 'site_id'=>$site_id, 'simulate'=>0), array(), $cookie_file));
+    ));
+    $orphan = decode_ws(http_request(
+      $base_url.'/ws.php?format=json',
+      array('method'=>'bratonien.nc.syncOrphans', 'site_id'=>$site_id, 'simulate'=>0),
+      array(),
+      $cookie_file
+    ));
     if ($site_id !== 1)
     {
-      decode_ws(http_request($base_url.'/ws.php?format=json', array('method'=>'bratonien.nc.syncOrphans', 'site_id'=>1, 'simulate'=>0), array(), $cookie_file));
+      decode_ws(http_request(
+        $base_url.'/ws.php?format=json',
+        array('method'=>'bratonien.nc.syncOrphans', 'site_id'=>1, 'simulate'=>0),
+        array(),
+        $cookie_file
+      ));
     }
     $added = (int)($orphan['added_orphans'] ?? 0);
     $deleted = (int)($orphan['deleted_orphans'] ?? 0);

runtime/lib/precache-webdav-previews.php

@@ -6,8 +6,6 @@ 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;
@@ -26,7 +24,7 @@ function quote_webdav_path($path)
 function fetch_remote_blob($url, $user, $password)
 {
   $ch = curl_init($url);
-  $options = array(
+  curl_setopt_array($ch, array(
     CURLOPT_RETURNTRANSFER => true,
     CURLOPT_FOLLOWLOCATION => false,
     CURLOPT_CONNECTTIMEOUT => 10,
@@ -34,10 +32,8 @@ 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.7.16',
-  );
-  bratonien_tools_nc_transport_apply_curl($options, $url);
-  curl_setopt_array($ch, $options);
+    CURLOPT_USERAGENT => 'Bratonien-Tools-WebDAV-Precache/0.9.6.1',
+  ));
   $body = curl_exec($ch);
   $errno = curl_errno($ch);
   $error = curl_error($ch);
@@ -52,11 +48,12 @@ 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'] ?? ''));
-  $extension = strtolower(pathinfo($path, PATHINFO_EXTENSION));
-  if ($extension === 'png') return 'png';
-  if ($extension === 'gif') return 'gif';
-  if ($extension === 'webp') return 'webp';
+  if ($content_type === 'image/png' || preg_match('/\.png$/', $path))
+  {
+    return 'png';
+  }
   return 'jpg';
 }
 
@@ -67,7 +64,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', 'gif', 'webp') as $ext)
+  foreach (array('jpg', 'png', 'webp') as $ext)
   {
     $candidate = $cache_dir.'/'.$key.'.'.$ext;
     if ($candidate !== $keep_target && is_file($candidate)) @unlink($candidate);
@@ -89,19 +86,13 @@ 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);
@@ -136,7 +127,7 @@ function write_preview_gd($blob, $target, $extension)
 
     try
     {
-      if (in_array($extension, array('png', 'gif', 'webp'), true))
+      if ($extension === 'png')
       {
         imagealphablending($preview, false);
         imagesavealpha($preview, true);
@@ -154,12 +145,10 @@ function write_preview_gd($blob, $target, $extension)
         fail_preview('GD konnte das Preview nicht skalieren.');
       }
 
-      if ($extension === 'png') $written = imagepng($preview, $target, 6);
-      elseif ($extension === 'gif') $written = function_exists('imagegif') ? imagegif($preview, $target) : false;
-      elseif ($extension === 'webp') $written = function_exists('imagewebp') ? imagewebp($preview, $target, BRATONIEN_WEBDAV_PREVIEW_JPEG_QUALITY) : false;
-      else $written = imagejpeg($preview, $target, BRATONIEN_WEBDAV_PREVIEW_JPEG_QUALITY);
-
-      if (!$written) fail_preview('GD konnte das Preview im Format '.$extension.' nicht schreiben.');
+      $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.');
     }
     finally
     {
@@ -175,7 +164,7 @@ function write_preview_gd($blob, $target, $extension)
 function write_preview($blob, $target, $extension)
 {
   $dir = dirname($target);
-  if (!is_dir($dir) && !mkdir($dir, 0775, true) && !is_dir($dir)) fail_preview('Preview-Verzeichnis konnte nicht angelegt werden.');
+  if (!is_dir($dir) && !mkdir($dir, 0755, true) && !is_dir($dir)) fail_preview('Preview-Verzeichnis konnte nicht angelegt werden.');
 
   if (class_exists('Imagick'))
   {
@@ -197,48 +186,7 @@ function write_preview($blob, $target, $extension)
     @unlink($target);
     fail_preview('Das erzeugte Preview ist ungültig.');
   }
-  @chmod($target, 0664);
-}
-
-function local_source_is_hydrated($source_path, $preview)
-{
-  if (!is_file($source_path) || !is_readable($source_path)) return false;
-  $source_size = @getimagesize($source_path);
-  $preview_size = @getimagesize($preview);
-  if (!is_array($source_size) || !is_array($preview_size)) return false;
-  if ((int)$source_size[0] !== (int)$preview_size[0] || (int)$source_size[1] !== (int)$preview_size[1]) return false;
-  $source_bytes = @filesize($source_path);
-  $preview_bytes = @filesize($preview);
-  return $source_bytes !== false && $preview_bytes !== false && (int)$source_bytes === (int)$preview_bytes;
-}
-
-function hydrate_local_source($source_path, $preview)
-{
-  $normalized = str_replace('\\', '/', (string)$source_path);
-  if (!preg_match('#/nc-webdav-source/connection-[0-9]+/root-[0-9]+/#', $normalized))
-  {
-    fail_preview('Unsicherer lokaler Connector-Quellpfad: '.$source_path);
-  }
-  if (!is_file($preview) || !is_readable($preview)) fail_preview('Preview für lokale Quelle fehlt: '.$preview);
-  if (local_source_is_hydrated($source_path, $preview)) return false;
-
-  $dir = dirname($source_path);
-  if (!is_dir($dir) && !mkdir($dir, 0775, true) && !is_dir($dir)) fail_preview('Lokales Connector-Verzeichnis konnte nicht angelegt werden: '.$dir);
-
-  $tmp = $source_path.'.bratonien-next-'.getmypid();
-  if (!@copy($preview, $tmp)) fail_preview('Preview konnte nicht in lokale Piwigo-Quelle kopiert werden: '.$source_path);
-  @chmod($tmp, 0664);
-  $mtime = @filemtime($preview);
-  if ($mtime) @touch($tmp, $mtime);
-  if (!@rename($tmp, $source_path))
-  {
-    @unlink($tmp);
-    fail_preview('Lokale Piwigo-Quelle konnte nicht ersetzt werden: '.$source_path);
-  }
-  clearstatcache(true, $source_path);
-  $size = @getimagesize($source_path);
-  if (!is_array($size) || empty($size[0]) || empty($size[1])) fail_preview('Lokale Piwigo-Quelle ist nach dem Ersetzen ungültig: '.$source_path);
-  return true;
+  @chmod($target, 0644);
 }
 
 try
@@ -260,8 +208,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, 0775, true) && !is_dir($cache_dir)) fail_preview('Preview-Cache konnte nicht angelegt werden.');
-  @chmod($cache_dir, 2775);
+  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);
 
   $state_file = $cache_dir.'/state.json';
   $old_state = array();
@@ -274,10 +222,9 @@ try
   $new_state = array();
   $generated = 0;
   $cached = 0;
-  $hydrated = 0;
   $errors = 0;
 
-  foreach ($mapping['files'] as $local_path=>$entry)
+  foreach ($mapping['files'] as $entry)
   {
     if (!is_array($entry) || (string)($entry['kind'] ?? '') !== 'file') continue;
     $webdav_path = trim((string)($entry['webdav_path'] ?? ''), '/');
@@ -294,29 +241,26 @@ 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
     {
-      $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++;
+      $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++;
     }
     catch (Throwable $e)
     {
@@ -329,14 +273,14 @@ try
   {
     if (!is_file($file) || basename($file) === 'state.json') continue;
     $name = basename($file);
-    if (!preg_match('/^([a-f0-9]{40})\.(jpg|png|gif|webp)$/', $name, $m)) continue;
+    if (!preg_match('/^([a-f0-9]{40})\.(jpg|png|webp)$/', $name, $m)) continue;
     if (!isset($new_state[$m[1]])) @unlink($file);
   }
 
   file_put_contents($state_file, json_encode($new_state, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT)."\n", LOCK_EX);
-  @chmod($state_file, 0664);
+  @chmod($state_file, 0644);
 
-  echo 'WebDAV-Previews: erzeugt='.$generated.' vorhanden='.$cached.' lokale_quellen='.$hydrated.' fehler='.$errors."\n";
+  echo 'WebDAV-Previews: erzeugt='.$generated.' vorhanden='.$cached.' fehler='.$errors."\n";
   exit($errors > 0 ? 1 : 0);
 }
 catch (Throwable $e)

runtime/lib/resolve-nextcloud-target.php

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

runtime/lib/shadow_tree.py

@@ -79,15 +79,23 @@ def preferred_target(source_key: str, raw_name: str, parent_target: Path, old_ma
     return safe_name(raw_name)
 
 
-def mirror_directory(source: Path, target: Path, source_key: str, target_key: Path, old_map: dict[str, str], new_map: dict[str, str]) -> None:
+def mirror_directory(
+    source: Path,
+    target: Path,
+    source_key: str,
+    target_key: Path,
+    old_map: dict[str, str],
+    new_map: dict[str, str],
+    used: set[str] | None = None,
+) -> None:
     target.mkdir(parents=True, exist_ok=True)
-    used: set[str] = set()
+    used_names = used if used is not None else set()
     for child in sorted(source.iterdir(), key=lambda item: (item.name.casefold(), item.name)):
         if child.is_symlink():
             continue
         child_source_key = f"{source_key}/{child.name}"
         preferred = preferred_target(child_source_key, child.name, target_key, old_map)
-        child_name = unique_name(preferred, used, child.is_file())
+        child_name = unique_name(preferred, used_names, child.is_file())
         child_target = target / child_name
         child_target_key = target_key / child_name
         new_map[child_source_key] = child_target_key.as_posix()
@@ -120,11 +128,26 @@ def build(manifest: Path, destination: Path, state_file: Path) -> None:
 
     try:
         used_roots: set[str] = set()
+        transparent_roots = 0
         for entry in sorted(entries, key=lambda item: (item["display_name"].casefold(), item["share_id"])):
             source = Path(entry["source_path"])
             source_key = f"share:{entry['share_id']}"
-            preferred = preferred_target(source_key, entry["display_name"], Path("."), old_map)
             is_file_share = entry["item_type"] == "file"
+
+            # Empty display_name is intentional: it represents the authenticated
+            # user's WebDAV root. Its children belong directly at destination;
+            # the Nextcloud username must never become an album wrapper.
+            if not is_file_share and entry["display_name"] == "":
+                transparent_roots += 1
+                if transparent_roots > 1:
+                    raise ValueError("only one transparent WebDAV root is allowed")
+                if not source.is_dir():
+                    raise FileNotFoundError(f"source is not a readable directory: {source}")
+                new_map[source_key] = "."
+                mirror_directory(source, staging, source_key, Path("."), old_map, new_map, used_roots)
+                continue
+
+            preferred = preferred_target(source_key, entry["display_name"], Path("."), old_map)
             root_name = unique_name(preferred, used_roots, is_file_share)
             root_key = Path(root_name)
             new_map[source_key] = root_key.as_posix()

runtime/native-runner.php

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

runtime/reconcile-webdav.php

@@ -78,11 +78,8 @@ function webdav_source_fingerprint($baseUrl, $user, array $roots)
 $pluginRoot = dirname(__DIR__);
 $piwigoRoot = dirname($pluginRoot, 2);
 $dbConfig = $piwigoRoot.'/local/config/database.inc.php';
-$nativeMode = getenv('BRATONIEN_NC_NATIVE') === '1';
-$configDir = trim((string)getenv('BRATONIEN_NC_CONFIG_DIR'));
-if ($configDir === '') $configDir = $nativeMode ? rtrim($piwigoRoot, '/').'/_data/bratonien-tools/nc-connector-runtime' : '/etc/bratonien-tools/nc-connector';
-$stateRoot = trim((string)getenv('BRATONIEN_NC_STATE_ROOT'));
-if ($stateRoot === '') $stateRoot = $nativeMode ? rtrim($piwigoRoot, '/').'/_data/bratonien-tools/nc-connector-state' : '/var/lib/bratonien-tools/nc-connector';
+$configDir = '/etc/bratonien-tools/nc-connector';
+$stateRoot = '/var/lib/bratonien-tools/nc-connector';
 $publicSourceRoot = rtrim($piwigoRoot, '/').'/_data/bratonien-tools/nc-webdav-source';
 $publicGalleryRoot = rtrim($piwigoRoot, '/').'/_data/bratonien-tools/nc-webdav-gallery';
 $legacyGalleryRoot = rtrim($piwigoRoot, '/').'/galleries';
@@ -110,12 +107,11 @@ try
   $rows = $db->query("SELECT id,name,adapter,config_json,secret_blob FROM `{$table}` ORDER BY id DESC");
   if (!$rows) fail_webdav_reconcile('Connector-Verbindungen konnten nicht gelesen werden: '.$db->error);
 
-  foreach (array($configDir, $stateRoot, $publicSourceRoot, $publicGalleryRoot) as $dir)
+  foreach (array($configDir, $publicSourceRoot, $publicGalleryRoot) as $dir)
   {
-    if (!is_dir($dir) && !mkdir($dir, $dir === $configDir ? 0700 : 0750, true)) fail_webdav_reconcile('Runtime-Verzeichnis konnte nicht angelegt werden: '.$dir);
+    if (!is_dir($dir) && !mkdir($dir, $dir === $configDir ? 0700 : 0755, true)) fail_webdav_reconcile('Runtime-Verzeichnis konnte nicht angelegt werden: '.$dir);
   }
   @chmod($configDir, 0700);
-  @chmod($stateRoot, 0750);
   @chmod($publicSourceRoot, 0755);
   @chmod($publicGalleryRoot, 0755);
 
@@ -154,7 +150,7 @@ try
       $seenFingerprints[$fingerprint] = $id;
       $known[$id] = true;
 
-      $stateDir = $nativeMode ? $stateRoot.'/connection-'.$id : rtrim((string)($config['state_dir'] ?? ''), '/');
+      $stateDir = rtrim((string)($config['state_dir'] ?? ''), '/');
       if ($stateDir === '') $stateDir = $stateRoot.'/connection-'.$id;
       if (!is_dir($stateDir) && !mkdir($stateDir, 0750, true)) fail_webdav_reconcile('State-Verzeichnis konnte nicht angelegt werden.');
       @chmod($stateDir, 0750);
@@ -223,7 +219,7 @@ try
       $config['parallel_gallery_root'] = $galleryRoot;
       $config['source_fingerprint'] = $fingerprint;
       $config['runtime'] = array(
-        'mode'=>$nativeMode ? 'piwigo-native-webdav' : 'webdav',
+        'mode'=>'webdav',
         'config'=>$configPath,
         'piwigo_sync_enabled'=>true,
         'reconciled_at'=>date('Y-m-d H:i:s'),

runtime/repair-webdav-cache-permissions.sh

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

runtime/run-all.sh

@@ -1,26 +1,10 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
+CONFIG_DIR="/etc/bratonien-tools/nc-connector"
 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
-PIWIGO_ROOT_DEFAULT="${BRATONIEN_NC_PIWIGO_ROOT:-$(cd -- "$SCRIPT_DIR/../../.." && pwd)}"
-CONFIG_DIR="${BRATONIEN_NC_CONFIG_DIR:-/etc/bratonien-tools/nc-connector}"
-NATIVE_MODE="${BRATONIEN_NC_NATIVE:-0}"
-TARGET_CONNECTION_ID="${BRATONIEN_NC_CONNECTION_ID:-0}"
-GLOBAL_LOCK_DIR="${PIWIGO_ROOT_DEFAULT%/}/_data/bratonien-tools/nc-connector-scheduler"
-GLOBAL_LOCK_FILE="$GLOBAL_LOCK_DIR/worker.lock"
-mkdir -p -- "$GLOBAL_LOCK_DIR"
-exec 8>"$GLOBAL_LOCK_FILE"
-if ! flock -n 8; then
-    echo "NC Connector: ein Lauf ist bereits aktiv."
-    exit 0
-fi
 shopt -s nullglob
 
-if [[ ! "$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"
@@ -55,14 +39,10 @@ write_route_status() {
     ' "$ROUTE_STATUS_FILE" "$route" "$label" "$detail" "$success"
 }
 
-if [[ "$NATIVE_MODE" != "1" ]]; then
-    php "$SCRIPT_DIR/reconcile.php"
-fi
+php "$SCRIPT_DIR/reconcile.php"
 php "$SCRIPT_DIR/reconcile-webdav.php"
 php "$SCRIPT_DIR/cleanup-webdav-piwigo.php"
-if [[ "$NATIVE_MODE" != "1" ]]; then
-    php "$SCRIPT_DIR/cleanup-stale.php"
-fi
+php "$SCRIPT_DIR/cleanup-stale.php"
 
 configs=("$CONFIG_DIR"/connection-*.conf)
 webdav_configs=("$CONFIG_DIR"/webdav-connection-*.conf)
@@ -75,21 +55,16 @@ 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
-[[ -n "$route_piwigo_root" ]] || route_piwigo_root="$PIWIGO_ROOT_DEFAULT"
+[[ -n "$route_piwigo_root" ]] || route_piwigo_root="/var/www/piwigo"
 ROUTE_STATUS_FILE="${route_piwigo_root%/}/_data/bratonien-tools/nc-connector-status/route-status.json"
 
 failure_count=0
 webdav_count=0
 local_count=0
 summary_parts=()
-matched_count=0
 
 for config in "${webdav_configs[@]}"; do
     [[ -f "$config" ]] || continue
@@ -101,11 +76,7 @@ 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=""
@@ -120,55 +91,43 @@ for config in "${webdav_configs[@]}"; do
     fi
 done
 
-if [[ "$NATIVE_MODE" != "1" ]]; then
-    for config in "${configs[@]}"; do
-        [[ -f "$config" ]] || continue
-        name="$(basename "$config")"
-        connection_id="0"
-        if [[ "$name" =~ ^connection-([0-9]+)\.conf$ ]]; then
-            connection_id="${BASH_REMATCH[1]}"
-        fi
-        if [[ "$connection_id" -lt 1 ]]; then
-            echo "NC Connector: $name besitzt keine gueltige Verbindungs-ID." >&2
-            failure_count=$((failure_count + 1))
-            summary_parts+=("$name: ungueltige Verbindungs-ID")
-            continue
-        fi
-        if [[ "$TARGET_CONNECTION_ID" -gt 0 && "$connection_id" != "$TARGET_CONNECTION_ID" ]]; then
-            continue
-        fi
+for config in "${configs[@]}"; do
+    [[ -f "$config" ]] || continue
+    name="$(basename "$config")"
+    connection_id="0"
+    if [[ "$name" =~ ^connection-([0-9]+)\.conf$ ]]; then
+        connection_id="${BASH_REMATCH[1]}"
+    fi
+    if [[ "$connection_id" -lt 1 ]]; then
+        echo "NC Connector: $name besitzt keine gueltige Verbindungs-ID." >&2
+        failure_count=$((failure_count + 1))
+        summary_parts+=("$name: ungueltige Verbindungs-ID")
+        continue
+    fi
 
-        matched_count=$((matched_count + 1))
-        piwigo_root="$(read_config_value PIWIGO_ROOT "$config")"
-        [[ -n "$piwigo_root" ]] || piwigo_root="$PIWIGO_ROOT_DEFAULT"
-        tombstone_dir="${piwigo_root%/}/_data/bratonien-tools/nc-connector-status"
-        if [[ -f "$tombstone_dir/deleted-$connection_id" ]]; then
-            echo "NC Connector: Verbindung $connection_id wurde geloescht; Laufzeitdateien werden entfernt."
-            rm -f -- "$CONFIG_DIR/connection-$connection_id.conf" \
-                "$CONFIG_DIR/connection-$connection_id.db-password" \
-                "$CONFIG_DIR/connection-$connection_id.piwigo-password" \
-                "$CONFIG_DIR/connection-$connection_id.storages.tsv" \
-                "$CONFIG_DIR/connection-$connection_id.roots.tsv"
-            rm -f -- "$tombstone_dir/deleted-$connection_id"
-            continue
-        fi
+    piwigo_root="$(read_config_value PIWIGO_ROOT "$config")"
+    [[ -n "$piwigo_root" ]] || piwigo_root="/var/www/piwigo"
+    tombstone_dir="${piwigo_root%/}/_data/bratonien-tools/nc-connector-status"
+    if [[ -f "$tombstone_dir/deleted-$connection_id" ]]; then
+        echo "NC Connector: Verbindung $connection_id wurde geloescht; Laufzeitdateien werden entfernt."
+        rm -f -- "$CONFIG_DIR/connection-$connection_id.conf" \
+            "$CONFIG_DIR/connection-$connection_id.db-password" \
+            "$CONFIG_DIR/connection-$connection_id.piwigo-password" \
+            "$CONFIG_DIR/connection-$connection_id.storages.tsv" \
+            "$CONFIG_DIR/connection-$connection_id.roots.tsv"
+        rm -f -- "$tombstone_dir/deleted-$connection_id"
+        continue
+    fi
 
-        local_count=$((local_count + 1))
-        echo "NC Connector Local #$connection_id: $name"
-        if env PIWIGO_CONFIG="$config" bash "$SCRIPT_DIR/sync.sh"; then
-            summary_parts+=("Local #$connection_id erfolgreich")
-        else
-            failure_count=$((failure_count + 1))
-            summary_parts+=("Local #$connection_id fehlgeschlagen")
-        fi
-    done
-fi
-
-if [[ "$TARGET_CONNECTION_ID" -gt 0 && "$matched_count" -eq 0 ]]; then
-    write_route_status "failed" "FEHLER - Verbindung #$TARGET_CONNECTION_ID" "Keine Laufzeitkonfiguration für Verbindung #$TARGET_CONNECTION_ID gefunden." "0"
-    echo "NC Connector: keine Laufzeitkonfiguration für Verbindung #$TARGET_CONNECTION_ID gefunden." >&2
-    exit 1
-fi
+    local_count=$((local_count + 1))
+    echo "NC Connector Local #$connection_id: $name"
+    if env PIWIGO_CONFIG="$config" bash "$SCRIPT_DIR/sync.sh"; then
+        summary_parts+=("Local #$connection_id erfolgreich")
+    else
+        failure_count=$((failure_count + 1))
+        summary_parts+=("Local #$connection_id fehlgeschlagen")
+    fi
+done
 
 summary_detail="$(IFS='; '; printf '%s' "${summary_parts[*]}")"
 [[ -n "$summary_detail" ]] || summary_detail="Keine Verbindung wurde ausgefuehrt."
@@ -185,10 +144,10 @@ if [[ "$failure_count" -eq 0 ]]; then
         label="Local"
     fi
     write_route_status "$route" "$label" "$summary_detail" "1"
-    echo "NC Connector: angeforderte Verbindung wurde erfolgreich verarbeitet."
+    echo "NC Connector: alle Verbindungen wurden erfolgreich verarbeitet."
     exit 0
 fi
 
-write_route_status "failed" "FEHLER - angeforderte Verbindung" "$summary_detail" "0"
-echo "NC Connector: die angeforderte Verbindung ist fehlgeschlagen." >&2
+write_route_status "failed" "FEHLER - mindestens eine Verbindung" "$summary_detail" "0"
+echo "NC Connector: mindestens eine Verbindung ist fehlgeschlagen." >&2
 exit 1

runtime/sync-webdav.sh

@@ -75,12 +75,8 @@ 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[@]}" \
@@ -138,9 +134,21 @@ if [[ "${PIWIGO_SYNC_ENABLED:-0}" == "1" ]]; then
         exit "$PIWIGO_EXIT"
     fi
 
+    MEDIA_UNIT="bratonien-nc-media-${CONNECTION_ID}-$(date +%s)"
+    if ! systemd-run \
+        --quiet \
+        --collect \
+        --unit="$MEDIA_UNIT" \
+        --property=RuntimeMaxSec=30min \
+        --setenv="PIWIGO_CONFIG=$CONFIG_FILE" \
+        /usr/bin/env bash "$SCRIPT_DIR/build-webdav-media.sh"; then
+        write_status error "Bildaufbereitung konnte nicht im Hintergrund gestartet werden"
+        exit 1
+    fi
+
     if grep -q 'Piwigo-Synchronisierung per API erfolgreich' <<<"$PIWIGO_OUTPUT"; then
         write_status ok \
-            "WebDAV eingelesen und Piwigo synchronisiert" \
+            "WebDAV eingelesen und Piwigo synchronisiert; Bildaufbereitung läuft im Hintergrund" \
             "" \
             "api" \
             "ok" \
@@ -149,7 +157,7 @@ if [[ "${PIWIGO_SYNC_ENABLED:-0}" == "1" ]]; then
             "Fallback wurde nicht benötigt"
     elif grep -q 'Piwigo-Datenbanksynchronisierung per Benutzername/Passwort-Fallback erfolgreich' <<<"$PIWIGO_OUTPUT"; then
         write_status ok \
-            "WebDAV eingelesen und Piwigo über Fallback synchronisiert" \
+            "WebDAV eingelesen und Piwigo über Fallback synchronisiert; Bildaufbereitung läuft im Hintergrund" \
             "" \
             "fallback" \
             "not_used" \
@@ -157,7 +165,7 @@ if [[ "${PIWIGO_SYNC_ENABLED:-0}" == "1" ]]; then
             "ok" \
             "Benutzername/Passwort-Fallback erfolgreich"
     else
-        write_status ok "WebDAV eingelesen und Piwigo synchronisiert"
+        write_status ok "WebDAV eingelesen und Piwigo synchronisiert; Bildaufbereitung läuft im Hintergrund"
     fi
 else
     write_status ok "WebDAV eingelesen; Piwigo-Synchronisierung ist für diese Verbindung deaktiviert"

template/admin_tabs.tpl

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

webdav-image.php

@@ -8,7 +8,6 @@ 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)
 {
@@ -121,7 +120,7 @@ $options = array(
   CURLOPT_USERPWD => $user.':'.$password,
   CURLOPT_RETURNTRANSFER => false,
   CURLOPT_FAILONERROR => false,
-  CURLOPT_USERAGENT => 'Bratonien-Tools-WebDAV-Image/0.9.7.16',
+  CURLOPT_USERAGENT => 'Bratonien-Tools-WebDAV-Image/0.9.6.1',
   CURLOPT_HEADERFUNCTION => function($ch, $line)
   {
     $length = strlen($line);
@@ -148,7 +147,6 @@ $options = array(
     return strlen($data);
   },
 );
-bratonien_tools_nc_transport_apply_curl($options, $url);
 if (!empty($_SERVER['HTTP_RANGE']))
 {
   $range = trim((string)$_SERVER['HTTP_RANGE']);