0.9.7.22: Version anheben

0.9.7.21: Originalmaße direkt in Platzhalter tragen

include/nc_connector_delete_safe.inc.php

@@ -4,58 +4,84 @@ if (!defined('PHPWG_ROOT_PATH'))
   die('Hacking attempt!');
 }
 
-function bratonien_tools_nc_connector_webdav_site_id(array $connection)
+function bratonien_tools_nc_connector_db_prefix_from_absolute($path)
 {
-  $config = isset($connection['config']) && is_array($connection['config']) ? $connection['config'] : array();
-  if ((string)($connection['adapter'] ?? '') !== 'remote') return 0;
-  if ((string)($config['source_mode'] ?? '') !== 'webdav-placeholder') return 0;
+  $path = rtrim(str_replace('\\', '/', (string)$path), '/');
+  $piwigo_root = rtrim(str_replace('\\', '/', PHPWG_ROOT_PATH), '/');
+  if ($path === '' || strpos($path, $piwigo_root.'/') !== 0) return '';
 
-  $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;
-
-  $relative = ltrim(substr($gallery_root, strlen($piwigo_root)), '/');
-  if ($relative === '') return 0;
-  $site_url = './'.rtrim($relative, '/').'/';
-
-  $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;
-
-  $row = pwg_db_fetch_assoc($result);
-  return (int)$row['id'];
+  $relative = ltrim(substr($path, strlen($piwigo_root)), '/');
+  return $relative === '' ? '' : './'.rtrim($relative, '/').'/';
 }
 
-function bratonien_tools_nc_connector_gallery_db_prefix(array $connection)
+function bratonien_tools_nc_connector_owned_db_prefixes(array $connection)
 {
-  $config = isset($connection['config']) && is_array($connection['config']) ? $connection['config'] : array();
-  $gallery_root = rtrim((string)($config['parallel_gallery_root'] ?? ''), '/');
-  $piwigo_root = rtrim(PHPWG_ROOT_PATH, '/');
-  if ($gallery_root === '' || strpos($gallery_root, $piwigo_root.'/') !== 0) return '';
+  $id = (int)($connection['id'] ?? 0);
+  if ($id < 1) return array();
 
-  $relative = ltrim(substr($gallery_root, strlen($piwigo_root)), '/');
-  return $relative === '' ? '' : './'.rtrim($relative, '/').'/';
+  $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;
+
+  return array_values(array_unique($prefixes));
+}
+
+function bratonien_tools_nc_connector_owned_site_urls(array $connection)
+{
+  $id = (int)($connection['id'] ?? 0);
+  if ($id < 1) return array();
+
+  $urls = array(
+    './_data/bratonien-tools/nc-webdav-gallery/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 !== '') $urls[] = $configured;
+
+  return array_values(array_unique($urls));
 }
 
 function bratonien_tools_nc_connector_remove_webdav_piwigo_content(array $connection)
 {
   include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
 
-  $site_id = bratonien_tools_nc_connector_webdav_site_id($connection);
-  $db_prefix = bratonien_tools_nc_connector_gallery_db_prefix($connection);
-  if ($db_prefix === '') return array('site_id'=>$site_id, 'images'=>0);
+  $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 '\\\\'";
+  }
 
-  $escaped = pwg_db_real_escape_string(addcslashes($db_prefix, '_%\\'));
   $image_rows = array();
   $result = pwg_query(
-    "SELECT id, path, representative_ext FROM ".IMAGES_TABLE.
-    " WHERE path LIKE '".$escaped."%' ESCAPE '\\\\'"
+    'SELECT id, path, representative_ext FROM '.IMAGES_TABLE.
+    ' WHERE '.implode(' OR ', $where)
   );
   while ($row = pwg_db_fetch_assoc($result))
   {
-    if (strpos((string)$row['path'], $db_prefix) !== 0) continue;
+    $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;
   }
@@ -77,13 +103,23 @@ function bratonien_tools_nc_connector_remove_webdav_piwigo_content(array $connec
     delete_elements(array_map('intval', array_keys($image_rows)), false);
   }
 
-  if ($site_id > 0)
+  $site_count = 0;
+  foreach (bratonien_tools_nc_connector_owned_site_urls($connection) as $site_url)
   {
-    delete_site($site_id);
+    $result = pwg_query(
+      "SELECT id FROM ".SITES_TABLE.
+      " WHERE galleries_url='".pwg_db_real_escape_string($site_url)."'"
+    );
+    while ($row = pwg_db_fetch_assoc($result))
+    {
+      delete_site((int)$row['id']);
+      $site_count++;
+    }
   }
 
+  update_category('all');
   invalidate_user_cache(true);
-  return array('site_id'=>$site_id, 'images'=>count($image_rows));
+  return array('sites'=>$site_count, 'images'=>count($image_rows));
 }
 
 /**
@@ -99,7 +135,7 @@ function bratonien_tools_nc_connector_delete_safe()
     throw new RuntimeException('Connector-Verbindung wurde nicht gefunden.');
   }
 
-  $cleanup = array('site_id'=>0, 'images'=>0);
+  $cleanup = array('sites'=>0, 'images'=>0);
   if (
     (string)($connection['adapter'] ?? '') === 'remote'
     && (string)($connection['config']['source_mode'] ?? '') === 'webdav-placeholder'

include/nc_legacy_reset.inc.php

@@ -1,115 +0,0 @@
-<?php
-if (!defined('PHPWG_ROOT_PATH'))
-{
-  die('Hacking attempt!');
-}
-
-function bratonien_tools_nc_legacy_remove_tree($path, $allowed_root)
-{
-  $path = rtrim(str_replace('\\', '/', (string)$path), '/');
-  $allowed_root = rtrim(str_replace('\\', '/', (string)$allowed_root), '/');
-  if ($path === '' || $allowed_root === '' || $path === $allowed_root || strpos($path, $allowed_root.'/') !== 0)
-  {
-    return 0;
-  }
-  if (!file_exists($path) && !is_link($path)) return 0;
-
-  if (is_link($path) || is_file($path))
-  {
-    return @unlink($path) ? 1 : 0;
-  }
-
-  $removed = 0;
-  $items = @scandir($path);
-  if (is_array($items))
-  {
-    foreach ($items as $item)
-    {
-      if ($item === '.' || $item === '..') continue;
-      $removed += bratonien_tools_nc_legacy_remove_tree($path.'/'.$item, $allowed_root);
-    }
-  }
-  if (@rmdir($path)) $removed++;
-  return $removed;
-}
-
-function bratonien_tools_nc_legacy_remove_state_files($state_root)
-{
-  $removed = 0;
-  foreach (glob(rtrim($state_root, '/').'/connection-*') ?: array() as $connection_dir)
-  {
-    if (!is_dir($connection_dir)) continue;
-    foreach (array('webdav-map.json', 'webdav-manifest.tsv', 'webdav-shadow-map.json') as $name)
-    {
-      $path = $connection_dir.'/'.$name;
-      if (is_file($path) && @unlink($path)) $removed++;
-    }
-  }
-  return $removed;
-}
-
-function bratonien_tools_nc_reset_legacy_imports()
-{
-  include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
-
-  $ids = array();
-  $result = pwg_query(
-    "SELECT id FROM ".IMAGES_TABLE.
-    " WHERE path LIKE '%nc-webdav-source/connection-%'"
-  );
-  while ($row = pwg_db_fetch_assoc($result))
-  {
-    $ids[] = (int)$row['id'];
-  }
-
-  if ($ids)
-  {
-    delete_elements($ids, false);
-  }
-
-  $data_root = rtrim(PHPWG_ROOT_PATH, '/').'/_data';
-  $tool_root = $data_root.'/bratonien-tools';
-  $removed_files = 0;
-  foreach (array(
-    $tool_root.'/nc-webdav-source',
-    $tool_root.'/nc-webdav-preview',
-    $tool_root.'/nc-webdav-gallery',
-  ) as $generated_root)
-  {
-    $removed_files += bratonien_tools_nc_legacy_remove_tree($generated_root, $data_root);
-  }
-
-  if (defined('PWG_DERIVATIVE_DIR'))
-  {
-    $derivative_root = rtrim(PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR, '/');
-    foreach (array(
-      $derivative_root.'/_data/bratonien-tools/nc-webdav-source',
-      $derivative_root.'/_data/bratonien-tools/nc-webdav-gallery',
-    ) as $generated_derivative_root)
-    {
-      $removed_files += bratonien_tools_nc_legacy_remove_tree($generated_derivative_root, $derivative_root);
-    }
-  }
-
-  $removed_state_files = bratonien_tools_nc_legacy_remove_state_files($tool_root.'/nc-connector-state');
-
-  if ($ids)
-  {
-    update_category('all');
-    invalidate_user_cache(true);
-  }
-
-  $result = array(
-    'timestamp'=>time(),
-    'removed_image_records'=>count($ids),
-    'removed_generated_entries'=>$removed_files,
-    'removed_state_files'=>$removed_state_files,
-  );
-
-  if (function_exists('conf_update_param'))
-  {
-    conf_update_param('bratonien_nc_legacy_reset_0977', json_encode($result));
-  }
-
-  return $result;
-}

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.',
       ),
     ),
-    'Synchronizes the NC Connector into the existing Piwigo album hierarchy.',
+    'Runs the approved direct Bratonien filesystem synchronization for the NC Connector.',
     null,
     array(
       'admin_only' => true,
@@ -35,97 +35,6 @@ 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 = '
-SELECT id, dir, name
-  FROM '.CATEGORIES_TABLE.'
-  WHERE '.$where_parent.'
-    AND (
-      dir = \''.$dir_sql.'\'
-      OR LOWER(name) = LOWER(\''.$name_sql.'\')
-    )
-  ORDER BY CASE WHEN dir = \''.$dir_sql.'\' THEN 0 ELSE 1 END, id
-  LIMIT 1
-;';
-  $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)
-{
-  // Bestehende Piwigo-Alben gehoeren nicht automatisch dem Connector.
-  // Ohne eindeutige Connector-Eigentumsmarkierung darf hier nichts geloescht werden.
-  return 0;
-}
-
 function bratonien_tools_ws_nc_sync_productive($params, &$service)
 {
   global $conf, $user;
@@ -133,94 +42,181 @@ 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.'.');
+    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.'
+    );
   }
+
   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');
 
-  $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.');
+  $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.');
+  }
+
   list($site_url) = pwg_db_fetch_row($result);
-  if (url_is_remote($site_url)) return new PwgError(400, 'Remote Piwigo sites are not supported.');
+  if (url_is_remote($site_url))
+  {
+    return new PwgError(400, 'Remote Piwigo sites are not supported by this synchronization method.');
+  }
 
   $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.');
+  }
 
-  $basedir = preg_replace('#/*$#', '', (string)$site_url);
+  list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW()'));
   $errors = array();
   $counts = array(
-    'reused_categories'=>0,
-    'new_categories'=>0,
-    'removed_duplicate_categories'=>0,
-    'new_elements'=>0,
-    'del_elements'=>0,
-    'upd_elements'=>0,
+    '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,
   );
 
   try
   {
-    list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW()'));
-    $fs_dirs = $site_reader->get_full_directories($basedir);
-    usort($fs_dirs, function($a, $b)
-    {
-      return substr_count((string)$a, '/') <=> substr_count((string)$b, '/');
-    });
+    $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);
 
-    $album_cache = array();
-    $created_ids = array();
-    $dir_to_album = array();
-    foreach ($fs_dirs as $full_dir)
+    $next_rank = array('NULL'=>1);
+    $result = pwg_query('SELECT id FROM '.CATEGORIES_TABLE);
+    while ($row = pwg_db_fetch_assoc($result))
     {
-      $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)
-      {
-        $dir_to_album[$full_dir] = $album_id;
-        if (count($created_ids) === $before) $counts['reused_categories']++;
-      }
+      $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'];
+    }
+
+    $next_id = pwg_db_nextval('id', CATEGORIES_TABLE);
+    $category_inserts = array();
+
+    foreach (array_diff($fs_fulldirs, array_keys($db_fulldirs)) as $fulldir)
+    {
+      $dir = basename($fulldir);
+      if (!preg_match($conf['sync_chars_regex'], $dir))
+      {
+        bratonien_tools_nc_productive_error($errors, $fulldir, 'PWG-UPDATE-1');
+        continue;
+      }
+
+      $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);
-    $db_elements = bratonien_tools_nc_managed_images($basedir);
-    $db_by_path = array_flip($db_elements);
-
-    // Nicht-destruktiver Schutz: Bestehende Piwigo-Bilder werden niemals allein
-    // deshalb geloescht, weil sie im aktuellen WebDAV-Scan nicht vorkommen.
-    // Das Entfernen ist erst wieder zulaessig, wenn Connector-Eigentum eindeutig
-    // und verbindungsbezogen gespeichert wird.
+    $cat_ids = array_diff(array_keys($db_categories), $to_delete_categories);
+    $db_elements = array();
+    if ($cat_ids)
+    {
+      $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');
+    }
 
     $next_element_id = pwg_db_nextval('id', IMAGES_TABLE);
     $image_inserts = array();
     $image_links = array();
-    $new_ids = array();
-    $all_ids = array();
+    $format_inserts = array();
+    $new_image_ids = array();
 
-    foreach ($fs as $path=>$file_info)
+    foreach (array_diff(array_keys($fs), $db_elements) as $path)
     {
       $dirname = dirname($path);
-      $relative_dir = bratonien_tools_nc_relative_path($basedir, $dirname);
-      $category_id = null;
-      if ($relative_dir !== '')
+      if (!isset($db_fulldirs[$dirname]))
       {
-        $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]))
-      {
-        // Altbestand niemals umhaengen. Vorhandene Bild-Album-Zuordnungen bleiben
-        // exakt bestehen; der Connector darf nur neue Datensaetze ergaenzen.
-        $all_ids[] = (int)$db_by_path[$path];
         continue;
       }
 
@@ -233,42 +229,116 @@ 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'=>$file_info['representative_ext'],
-        'storage_category_id'=>null,
-        'added_by'=>(int)$user['id'],
+        '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'],
       );
-      if ($category_id !== null)
+      $image_links[] = array('image_id'=>$id, 'category_id'=>$db_fulldirs[$dirname]);
+      $new_image_ids[] = $id;
+
+      if (!empty($conf['enable_formats']) && !empty($fs[$path]['formats']))
       {
-        $image_links[] = array('image_id'=>$id, 'category_id'=>$category_id);
+        foreach ($fs[$path]['formats'] as $ext => $filesize)
+        {
+          $format_inserts[] = array('image_id'=>$id, 'ext'=>$ext, 'filesize'=>$filesize);
+        }
       }
-      $new_ids[] = $id;
-      $all_ids[] = $id;
     }
 
     if ($image_inserts)
     {
       mass_inserts(IMAGES_TABLE, array_keys($image_inserts[0]), $image_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);
+      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);
     }
 
-    // Bestehende Bilder werden nicht durch den Connector aktualisiert. Nur neu
-    // angelegte Connector-Bilder erhalten die aus der Quelle ermittelten Attribute.
-    $updates = array();
-    foreach ($new_ids as $id)
+    if (!empty($conf['enable_formats']) && $db_elements)
     {
-      $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;
+      $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)
+    {
+      $data = $site_reader->get_element_update_attributes($file['path']);
+      if (!is_array($data))
+      {
+        continue;
+      }
+      $data['id'] = $id;
       $updates[] = $data;
     }
     if ($updates)
@@ -281,25 +351,94 @@ 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();
+    invalidate_user_cache(true);
 
-    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,
-    );
+    // 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 $error)
+  catch (Throwable $e)
   {
-    return new PwgError(500, 'Bratonien NC synchronization failed: '.$error->getMessage());
+    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'] : '',
+  );
 }

include/watermark_engine.inc.php

@@ -23,7 +23,6 @@ function bratonien_tools_watermark_engine_enabled()
   // Piwigo recalculates use_watermark for custom derivatives from the native
   // watermark file itself. Therefore an active Bratonien engine must keep the
   // native watermark file empty, not only the stored use_watermark flags false.
-  // This initialization is required only once per PHP request.
   if ($enabled)
   {
     bratonien_tools_disable_piwigo_watermarks();

include/watermark_runtime.inc.php

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

include/webdav_image_runtime.inc.php

@@ -7,9 +7,6 @@ if (!defined('PHPWG_ROOT_PATH'))
 function bratonien_tools_webdav_image_source_info($image_id)
 {
   static $cache = array();
-  static $connection_cache = array();
-  static $mapping_cache = array();
-
   $image_id = (int)$image_id;
   if ($image_id < 1) return null;
   if (array_key_exists($image_id, $cache)) return $cache[$image_id];
@@ -23,12 +20,12 @@ function bratonien_tools_webdav_image_source_info($image_id)
   $absolute = $path;
   if (strpos($absolute, '/') !== 0)
   {
-    $absolute = PHPWG_ROOT_PATH.ltrim(preg_replace('#^\\./#', '', $absolute), '/');
+    $absolute = PHPWG_ROOT_PATH.ltrim(preg_replace('#^\./#', '', $absolute), '/');
   }
   $resolved = realpath($absolute);
   if ($resolved === false) return $cache[$image_id] = null;
 
-  $normalized = str_replace('\\\\', '/', $resolved);
+  $normalized = str_replace('\\', '/', $resolved);
   if (!preg_match('#/nc-webdav-source/connection-([0-9]+)/root-([0-9]+)/(.*)$#', $normalized, $match))
   {
     return $cache[$image_id] = null;
@@ -39,82 +36,60 @@ function bratonien_tools_webdav_image_source_info($image_id)
   $relative_path = trim((string)$match[3], '/');
   if ($relative_path === '') return $cache[$image_id] = null;
 
-  if (!array_key_exists($connection_id, $connection_cache))
-  {
-    $table = defined('BRATONIEN_TOOLS_NC_CONNECTIONS_TABLE')
-      ? BRATONIEN_TOOLS_NC_CONNECTIONS_TABLE
-      : $GLOBALS['prefixeTable'].'bratonien_tools_nc_connections';
-    $connection_result = pwg_query('SELECT config_json FROM `'.$table.'` WHERE id='.$connection_id.' LIMIT 1');
-    if (!pwg_db_num_rows($connection_result))
-    {
-      $connection_cache[$connection_id] = null;
-    }
-    else
-    {
-      $connection_row = pwg_db_fetch_assoc($connection_result);
-      $decoded = json_decode((string)$connection_row['config_json'], true);
-      $connection_cache[$connection_id] = is_array($decoded) ? $decoded : null;
-    }
-  }
-
-  $config = $connection_cache[$connection_id];
+  $table = defined('BRATONIEN_TOOLS_NC_CONNECTIONS_TABLE')
+    ? BRATONIEN_TOOLS_NC_CONNECTIONS_TABLE
+    : $GLOBALS['prefixeTable'].'bratonien_tools_nc_connections';
+  $connection_result = pwg_query('SELECT config_json FROM `'.$table.'` WHERE id='.$connection_id.' LIMIT 1');
+  if (!pwg_db_num_rows($connection_result)) return $cache[$image_id] = null;
+  $connection_row = pwg_db_fetch_assoc($connection_result);
+  $config = json_decode((string)$connection_row['config_json'], true);
   if (!is_array($config) || (string)($config['source_mode'] ?? '') !== 'webdav-placeholder')
   {
     return $cache[$image_id] = null;
   }
 
   $root_path = '';
-  $root_found = false;
   $roots = isset($config['roots']) && is_array($config['roots']) ? $config['roots'] : array();
   foreach ($roots as $root)
   {
     if ((int)($root['fileid'] ?? 0) === $root_fileid)
     {
       $root_path = trim((string)($root['webdav_path'] ?? ''), '/');
-      $root_found = true;
       break;
     }
   }
-  if (!$root_found) return $cache[$image_id] = null;
+  if ($root_path === '') return $cache[$image_id] = null;
 
-  $root_is_base = $root_path === '';
-  $webdav_path = $root_is_base ? $relative_path : $root_path.'/'.$relative_path;
+  $webdav_path = $root_path.'/'.$relative_path;
   $content_type = '';
   $size = 0;
   $etag = '';
 
-  if (!array_key_exists($connection_id, $mapping_cache))
+  $state_dir = rtrim((string)($config['state_dir'] ?? ''), '/');
+  if ($state_dir !== '')
   {
-    $mapping_cache[$connection_id] = array();
-    $state_dir = rtrim((string)($config['state_dir'] ?? ''), '/');
-    if ($state_dir !== '')
+    $mapping_file = $state_dir.'/webdav-map.json';
+    if (is_readable($mapping_file))
     {
-      $mapping_file = $state_dir.'/webdav-map.json';
-      if (is_readable($mapping_file))
+      $mapping = json_decode((string)file_get_contents($mapping_file), true);
+      if (is_array($mapping) && isset($mapping['files']) && is_array($mapping['files']))
       {
-        $mapping = json_decode((string)file_get_contents($mapping_file), true);
-        if (is_array($mapping) && isset($mapping['files']) && is_array($mapping['files']))
+        $entry = $mapping['files'][$resolved] ?? $mapping['files'][$normalized] ?? null;
+        if (is_array($entry) && (string)($entry['kind'] ?? '') === 'file')
         {
-          $mapping_cache[$connection_id] = $mapping['files'];
+          $webdav_path = trim((string)($entry['webdav_path'] ?? $webdav_path), '/');
+          $content_type = (string)($entry['content_type'] ?? '');
+          $size = (int)($entry['size'] ?? 0);
+          $etag = (string)($entry['etag'] ?? '');
         }
       }
     }
   }
 
-  $entry = $mapping_cache[$connection_id][$resolved] ?? $mapping_cache[$connection_id][$normalized] ?? null;
-  if (is_array($entry) && (string)($entry['kind'] ?? '') === 'file')
-  {
-    $webdav_path = trim((string)($entry['webdav_path'] ?? $webdav_path), '/');
-    $content_type = (string)($entry['content_type'] ?? '');
-    $size = (int)($entry['size'] ?? 0);
-    $etag = (string)($entry['etag'] ?? '');
-  }
-
   return $cache[$image_id] = array(
     'image_id'=>$image_id,
     'connection_id'=>$connection_id,
     'webdav_path'=>$webdav_path,
-    'root_is_base'=>$root_is_base,
     'content_type'=>$content_type,
     'size'=>$size,
     'etag'=>$etag,
@@ -437,16 +412,8 @@ function bratonien_tools_filter_webdav_src_url($url, $src_image)
 function bratonien_tools_filter_webdav_derivative_url($url, $params, $src_image, $rel_url)
 {
   if (!is_object($src_image) || empty($src_image->id)) return $url;
-
-  // Hotpath: Bei einem bereits vorbereiteten WebDAV-Derivat keinerlei
-  // Connection-DB oder Mapping-Datei mehr anfassen. Der reale Quellpfad
-  // reicht aus, um Connector-Bilder sicher zu erkennen.
-  $source_path = $src_image->get_path();
-  $resolved_source = $source_path !== '' ? realpath($source_path) : false;
-  if ($resolved_source === false || !preg_match('#/nc-webdav-source/connection-[0-9]+/root-[0-9]+/#', str_replace('\\\\', '/', $resolved_source)))
-  {
-    return $url;
-  }
+  $info = bratonien_tools_webdav_image_source_info((int)$src_image->id);
+  if (!$info) return $url;
 
   try
   {

js/admin_tabs.js

@@ -1,94 +1,6 @@
 (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;
@@ -201,14 +113,9 @@
     activate(initial, false);
   }
 
-  function init() {
-    initBratonienTabs();
-    initNcRouteStatus();
-  }
-
   if (document.readyState === 'loading') {
-    document.addEventListener('DOMContentLoaded', init);
+    document.addEventListener('DOMContentLoaded', initBratonienTabs);
   } else {
-    init();
+    initBratonienTabs();
   }
 })();

js/nc_connector_edit_v2.js

@@ -1,236 +1,59 @@
 (function () {
   'use strict';
 
-  function ready(callback) {
-    if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', callback);
-    else callback();
-  }
-
-  ready(function () {
+  function restoreRunNowButtons() {
     var section = document.getElementById('nc-connector');
     if (!section) return;
 
-    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);
+    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;
+      }
     }
+    if (!connectionCard) return;
 
-    function escapeHtml(value) {
-      return String(value == null ? '' : value).replace(/[&<>"']/g, function (c) {
-        return {'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&#039;'}[c];
-      });
-    }
+    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 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;
-        });
-      });
-    }
+      var connectionInput = detail.querySelector('input[name="connection_id"]');
+      var tokenInput = detail.querySelector('input[name="pwg_token"]');
+      if (!connectionInput || !tokenInput) return;
 
-    function createPostForm(label, tool, id) {
       var form = document.createElement('form');
       form.method = 'post';
-      form.style.display = 'inline';
-      form.innerHTML = '<input type="hidden" name="pwg_token" value="'+escapeHtml(pwgToken)+'">'
-        + '<input type="hidden" name="connection_id" value="'+escapeHtml(id)+'">'
-        + '<button class="buttonLike" type="submit" name="bratonien_tool" value="'+escapeHtml(tool)+'">'+escapeHtml(label)+'</button>';
-      return form;
-    }
 
-    function dialog() {
-      var node = document.getElementById('bratonien-nc-connection-edit-v2');
-      if (node) return node;
-      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 token = document.createElement('input');
+      token.type = 'hidden';
+      token.name = 'pwg_token';
+      token.value = tokenInput.value;
+      form.appendChild(token);
 
-    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 connection = document.createElement('input');
+      connection.type = 'hidden';
+      connection.name = 'connection_id';
+      connection.value = connectionInput.value;
+      form.appendChild(connection);
 
-    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);
-    }
+      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 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();
+      actions.insertBefore(form, actions.firstChild);
     });
+  }
 
-    [].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);
-      });
-    });
-  });
+  if (document.readyState === 'loading') {
+    document.addEventListener('DOMContentLoaded', restoreRunNowButtons);
+  } else {
+    restoreRunNowButtons();
+  }
 })();

main.inc.php

@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: Bratonien Tools
-Version: 0.9.7.17
+Version: 0.9.7.22
 Description: Erweiterbare Administrationswerkzeuge fuer die Bratonien-Piwigo-Installation.
 Plugin URI: https://github.com/Terranom674/Piwigo_Bratonien_Tools
 Author: Bratonien
@@ -27,12 +27,11 @@ require_once(BRATONIEN_TOOLS_PATH . 'include/nc_productive_ws.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_scheduler.inc.php');
 
 add_event_handler('get_admin_plugin_menu_links', 'bratonien_tools_admin_menu');
-add_event_handler('loc_end_index_category_thumbnails', 'bratonien_tools_watermark_prepare_album_overview');
 add_event_handler('get_derivative_url', 'bratonien_tools_filter_derivative_url', EVENT_HANDLER_PRIORITY_NEUTRAL, 4);
 add_event_handler('get_src_image_url', 'bratonien_tools_filter_webdav_src_url', EVENT_HANDLER_PRIORITY_NEUTRAL + 50, 2);
+add_event_handler('get_derivative_url', 'bratonien_tools_filter_webdav_derivative_url', EVENT_HANDLER_PRIORITY_NEUTRAL + 50, 4);
 add_event_handler('loc_end_element_set_global', 'bratonien_tools_batch_titles_register_action');
 add_event_handler('element_set_global_action', 'bratonien_tools_batch_titles_apply', EVENT_HANDLER_PRIORITY_NEUTRAL, 2);
-add_event_handler('init', 'bratonien_tools_watermark_cache_upgrade', EVENT_HANDLER_PRIORITY_NEUTRAL - 40);
 add_event_handler('init', 'bratonien_tools_prepare_connector_private_import', EVENT_HANDLER_PRIORITY_NEUTRAL - 30);
 add_event_handler('init', 'bratonien_tools_prepare_private_album_permissions', EVENT_HANDLER_PRIORITY_NEUTRAL - 20);
 add_event_handler('init', 'bratonien_tools_preserve_private_album_access', EVENT_HANDLER_PRIORITY_NEUTRAL - 10);

maintain.class.php

@@ -9,7 +9,6 @@ require_once(dirname(__FILE__) . '/include/database.class.php');
 require_once(dirname(__FILE__) . '/tools/watermark_profiles.inc.php');
 require_once(dirname(__FILE__) . '/include/dependencies.inc.php');
 require_once(dirname(__FILE__) . '/include/nc_connector_scheduler.inc.php');
-require_once(dirname(__FILE__) . '/include/nc_legacy_reset.inc.php');
 
 class bratonien_tools_maintain extends PluginMaintain
 {
@@ -52,18 +51,6 @@ class bratonien_tools_maintain extends PluginMaintain
   public function update($old_version, $new_version, &$errors = array())
   {
     $this->prepare($errors);
-
-    if (version_compare((string)$old_version, '0.9.7.7', '<') && version_compare((string)$new_version, '0.9.7.7', '>='))
-    {
-      try
-      {
-        bratonien_tools_nc_reset_legacy_imports();
-      }
-      catch (Throwable $e)
-      {
-        $errors[] = 'Connector-Altbestand konnte nicht vollständig bereinigt werden: '.$e->getMessage();
-      }
-    }
   }
 
   public function uninstall()

nc-connector-edit-data.php

@@ -1,93 +0,0 @@
-<?php
-$piwigo_root = realpath(dirname(__DIR__, 2));
-if ($piwigo_root === false)
-{
-  http_response_code(500);
-  exit;
-}
-define('PHPWG_ROOT_PATH', rtrim($piwigo_root, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR);
-include_once(PHPWG_ROOT_PATH.'include/common.inc.php');
-
-header('Content-Type: application/json; charset=utf-8');
-header('Cache-Control: no-store, max-age=0');
-
-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

@@ -1,356 +0,0 @@
-<?php
-$piwigo_root = realpath(dirname(__DIR__, 2));
-if ($piwigo_root === false)
-{
-  http_response_code(500);
-  exit;
-}
-define('PHPWG_ROOT_PATH', rtrim($piwigo_root, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR);
-include_once(PHPWG_ROOT_PATH.'include/common.inc.php');
-
-header('Content-Type: application/json; charset=utf-8');
-header('Cache-Control: no-store, max-age=0');
-
-function bratonien_tools_nc_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

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

runtime/build-webdav-media.sh

@@ -1,79 +1,7 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
-umask 0002
 
-CONFIG_FILE="${PIWIGO_CONFIG:-}"
-[[ -n "$CONFIG_FILE" && -r "$CONFIG_FILE" ]] || { echo "WebDAV-Konfiguration fehlt: ${CONFIG_FILE:-<leer>}" >&2; exit 1; }
-
-# 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"
-SOURCE_CACHE="$PIWIGO_ROOT/_data/bratonien-tools/nc-webdav-gallery/connection-$CONNECTION_ID"
-DERIVATIVE_CACHE="$PIWIGO_ROOT/_data/i/_data/bratonien-tools/nc-webdav-gallery/connection-$CONNECTION_ID"
-PIWIGO_DATA="$PIWIGO_ROOT/_data"
-
-normalize_connector_cache_permissions() {
-    [[ -d "$PIWIGO_DATA" ]] || return 0
-
-    local data_uid data_gid current_uid path
-    data_uid="$(stat -c '%u' "$PIWIGO_DATA")"
-    data_gid="$(stat -c '%g' "$PIWIGO_DATA")"
-    current_uid="$(id -u)"
-
-    for path in "$SOURCE_CACHE" "$PREVIEW_CACHE" "$DERIVATIVE_CACHE"; do
-        [[ -e "$path" ]] || continue
-
-        if [[ "$current_uid" -eq 0 ]]; then
-            chown -R "$data_uid:$data_gid" -- "$path"
-        fi
-
-        if ! find "$path" -type d -exec chmod 2775 {} + 2>/dev/null; then
-            echo "Hinweis: Verzeichnisrechte konnten ohne Root-Rechte nicht vollständig repariert werden: $path" >&2
-        fi
-        if ! find "$path" -type f -exec chmod 0664 {} + 2>/dev/null; then
-            echo "Hinweis: Dateirechte konnten ohne Root-Rechte nicht vollständig repariert werden: $path" >&2
-        fi
-    done
-}
-
-# Altbestände aus früheren root/systemd-Läufen werden repariert, sobald dieser
-# Lauf mit ausreichenden Rechten ausgeführt wird. Bei normalen Webserver-Läufen
-# werden zumindest alle eigenen Dateien gruppenschreibbar gehalten.
-normalize_connector_cache_permissions
-
-# Dieser Medienlauf wird erst nach einem erfolgreichen WebDAV-Aufbau und einer
-# erfolgreichen Piwigo-Synchronisierung gestartet. Deshalb darf erst hier aus
-# "lokale Connector-Datei fehlt" auf eine in Nextcloud entfernte Freigabe/Datei
-# geschlossen werden. Bei einer nicht erreichbaren Verbindung wird dieser Block
-# niemals ausgeführt und der vorhandene Piwigo-Bestand bleibt unverändert.
-php "$SCRIPT_DIR/cleanup-missing-webdav-images.php" \
-    --piwigo-root="$PIWIGO_ROOT" \
-    --connection-id="$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"
-
-normalize_connector_cache_permissions
+# 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

runtime/cleanup-missing-webdav-images.php

@@ -56,19 +56,30 @@ if (!is_array($config) || (string)($config['source_mode'] ?? '') !== 'webdav-pla
   exit(0);
 }
 
-$gallery_root = rtrim((string)($config['parallel_gallery_root'] ?? ''), '/');
-if ($gallery_root === '' || strpos($gallery_root, $piwigo_root.'/') !== 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)
 {
-  fwrite(STDERR, "Verbindungseigene Gallery-Root ist ungueltig.\n");
-  exit(1);
+  $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 '\\\\'";
 }
 
-$relative = ltrim(substr($gallery_root, strlen($piwigo_root)), '/');
-$db_prefix = './'.rtrim($relative, '/').'/';
-$escaped_prefix = $db->real_escape_string(addcslashes($db_prefix, "_%\\"));
 $images_table = $prefixeTable.'images';
-$query = "SELECT id, path FROM `{$images_table}` WHERE path LIKE '{$escaped_prefix}%' ESCAPE '\\\\'";
-$rows = $db->query($query);
+$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");
@@ -79,12 +90,18 @@ $missing_ids = array();
 while ($row = $rows->fetch_assoc())
 {
   $path = (string)$row['path'];
-  if (strpos($path, $db_prefix) !== 0)
+  $owned = false;
+  foreach ($prefixes as $prefix)
   {
-    continue;
+    if (strpos($path, $prefix) === 0)
+    {
+      $owned = true;
+      break;
+    }
   }
+  if (!$owned) continue;
 
-  $absolute = $piwigo_root.'/'.ltrim(preg_replace('#^\\./#', '', $path), '/');
+  $absolute = $piwigo_root.'/'.ltrim(preg_replace('#^\./#', '', $path), '/');
   if (!is_file($absolute))
   {
     $missing_ids[] = (int)$row['id'];
@@ -98,9 +115,10 @@ if (!$missing_ids)
   exit(0);
 }
 
-// Erst jetzt Piwigo bootstrappen. Dieser Prozess wird nur nach einem erfolgreich
-// abgeschlossenen WebDAV-Abruf gestartet. Eine nicht erreichbare Verbindung kann
-// daher niemals ueber diesen Pfad Bilder loeschen.
+// 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';
@@ -117,8 +135,8 @@ $_SERVER['HTTPS'] = 'off';
 require_once(PHPWG_ROOT_PATH.'include/common.inc.php');
 include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
 
-delete_elements($missing_ids, false);
+$deleted = delete_elements(array_values(array_unique(array_map('intval', $missing_ids))), false);
 update_category('all');
 invalidate_user_cache(true);
 
-echo 'WebDAV-Bereinigung: '.count($missing_ids)." nicht mehr freigegebene/ vorhandene Bilder aus Piwigo entfernt.\n";
+echo 'WebDAV-Bereinigung: '.(int)$deleted." nicht mehr freigegebene/vorhandene Bilder aus Piwigo entfernt.\n";

runtime/cleanup-webdav-piwigo.php

@@ -47,24 +47,31 @@ function bratonien_cleanup_tree($path, $allowed_root)
   @rmdir($path);
 }
 
-function bratonien_webdav_site_images($site_id)
+function bratonien_connection_id_from_owned_path($path)
 {
-  $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))
+  $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)
   {
-    $row['id'] = (int)$row['id'];
-    $rows[$row['id']] = $row;
+    if (preg_match($pattern, $path, $match)) return (int)$match[1];
   }
-  return $rows;
+  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;
 }
 
 try
@@ -84,24 +91,24 @@ try
     }
   }
 
-  $site_prefix = './_data/bratonien-tools/nc-webdav-gallery/connection-';
-  $result = pwg_query(
-    "SELECT id, galleries_url FROM ".SITES_TABLE.
-    " WHERE galleries_url LIKE '".pwg_db_real_escape_string($site_prefix)."%'"
-  );
-
-  $removed_sites = 0;
   $removed_images = 0;
-  while ($site = pwg_db_fetch_assoc($result))
+  $stale_by_connection = array();
+  $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-%'"
+  );
+  while ($row = 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];
+    $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;
+  }
 
-    $images = bratonien_webdav_site_images($site_id);
+  foreach ($stale_by_connection as $connection_id=>$images)
+  {
     foreach ($images as $row)
     {
       try
@@ -114,48 +121,60 @@ try
       }
     }
 
-    delete_site($site_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);
-      }
-    }
-
-    $removed_sites++;
+    delete_elements(array_map('intval', array_keys($images)), false);
     $removed_images += count($images);
-    echo 'NC WebDAV: entferne verwaiste Piwigo-Site '.$site_id.' für gelöschte Verbindung '.$connection_id.".\n";
+    echo 'NC WebDAV: entferne '.count($images).' verwaiste Bilder der gelöschten Verbindung '.$connection_id.".\n";
+  }
 
-    $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';
+  $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);
+  }
+
+  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";
+  }
+
+  $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;
     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);
-
-    $state_root = '/var/lib/bratonien-tools/nc-connector';
+    bratonien_cleanup_tree($legacy_root.'/bratonien-webdav-'.$connection_id, $legacy_root);
     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)
+  if ($removed_sites > 0 || $removed_images > 0)
   {
+    update_category('all');
     invalidate_user_cache(true);
   }
 

runtime/lib/build-webdav-derivatives.php

@@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli')
   exit(1);
 }
 
-const BRATONIEN_WEBDAV_DERIVATIVE_BUILDER_VERSION = '0.9.7.8';
+const BRATONIEN_WEBDAV_DERIVATIVE_BUILDER_VERSION = '0.9.6.1';
 
 $options = getopt('', array('piwigo-root:', 'connection-id:'));
 $piwigo_root = rtrim((string)($options['piwigo-root'] ?? ''), '/');
@@ -46,84 +46,20 @@ if (!function_exists('bratonien_tools_webdav_image_source_info') || !function_ex
   exit(1);
 }
 
-function bratonien_tools_webdav_modus_config()
-{
-  global $conf;
-
-  $modus = $conf['modus_theme'] ?? array();
-  if (is_string($modus) && $modus !== '')
-  {
-    $decoded = @unserialize($modus);
-    if (is_array($decoded)) $modus = $decoded;
-  }
-  if (!is_array($modus)) $modus = array();
-
-  return array_merge(
-    array(
-      'index_photo_deriv'=>'2small',
-      'index_photo_deriv_hdpi'=>'xsmall',
-    ),
-    $modus
-  );
-}
-
-function bratonien_tools_webdav_gallery_base_params()
-{
-  $modus = bratonien_tools_webdav_modus_config();
-  $type = trim((string)($modus['index_photo_deriv'] ?? '2small'));
-  $params = $type !== '' ? @ImageStdParams::get_by_type($type) : null;
-  if ($params) return $params;
-
-  $params = ImageStdParams::get_by_type(IMG_THUMB);
-  if (!$params)
-  {
-    throw new RuntimeException('Piwigo-Galeriederivat ist nicht konfiguriert.');
-  }
-  return $params;
-}
-
-function bratonien_tools_webdav_modus_gallery_params(SrcImage $src, $base_params)
-{
-  $row_height = (int)$base_params->max_height();
-  $candidates = array($base_params);
-
-  foreach (ImageStdParams::get_defined_type_map() as $params)
-  {
-    if (
-      $params->max_height() > $row_height
-      && $params->sizing->max_crop == $base_params->sizing->max_crop
-    )
-    {
-      $candidates[] = $params;
-      if (count($candidates) === 3) break;
-    }
-  }
-
-  $selected = $base_params;
-  foreach ($candidates as $params)
-  {
-    $selected = $params;
-    $probe = new DerivativeImage($params, $src);
-    $size = $probe->get_size();
-    if ((int)$size[1] >= $row_height - 2) break;
-  }
-
-  return $selected;
-}
-
 try
 {
-  $gallery_base_params = bratonien_tools_webdav_gallery_base_params();
-  $gallery_base_type = (string)$gallery_base_params->type;
+  $variants = bratonien_tools_webdav_derivative_variants();
+  if (!$variants)
+  {
+    throw new RuntimeException('Keine Piwigo-Derivate konfiguriert.');
+  }
 
   $images = 0;
   $generated_or_ready = 0;
   $identity = 0;
   $metadata_repaired = 0;
-  $legacy_derivatives_rebuilt = 0;
   $errors = 0;
   $error_lines = array();
-  $variant_counts = array();
 
   $result = pwg_query('SELECT * FROM '.IMAGES_TABLE.' ORDER BY id');
   while ($row = pwg_db_fetch_assoc($result))
@@ -173,59 +109,34 @@ try
     }
 
     $src = new SrcImage($row);
-    try
+    foreach ($variants as $variant_name => $params)
     {
-      $gallery_params = bratonien_tools_webdav_modus_gallery_params($src, $gallery_base_params);
-      $variant = (string)$gallery_params->type;
-      if ($variant === '') $variant = 'custom';
-      $variant_counts[$variant] = ($variant_counts[$variant] ?? 0) + 1;
-
-      $probe = new DerivativeImage($gallery_params, $src);
-      if ($probe->same_as_source())
+      try
       {
-        $identity++;
-        continue;
-      }
-
-      $target = $probe->get_path();
-      if ($target !== '' && is_file($target) && is_readable($target))
-      {
-        $expected_size = $gallery_params->compute_final_size(array($preview_width, $preview_height));
-        $existing_size = @getimagesize($target);
-        if (
-          is_array($expected_size)
-          && isset($expected_size[0], $expected_size[1])
-          && is_array($existing_size)
-          && isset($existing_size[0], $existing_size[1])
-          && ((int)$existing_size[0] !== (int)$expected_size[0] || (int)$existing_size[1] !== (int)$expected_size[1])
-        )
+        $probe = new DerivativeImage($params, $src);
+        if ($probe->same_as_source())
         {
-          if (!@unlink($target))
-          {
-            $errors++;
-            $error_lines[] = 'Bild #'.$image_id.' Galerie: falsches Alt-Derivat konnte nicht entfernt werden: '.$target;
-            continue;
-          }
-          $legacy_derivatives_rebuilt++;
+          $identity++;
+          continue;
+        }
+
+        $detail = '';
+        if (bratonien_tools_webdav_generate_derivative($params, $src, $detail))
+        {
+          $generated_or_ready++;
+        }
+        else
+        {
+          $errors++;
+          $error_lines[] = 'Bild #'.$image_id.' '.$variant_name.': '.($detail !== '' ? $detail : 'Derivat konnte nicht erzeugt werden.');
         }
       }
-
-      $detail = '';
-      if (bratonien_tools_webdav_generate_derivative($gallery_params, $src, $detail))
-      {
-        $generated_or_ready++;
-      }
-      else
+      catch (Throwable $e)
       {
         $errors++;
-        $error_lines[] = 'Bild #'.$image_id.' Galerie: '.($detail !== '' ? $detail : 'Galeriederivat konnte nicht erzeugt werden.');
+        $error_lines[] = 'Bild #'.$image_id.' '.$variant_name.': '.get_class($e).': '.$e->getMessage();
       }
     }
-    catch (Throwable $e)
-    {
-      $errors++;
-      $error_lines[] = 'Bild #'.$image_id.' Galerie: '.get_class($e).': '.$e->getMessage();
-    }
   }
 
   if ($metadata_repaired > 0)
@@ -246,22 +157,12 @@ try
     }
   }
 
-  ksort($variant_counts);
-  $variant_parts = array();
-  foreach ($variant_counts as $type=>$count)
-  {
-    $variant_parts[] = $type.':'.$count;
-  }
-
   echo 'WebDAV-Derivative-Builder: version='.BRATONIEN_WEBDAV_DERIVATIVE_BUILDER_VERSION.
     ' bilder='.$images.
-    ' varianten_pro_bild=1'.
-    ' modus_basis='.$gallery_base_type.
-    ' modus_varianten='.implode(',', $variant_parts).
+    ' varianten='.count($variants).
     ' bereit='.$generated_or_ready.
     ' identisch='.$identity.
     ' metadaten_repariert='.$metadata_repaired.
-    ' alt_derivate_neu='.$legacy_derivatives_rebuilt.
     ' fehler='.$errors."\n";
 
   exit($errors > 0 ? 1 : 0);

runtime/lib/build_webdav_placeholder_source.py

@@ -2,8 +2,12 @@
 """Build a placeholder-backed local source tree from Nextcloud WebDAV.
 
 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.
+original media is stored locally. The authenticated Nextcloud user is never used
+as an album name.
+
+Each placeholder carries the original image dimensions. Dimensions are read
+from Nextcloud metadata first. If those metadata are unavailable, only the
+beginning of the original file is read through WebDAV and parsed locally.
 """
 
 from __future__ import annotations
@@ -27,8 +31,10 @@ from pathlib import Path, PurePosixPath
 
 DAV = "DAV:"
 OC = "http://owncloud.org/ns"
+NC = "http://nextcloud.org/ns"
 SUPPORTED_IMAGE_EXTENSIONS = {".jpg", ".jpeg", ".png", ".gif", ".webp"}
 PLACEHOLDER = base64.b64decode("R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==")
+DIMENSION_PROBE_BYTES = 4 * 1024 * 1024
 
 
 def fail(message: str) -> None:
@@ -54,6 +60,101 @@ def safe_local_name(name: str) -> str:
     return name
 
 
+def parse_dimensions(prop: ET.Element) -> tuple[int, int]:
+    for property_name in ("file-metadata-size", "metadata-photos-size"):
+        raw = prop.findtext(f"{{{NC}}}{property_name}", default="").strip()
+        if not raw:
+            continue
+        try:
+            decoded = json.loads(raw)
+        except (TypeError, ValueError, json.JSONDecodeError):
+            continue
+        if isinstance(decoded, dict) and isinstance(decoded.get("value"), dict):
+            decoded = decoded["value"]
+        if not isinstance(decoded, dict):
+            continue
+        try:
+            width = int(decoded.get("width", 0) or 0)
+            height = int(decoded.get("height", 0) or 0)
+        except (TypeError, ValueError):
+            continue
+        if width > 0 and height > 0:
+            return width, height
+    return 0, 0
+
+
+def parse_image_header_dimensions(data: bytes) -> tuple[int, int]:
+    if len(data) >= 24 and data.startswith(b"\x89PNG\r\n\x1a\n") and data[12:16] == b"IHDR":
+        return int.from_bytes(data[16:20], "big"), int.from_bytes(data[20:24], "big")
+
+    if len(data) >= 10 and data[:6] in (b"GIF87a", b"GIF89a"):
+        return int.from_bytes(data[6:8], "little"), int.from_bytes(data[8:10], "little")
+
+    if len(data) >= 12 and data[:4] == b"RIFF" and data[8:12] == b"WEBP":
+        chunk = data[12:16]
+        if chunk == b"VP8X" and len(data) >= 30:
+            width = 1 + int.from_bytes(data[24:27], "little")
+            height = 1 + int.from_bytes(data[27:30], "little")
+            return width, height
+        if chunk == b"VP8 " and len(data) >= 30:
+            payload = 20
+            if data[payload + 3:payload + 6] == b"\x9d\x01\x2a":
+                width = int.from_bytes(data[payload + 6:payload + 8], "little") & 0x3FFF
+                height = int.from_bytes(data[payload + 8:payload + 10], "little") & 0x3FFF
+                return width, height
+        if chunk == b"VP8L" and len(data) >= 25 and data[20] == 0x2F:
+            b1, b2, b3, b4 = data[21:25]
+            width = 1 + b1 + ((b2 & 0x3F) << 8)
+            height = 1 + ((b2 & 0xC0) >> 6) + (b3 << 2) + ((b4 & 0x0F) << 10)
+            return width, height
+
+    if len(data) >= 4 and data[:2] == b"\xff\xd8":
+        sof_markers = {
+            0xC0, 0xC1, 0xC2, 0xC3,
+            0xC5, 0xC6, 0xC7,
+            0xC9, 0xCA, 0xCB,
+            0xCD, 0xCE, 0xCF,
+        }
+        pos = 2
+        while pos + 4 <= len(data):
+            if data[pos] != 0xFF:
+                pos += 1
+                continue
+            while pos < len(data) and data[pos] == 0xFF:
+                pos += 1
+            if pos >= len(data):
+                break
+            marker = data[pos]
+            pos += 1
+            if marker in (0xD8, 0xD9) or 0xD0 <= marker <= 0xD7:
+                continue
+            if marker == 0xDA:
+                break
+            if pos + 2 > len(data):
+                break
+            segment_length = int.from_bytes(data[pos:pos + 2], "big")
+            if segment_length < 2:
+                break
+            if marker in sof_markers:
+                if pos + 7 > len(data):
+                    break
+                height = int.from_bytes(data[pos + 3:pos + 5], "big")
+                width = int.from_bytes(data[pos + 5:pos + 7], "big")
+                return width, height
+            pos += segment_length
+
+    return 0, 0
+
+
+def placeholder_bytes(width: int, height: int) -> bytes:
+    if not (1 <= width <= 65535 and 1 <= height <= 65535):
+        fail(f"unsupported image dimensions for placeholder: {width}x{height}")
+    data = bytearray(PLACEHOLDER)
+    data[6:8] = width.to_bytes(2, "little")
+    data[8:10] = height.to_bytes(2, "little")
+    return bytes(data)
+
+
 @contextmanager
 def pinned_resolution(host: str, ip: str):
     host = host.strip("[]").lower()
@@ -92,22 +193,50 @@ class WebDavClient:
         self.auth_header = f"Basic {token}"
         self.context = ssl.create_default_context()
 
-    def collection_url(self, relative: str) -> str:
+    def file_url(self, relative: str) -> str:
         user = urllib.parse.quote(self.user, safe="")
         suffix = quote_path(relative)
-        url = f"{self.base_url}/remote.php/dav/files/{user}/"
-        if suffix:
-            url += suffix + "/"
+        return f"{self.base_url}/remote.php/dav/files/{user}/{suffix}"
+
+    def collection_url(self, relative: str) -> str:
+        url = self.file_url(relative)
+        if not url.endswith("/"):
+            url += "/"
         return url
 
+    def probe_dimensions(self, relative: str) -> tuple[int, int]:
+        request = urllib.request.Request(self.file_url(relative), method="GET")
+        request.add_header("Authorization", self.auth_header)
+        request.add_header("Range", f"bytes=0-{DIMENSION_PROBE_BYTES - 1}")
+        try:
+            with pinned_resolution(self.host, self.connect_ip):
+                with urllib.request.urlopen(request, timeout=self.timeout, context=self.context) as response:
+                    if response.status not in (200, 206):
+                        fail(f"Nextcloud image header returned HTTP {response.status}")
+                    data = response.read(DIMENSION_PROBE_BYTES)
+        except urllib.error.HTTPError as error:
+            if error.code in {401, 403}:
+                fail("Nextcloud rejected the WebDAV credentials or file access")
+            fail(f"Nextcloud image header request failed with HTTP {error.code}")
+        except urllib.error.URLError as error:
+            fail(f"Nextcloud WebDAV is unreachable while reading image dimensions: {error.reason}")
+
+        width, height = parse_image_header_dimensions(data)
+        if width < 1 or height < 1:
+            fail(f"original image dimensions could not be read from Nextcloud file header: {relative}")
+        return width, height
+
     def list_collection(self, relative: str) -> tuple[dict[str, object], list[dict[str, object]]]:
         relative = validate_relative(relative)
         url = self.collection_url(relative)
         body = (
             '<?xml version="1.0"?>'
-            '<d:propfind xmlns:d="DAV:" xmlns:oc="http://owncloud.org/ns">'
+            '<d:propfind xmlns:d="DAV:" xmlns:oc="http://owncloud.org/ns" '
+            'xmlns:nc="http://nextcloud.org/ns">'
             '<d:prop><d:displayname/><d:resourcetype/><d:getcontenttype/>'
-            '<d:getcontentlength/><d:getetag/><oc:fileid/></d:prop></d:propfind>'
+            '<d:getcontentlength/><d:getetag/><oc:fileid/>'
+            '<nc:file-metadata-size/><nc:metadata-photos-size/>'
+            '</d:prop></d:propfind>'
         ).encode("utf-8")
         request = urllib.request.Request(url, data=body, method="PROPFIND")
         request.add_header("Authorization", self.auth_header)
@@ -151,6 +280,7 @@ class WebDavClient:
             fileid_text = prop.findtext(f"{{{OC}}}fileid", default="").strip()
             resource_type = prop.find(f"{{{DAV}}}resourcetype")
             is_dir = resource_type is not None and resource_type.find(f"{{{DAV}}}collection") is not None
+            width, height = parse_dimensions(prop)
             item = {
                 "display_name": display,
                 "fileid": int(fileid_text) if fileid_text.isdigit() else 0,
@@ -158,6 +288,8 @@ class WebDavClient:
                 "content_type": prop.findtext(f"{{{DAV}}}getcontenttype", default=""),
                 "size": int(prop.findtext(f"{{{DAV}}}getcontentlength", default="0") or 0),
                 "etag": prop.findtext(f"{{{DAV}}}getetag", default="").strip('"'),
+                "width": width,
+                "height": height,
             }
             if href_path == base_path:
                 current = item
@@ -169,18 +301,17 @@ class WebDavClient:
         return current, children
 
 
-def link_placeholder(seed: Path, target: Path) -> None:
+def write_placeholder(target: Path, width: int, height: int) -> None:
     target.parent.mkdir(parents=True, exist_ok=True)
-    try:
-        os.link(seed, target)
-    except OSError:
-        target.write_bytes(PLACEHOLDER)
+    target.write_bytes(placeholder_bytes(width, height))
+    os.chmod(target, 0o644)
 
 
-def build_root(client: WebDavClient, remote_root: str, local_root: Path, seed: Path, mapping: dict[str, dict[str, object]]) -> tuple[int, int, int]:
+def build_root(client: WebDavClient, remote_root: str, local_root: Path, mapping: dict[str, dict[str, object]]) -> tuple[int, int, int, int]:
     files = 0
     folders = 0
     skipped = 0
+    probed = 0
     stack: list[tuple[str, Path]] = [(validate_relative(remote_root), local_root)]
     visited: set[str] = set()
 
@@ -210,7 +341,16 @@ def build_root(client: WebDavClient, remote_root: str, local_root: Path, seed: P
             if extension not in SUPPORTED_IMAGE_EXTENSIONS:
                 skipped += 1
                 continue
-            link_placeholder(seed, child_local)
+
+            width = int(child.get("width", 0) or 0)
+            height = int(child.get("height", 0) or 0)
+            dimension_source = "metadata"
+            if width < 1 or height < 1:
+                width, height = client.probe_dimensions(child_remote)
+                dimension_source = "header"
+                probed += 1
+
+            write_placeholder(child_local, width, height)
             files += 1
             mapping[str(child_local)] = {
                 "kind": "file",
@@ -220,8 +360,11 @@ def build_root(client: WebDavClient, remote_root: str, local_root: Path, seed: P
                 "content_type": str(child.get("content_type", "")),
                 "size": int(child.get("size", 0)),
                 "etag": str(child.get("etag", "")),
+                "width": width,
+                "height": height,
+                "dimension_source": dimension_source,
             }
-    return files, folders, skipped
+    return files, folders, skipped, probed
 
 
 def atomic_json(path: Path, payload: object) -> None:
@@ -265,10 +408,7 @@ def main() -> int:
         source_dir = args.source_dir.resolve()
         staging = source_dir.with_name(f".{source_dir.name}.next")
         previous = source_dir.with_name(f".{source_dir.name}.previous")
-        seed = source_dir.parent / ".bratonien-webdav-placeholder.gif"
         source_dir.parent.mkdir(parents=True, exist_ok=True)
-        seed.write_bytes(PLACEHOLDER)
-        os.chmod(seed, 0o644)
         if staging.exists():
             shutil.rmtree(staging)
         staging.mkdir(parents=True)
@@ -276,7 +416,7 @@ def main() -> int:
         client = WebDavClient(args.base_url, args.user, password, max(1, args.timeout), args.connect_ip)
         mapping: dict[str, dict[str, object]] = {}
         manifest: list[str] = []
-        total_files = total_folders = total_skipped = 0
+        total_files = total_folders = total_skipped = total_probed = 0
         used_fileids: set[int] = set()
 
         for remote_root_raw in args.root:
@@ -288,10 +428,11 @@ def main() -> int:
             used_fileids.add(fileid)
             local_name = f"root-{fileid}"
             local_root = staging / local_name
-            files, folders, skipped = build_root(client, remote_root, local_root, seed, mapping)
+            files, folders, skipped, probed = build_root(client, remote_root, local_root, mapping)
             total_files += files
             total_folders += folders
             total_skipped += skipped
+            total_probed += probed
 
             if remote_root == "":
                 for child in sorted(root_children, key=lambda item: str(item.get("display_name", "")).casefold()):
@@ -333,7 +474,7 @@ def main() -> int:
 
         atomic_text(args.manifest, "\n".join(manifest) + "\n")
         atomic_json(args.mapping, {
-            "version": 1,
+            "version": 3,
             "base_url": args.base_url.rstrip("/"),
             "connect_ip": client.connect_ip,
             "user": args.user,
@@ -344,6 +485,7 @@ def main() -> int:
             "files": total_files,
             "folders": total_folders,
             "skipped": total_skipped,
+            "dimension_header_probes": total_probed,
             "connect_ip": client.connect_ip,
             "source_dir": str(source_dir),
             "manifest": str(args.manifest),

runtime/lib/piwigo-sync.php

@@ -252,6 +252,8 @@ 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));
@@ -282,31 +284,16 @@ 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));
-
-    // 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),
+    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),
       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/sync-webdav.sh

@@ -138,33 +138,9 @@ if [[ "${PIWIGO_SYNC_ENABLED:-0}" == "1" ]]; then
         exit "$PIWIGO_EXIT"
     fi
 
-    if [[ "${BRATONIEN_NC_NATIVE:-0}" == "1" ]]; then
-        if command -v timeout >/dev/null 2>&1; then
-            if ! timeout 30m env PIWIGO_CONFIG="$CONFIG_FILE" bash "$SCRIPT_DIR/build-webdav-media.sh"; then
-                write_status error "Bildaufbereitung ist fehlgeschlagen oder hat das 30-Minuten-Limit erreicht"
-                exit 1
-            fi
-        elif ! env PIWIGO_CONFIG="$CONFIG_FILE" bash "$SCRIPT_DIR/build-webdav-media.sh"; then
-            write_status error "Bildaufbereitung ist fehlgeschlagen"
-            exit 1
-        fi
-    else
-        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
-    fi
-
     if grep -q 'Piwigo-Synchronisierung per API erfolgreich' <<<"$PIWIGO_OUTPUT"; then
         write_status ok \
-            "WebDAV eingelesen und Piwigo synchronisiert; Bildaufbereitung abgeschlossen" \
+            "WebDAV eingelesen und Piwigo synchronisiert" \
             "" \
             "api" \
             "ok" \
@@ -173,7 +149,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; Bildaufbereitung abgeschlossen" \
+            "WebDAV eingelesen und Piwigo über Fallback synchronisiert" \
             "" \
             "fallback" \
             "not_used" \
@@ -181,7 +157,7 @@ if [[ "${PIWIGO_SYNC_ENABLED:-0}" == "1" ]]; then
             "ok" \
             "Benutzername/Passwort-Fallback erfolgreich"
     else
-        write_status ok "WebDAV eingelesen und Piwigo synchronisiert; Bildaufbereitung abgeschlossen"
+        write_status ok "WebDAV eingelesen und Piwigo synchronisiert"
     fi
 else
     write_status ok "WebDAV eingelesen; Piwigo-Synchronisierung ist für diese Verbindung deaktiviert"

template/admin_tabs.tpl

@@ -9,13 +9,7 @@
 .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; }
-.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} }
+@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} }
 </style>
 <div id="bratonien-tabs-anchor"></div>
 <script>
@@ -59,19 +53,15 @@
 
     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(current==='edit'){
+      if(mode()==='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';
@@ -90,13 +80,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);clearMode();
+      if(resetBusy)return;resetBusy=true;setOpen(false);setMode('');
       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();clearMode();showWizard();
+        event.preventDefault();event.stopImmediatePropagation();setMode('');showWizard();
       },true);
     }
     if(closeButton){
@@ -105,111 +95,33 @@
     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')clearMode();
+            if(submitter.value==='nc_connector_wizard_reset'||submitter.value==='nc_connector_wizard_finish')setMode('');
           }
         },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';
@@ -262,7 +174,7 @@
     poll();schedule();
   }
 
-  function initAll(){initBratonienTabs();initNCWizardLifecycle();initNCConnectionEditing();initNCConnectorPolling();}
+  function initAll(){initBratonienTabs();initNCWizardLifecycle();initNCConnectorPolling();}
   if(document.readyState==='loading')document.addEventListener('DOMContentLoaded',initAll);else initAll();
 })();
 </script>

tools/album_rules.inc.php

@@ -61,7 +61,6 @@ function bratonien_tools_save_album_rule()
     )));
   }
 
-  bratonien_tools_clear_watermark_cache();
   return array('message'=>'Albumregel gespeichert.');
 }
 
@@ -94,34 +93,7 @@ function bratonien_tools_resolve_album_rule($category_id, array $categories, arr
     $by_id[(int)$category['id']] = $category;
   }
 
-  $category_id = (int)$category_id;
-  $root = $by_id[$category_id] ?? null;
-  $is_private = $root && isset($root['status']) && $root['status'] === 'private';
-
-  if ($is_private)
-  {
-    if (isset($rules[$category_id]))
-    {
-      $rule = $rules[$category_id];
-      if ($rule['mode'] === 'disabled')
-      {
-        return array('mode'=>'disabled','profile_id'=>null,'source'=>'album');
-      }
-      if ($rule['mode'] === 'profile')
-      {
-        return array('mode'=>'profile','profile_id'=>(int)$rule['profile_id'],'source'=>'album');
-      }
-    }
-
-    $profile_id = $defaults['private_profile'] ?? null;
-    if (empty($profile_id))
-    {
-      return array('mode'=>'disabled','profile_id'=>null,'source'=>'global');
-    }
-    return array('mode'=>'profile','profile_id'=>(int)$profile_id,'source'=>'global');
-  }
-
-  $current = $category_id;
+  $current = (int)$category_id;
   $visited = array();
 
   while ($current > 0 && isset($by_id[$current]) && !isset($visited[$current]))
@@ -144,7 +116,10 @@ function bratonien_tools_resolve_album_rule($category_id, array $categories, arr
     $current = (int)($by_id[$current]['id_uppercat'] ?? 0);
   }
 
-  $profile_id = $defaults['public_profile'] ?? null;
+  $root = $by_id[(int)$category_id] ?? null;
+  $is_private = $root && isset($root['status']) && $root['status'] === 'private';
+  $profile_id = $is_private ? ($defaults['private_profile'] ?? null) : ($defaults['public_profile'] ?? null);
+
   if (empty($profile_id))
   {
     return array('mode'=>'disabled','profile_id'=>null,'source'=>'global');

tools/watermark_profiles.inc.php

@@ -128,7 +128,6 @@ function bratonien_tools_save_watermark_profile()
     mass_inserts($table, array_keys($data), array($data));
   }
 
-  bratonien_tools_clear_watermark_cache();
   return array('message'=>'Wasserzeichenprofil gespeichert.');
 }
 
@@ -159,7 +158,6 @@ function bratonien_tools_delete_watermark_profile()
   }
 
   pwg_query('DELETE FROM '.bratonien_tools_table('watermark_profiles').' WHERE id='.$id);
-  bratonien_tools_clear_watermark_cache();
   return array('message'=>'Wasserzeichenprofil geloescht.');
 }
 
@@ -176,7 +174,6 @@ function bratonien_tools_duplicate_watermark_profile()
   $profile['name'] .= ' (Kopie)';
   $profile['created'] = date('Y-m-d H:i:s');
   mass_inserts(bratonien_tools_table('watermark_profiles'), array_keys($profile), array($profile));
-  bratonien_tools_clear_watermark_cache();
 
   return array('message'=>'Wasserzeichenprofil dupliziert.');
 }

tools/watermark_settings.inc.php

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