0.9.6.9 catch duplicate functions and admin JavaScript syntax

.ci-trigger-0977

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

.github/workflows/lint.yml

@@ -5,12 +5,8 @@ on:
   pull_request:
 
 jobs:
-  php-syntax:
+  syntax:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        php-version: ['8.2', '8.3', '8.4', '8.5']
     steps:
       - name: Repository auschecken
         uses: actions/checkout@v4
@@ -18,7 +14,7 @@ jobs:
       - name: PHP installieren
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php-version }}
+          php-version: '8.2'
           coverage: none
 
       - name: PHP Syntax pruefen
@@ -40,19 +36,12 @@ jobs:
             exit 1
           fi
 
-  script-syntax:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Repository auschecken
-        uses: actions/checkout@v4
-
       - name: Admin JavaScript Syntax pruefen
         shell: bash
         run: |
           set -euo pipefail
           sed -n '/<script>/,/<\/script>/p' template/admin_tabs.tpl | sed '1d;$d' > /tmp/bratonien-admin-tabs.js
           node --check /tmp/bratonien-admin-tabs.js
-          node --check js/nc_connector_edit_v2.js
 
       - name: Python Syntax pruefen
         shell: bash

admin.php

@@ -9,74 +9,6 @@ check_status(ACCESS_ADMINISTRATOR);
 require_once(BRATONIEN_TOOLS_PATH . 'include/tool_registry.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_system.inc.php');
 
-function bratonien_tools_nc_connector_admin_connections(array $connections)
-{
-  $by_id = array();
-  foreach ($connections as $connection)
-  {
-    $by_id[(int)$connection['id']] = $connection;
-  }
-
-  $hidden_legacy_ids = array();
-  $logical_remote = array();
-  foreach ($connections as $connection)
-  {
-    if ((string)($connection['adapter'] ?? '') !== 'remote') continue;
-    $migration = isset($connection['config']['migration']) && is_array($connection['config']['migration'])
-      ? $connection['config']['migration']
-      : array();
-    if ((string)($migration['role'] ?? '') !== 'webdav-primary-candidate') continue;
-
-    $legacy_id = (int)($migration['legacy_fallback_connection_id'] ?? 0);
-    if ($legacy_id < 1 || empty($by_id[$legacy_id]) || (string)$by_id[$legacy_id]['adapter'] !== 'local') continue;
-
-    $legacy = $by_id[$legacy_id];
-    $hidden_legacy_ids[$legacy_id] = true;
-    $connection['logical_connection'] = true;
-    $connection['legacy_fallback_connection_id'] = $legacy_id;
-    $connection['enabled'] = !empty($connection['enabled']) || !empty($legacy['enabled']);
-    if ($connection['enabled']) $connection['takeover_state'] = 'active';
-    $connection['fallback_stored'] = !empty($connection['fallback_stored']) || !empty($legacy['fallback_stored']);
-    if (trim((string)$connection['name']) === '') $connection['name'] = (string)$legacy['name'];
-    $logical_remote[(int)$connection['id']] = $connection;
-  }
-
-  $visible = array();
-  foreach ($connections as $connection)
-  {
-    $id = (int)$connection['id'];
-    if (isset($hidden_legacy_ids[$id])) continue;
-    if (isset($logical_remote[$id])) $connection = $logical_remote[$id];
-    $visible[] = $connection;
-  }
-
-  return $visible;
-}
-
-function bratonien_tools_nc_connector_admin_last_status(array $connection)
-{
-  $latest = bratonien_tools_nc_connector_connection_last_status($connection);
-  $legacy_id = (int)($connection['legacy_fallback_connection_id'] ?? 0);
-  if ($legacy_id < 1)
-  {
-    return $latest;
-  }
-
-  $legacy = bratonien_tools_nc_connector_connection($legacy_id, false);
-  if (!$legacy)
-  {
-    return $latest;
-  }
-
-  $legacy_status = bratonien_tools_nc_connector_connection_last_status($legacy);
-  if ((int)($legacy_status['timestamp'] ?? 0) > (int)($latest['timestamp'] ?? 0))
-  {
-    return $legacy_status;
-  }
-
-  return $latest;
-}
-
 $tools = bratonien_tools_get_tools();
 $messages = array();
 $errors = array();
@@ -162,19 +94,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['bratonien_tool']))
   );
 
   $redirect_url = get_root_url().'admin.php?page=plugin-'.BRATONIEN_TOOLS_ID;
-  $wizard_action = strpos($tool_id, 'nc_connector_wizard_') === 0
-    || $tool_id === 'nc_connector_migrate_start'
-    || $tool_id === 'nc_connector_edit_start';
-  if ($wizard_action)
-  {
-    $wizard_closed = $tool_id === 'nc_connector_wizard_reset'
-      || ($tool_id === 'nc_connector_wizard_finish' && empty($errors));
-    if (($tool_id === 'nc_connector_migrate_start' || $tool_id === 'nc_connector_edit_start') && !empty($errors))
-    {
-      $wizard_closed = true;
-    }
-    $redirect_url .= '&nc_wizard='.($wizard_closed ? 'closed' : 'open');
-  }
   if (!headers_sent())
   {
     header('Location: '.$redirect_url, true, 303);
@@ -196,17 +115,9 @@ $asset_environment = bratonien_tools_get_asset_environment();
 $album_shares = bratonien_tools_get_album_shares();
 $private_albums = bratonien_tools_get_private_albums();
 $nc_connector = bratonien_tools_nc_connector_status();
-$nc_connector_runtime_connections = $nc_connector['connections'];
-$nc_connector['connections'] = bratonien_tools_nc_connector_admin_connections($nc_connector_runtime_connections);
-$nc_connector['connection_count'] = count($nc_connector['connections']);
-$nc_connector['active_count'] = 0;
-foreach ($nc_connector['connections'] as $visible_connection)
-{
-  if (!empty($visible_connection['enabled'])) $nc_connector['active_count']++;
-}
 foreach ($nc_connector['connections'] as &$nc_connection)
 {
-  $nc_connection['last_sync'] = bratonien_tools_nc_connector_admin_last_status($nc_connection);
+  $nc_connection['last_sync'] = bratonien_tools_nc_connector_connection_last_status($nc_connection);
   $nc_connection['display_name'] = $nc_connection['name'];
 
   $storage_lines = array();
@@ -255,7 +166,7 @@ $nc_system_defaults = array(
 );
 $nc_connector['system'] = array_merge(
   $nc_system_defaults,
-  bratonien_tools_nc_connector_system_status($nc_connector_runtime_connections)
+  bratonien_tools_nc_connector_system_status($nc_connector['connections'])
 );
 $album_lock_page_number = isset($_GET['br_album_page']) ? max(1, (int)$_GET['br_album_page']) : 1;
 $album_lock_search = isset($_GET['br_album_search']) ? trim((string)$_GET['br_album_search']) : '';

include/nc_connector_delete_safe.inc.php

@@ -36,7 +36,14 @@ function bratonien_tools_nc_connector_remove_webdav_piwigo_content(array $connec
   include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
 
   $image_rows = array();
-  $query = '\nSELECT DISTINCT i.id, i.path, i.representative_ext\n  FROM '.IMAGES_TABLE.' AS i\n  LEFT JOIN '.CATEGORIES_TABLE.' AS sc ON sc.id = i.storage_category_id\n  LEFT JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON ic.image_id = i.id\n  LEFT JOIN '.CATEGORIES_TABLE.' AS vc ON vc.id = ic.category_id\n  WHERE sc.site_id = '.$site_id.' OR vc.site_id = '.$site_id.'\n;';
+  $query = '
+SELECT DISTINCT i.id, i.path, i.representative_ext
+  FROM '.IMAGES_TABLE.' AS i
+  LEFT JOIN '.CATEGORIES_TABLE.' AS sc ON sc.id = i.storage_category_id
+  LEFT JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON ic.image_id = i.id
+  LEFT JOIN '.CATEGORIES_TABLE.' AS vc ON vc.id = ic.category_id
+  WHERE sc.site_id = '.$site_id.' OR vc.site_id = '.$site_id.'
+;';
   $result = pwg_query($query);
   while ($row = pwg_db_fetch_assoc($result))
   {
@@ -77,8 +84,10 @@ function bratonien_tools_nc_connector_remove_webdav_piwigo_content(array $connec
 }
 
 /**
- * Delete exactly the connection selected by the user.
+ * Delete a connector connection from Piwigo without depending on the web
- * No other connector record is implicitly removed.
+ * server being allowed to write into root-owned runtime directories.
+ * WebDAV-managed Piwigo records are removed before the connection itself so
+ * deleted remote content cannot remain visible or addressable in Piwigo.
  */
 function bratonien_tools_nc_connector_delete_safe()
 {
@@ -103,7 +112,10 @@ function bratonien_tools_nc_connector_delete_safe()
 
   $status_dir = rtrim(PHPWG_ROOT_PATH, '/').'/_data/bratonien-tools/nc-connector-status';
   $public_status = $status_dir.'/connection-'.$id.'.json';
-  if (is_file($public_status)) @unlink($public_status);
+  if (is_file($public_status))
+  {
+    @unlink($public_status);
+  }
 
   if (is_dir($status_dir) || @mkdir($status_dir, 0755, true))
   {
@@ -113,11 +125,11 @@ function bratonien_tools_nc_connector_delete_safe()
   if ((int)$cleanup['site_id'] > 0)
   {
     return array(
-      'message'=>'Verbindung wurde gelöscht. Die zugehörigen Piwigo-Alben und '.(int)$cleanup['images'].' Bilder wurden aus Piwigo entfernt. Nextcloud-Dateien blieben unverändert.',
+      'message'=>'Connector-Verbindung wurde gelöscht. Die zugehörigen Piwigo-Alben und '.(int)$cleanup['images'].' Bilder wurden aus Piwigo entfernt. Nextcloud-Dateien blieben unverändert. Laufzeit- und Vorschaudaten werden automatisch bereinigt.',
     );
   }
 
   return array(
-    'message'=>'Verbindung wurde gelöscht. Verbliebene Laufzeitdaten werden automatisch bereinigt. Quelldateien blieben unverändert.',
+    'message'=>'Connector-Verbindung wurde gelöscht. Verbliebene Laufzeitdateien werden vor dem nächsten Connector-Lauf automatisch entfernt. Quelldateien blieben unverändert.',
   );
 }

include/nc_connector_edit.inc.php

@@ -4,103 +4,6 @@ if (!defined('PHPWG_ROOT_PATH'))
   die('Hacking attempt!');
 }
 
-function bratonien_tools_nc_connector_migration_state(array $connection)
-{
-  $config = isset($connection['config']) && is_array($connection['config']) ? $connection['config'] : array();
-  $credentials = bratonien_tools_nc_connector_scoped_secret($connection);
-  $missing = array();
-
-  if (trim((string)($config['nextcloud_url'] ?? '')) === '') $missing[] = 'Nextcloud-Adresse';
-  if (trim((string)($credentials['nextcloud_user'] ?? '')) === '') $missing[] = 'Nextcloud-Benutzer';
-  if ((string)($credentials['nextcloud_password'] ?? '') === '') $missing[] = 'Nextcloud-Passwort';
-
-  $api_id = trim((string)($credentials['api_key_id'] ?? ''));
-  $api_secret = trim((string)($credentials['api_key_secret'] ?? ''));
-  $fallback_user = trim((string)($credentials['piwigo_user'] ?? ''));
-  $fallback_password = (string)($credentials['piwigo_password'] ?? '');
-  $api_complete = $api_id !== '' && $api_secret !== '';
-  $fallback_complete = $fallback_user !== '' && $fallback_password !== '';
-
-  if (($api_id === '') !== ($api_secret === '')) $missing[] = 'vollstaendiger Piwigo-API-Zugang';
-  if (!$api_complete && !$fallback_complete) $missing[] = 'Piwigo-API oder Benutzer/Passwort-Fallback';
-
-  return array(
-    'ready'=>!$missing,
-    'missing'=>$missing,
-    'api_available'=>$api_complete,
-    'fallback_available'=>$fallback_complete,
-  );
-}
-
-function bratonien_tools_nc_connector_validate_nextcloud_access($base_url, $username, $password)
-{
-  $base_url = bratonien_tools_nc_wizard_normalize_url($base_url);
-  $username = trim((string)$username);
-  $password = (string)$password;
-  if ($username === '' || $password === '') throw new RuntimeException('Nextcloud-Benutzer und Passwort werden benoetigt.');
-
-  $status_response = bratonien_tools_nc_wizard_http($base_url.'/status.php');
-  if ($status_response['status'] < 200 || $status_response['status'] >= 300)
-  {
-    throw new RuntimeException('Die Nextcloud-Adresse konnte nicht bestaetigt werden.');
-  }
-  $status = json_decode((string)$status_response['body'], true);
-  if (!is_array($status) || empty($status['installed']))
-  {
-    throw new RuntimeException('Unter dieser Adresse wurde keine installierte Nextcloud erkannt.');
-  }
-
-  $user_response = bratonien_tools_nc_wizard_http(
-    $base_url.'/ocs/v2.php/cloud/user?format=json',
-    $username,
-    $password,
-    array('OCS-APIRequest: true')
-  );
-  if ($user_response['status'] === 401 || $user_response['status'] === 403)
-  {
-    throw new RuntimeException('Nextcloud hat Benutzername oder Passwort abgelehnt.');
-  }
-  if ($user_response['status'] < 200 || $user_response['status'] >= 300)
-  {
-    throw new RuntimeException('Nextcloud ist erreichbar, aber der Benutzerzugang konnte nicht geprueft werden.');
-  }
-  $user_data = bratonien_tools_nc_wizard_ocs_data($user_response['body']);
-  $resolved = trim((string)($user_data['id'] ?? $username));
-
-  return array(
-    'base_url'=>$base_url,
-    'username'=>$resolved !== '' ? $resolved : $username,
-  );
-}
-
-function bratonien_tools_nc_connector_validate_scoped_api($api_key_id, $api_key_secret)
-{
-  $api_key_id = trim((string)$api_key_id);
-  $api_key_secret = trim((string)$api_key_secret);
-  if ($api_key_id === '' || $api_key_secret === '')
-  {
-    throw new RuntimeException('Piwigo-API-Schluessel-ID und API-Geheimnis werden benoetigt.');
-  }
-
-  $status = bratonien_tools_nc_connector_piwigo_api_request($api_key_id, $api_key_secret, 'pwg.session.getStatus');
-  if (!is_array($status)) throw new RuntimeException('Piwigo hat keinen auswertbaren API-Benutzerstatus geliefert.');
-  $role = strtolower(trim((string)($status['status'] ?? '')));
-  if (!in_array($role, array('admin','webmaster'), true))
-  {
-    throw new RuntimeException('Der API-Key funktioniert, gehoert aber keinem Piwigo-Administrator/Webmaster.');
-  }
-
-  $method_result = bratonien_tools_nc_connector_piwigo_api_request($api_key_id, $api_key_secret, 'reflection.getMethodList');
-  $method_map = array();
-  bratonien_tools_nc_connector_collect_method_names($method_result, $method_map);
-  $required = array('bratonien.nc.syncProductive', 'bratonien.nc.syncOrphans');
-  $missing = array_values(array_diff($required, array_keys($method_map)));
-  if ($missing)
-  {
-    throw new RuntimeException('Der API-Key ist gueltig, aber benoetigte Bratonien-Sync-Methoden fehlen: '.implode(', ', $missing).'.');
-  }
-}
-
 function bratonien_tools_nc_connector_prepare_webdav_wizard_from_connection(array $connection, $mode)
 {
   $id = (int)$connection['id'];
@@ -122,7 +25,7 @@ function bratonien_tools_nc_connector_prepare_webdav_wizard_from_connection(arra
   {
     $path = trim((string)($root['webdav_path'] ?? ''), '/');
     $fileid = (int)($root['fileid'] ?? 0);
-    if ($fileid < 1) continue;
+    if ($path === '' || $fileid < 1) continue;
     $selected[] = $path;
     $selected_ids[$path] = $fileid;
   }
@@ -198,7 +101,7 @@ function bratonien_tools_nc_connector_edit_start()
   }
 
   bratonien_tools_nc_connector_prepare_webdav_wizard_from_connection($connection, 'update');
-  return array('message'=>'Verbindung #'.$id.' wurde zum Bearbeiten geoeffnet.');
+  return array('message'=>'Verbindung #'.$id.' wurde zum Bearbeiten geöffnet.');
 }
 
 function bratonien_tools_nc_connector_migrate_start()
@@ -211,14 +114,8 @@ function bratonien_tools_nc_connector_migrate_start()
     throw new RuntimeException('Nur eine Legacy-Verbindung kann auf WebDAV migriert werden.');
   }
 
-  $migration = bratonien_tools_nc_connector_migration_state($connection);
-  if (empty($migration['ready']))
-  {
-    throw new RuntimeException('Die WebDAV-Migration ist noch nicht bereit. Unter Bearbeiten fehlen: '.implode(', ', $migration['missing']).'.');
-  }
-
   bratonien_tools_nc_connector_prepare_webdav_wizard_from_connection($connection, 'migrate');
-  return array('message'=>'Die WebDAV-Migration fuer Verbindung #'.$id.' wurde geoeffnet. Die bestehende Legacy-Verbindung bleibt bis zum erfolgreichen Umstieg unveraendert.');
+  return array('message'=>'Die WebDAV-Migration für Verbindung #'.$id.' wurde geöffnet. Die bestehende Legacy-Verbindung bleibt bis zum erfolgreichen Umstieg unverändert.');
 }
 
 function bratonien_tools_nc_connector_update_local_friendly()
@@ -226,10 +123,10 @@ function bratonien_tools_nc_connector_update_local_friendly()
   $id = (int)($_POST['connection_id'] ?? 0);
   $connection = bratonien_tools_nc_connector_connection($id, true);
   if (!$connection) throw new RuntimeException('Connector-Verbindung wurde nicht gefunden.');
-  if ((string)$connection['adapter'] !== 'local') throw new RuntimeException('Diese Bearbeitung ist nur fuer Legacy-Verbindungen vorgesehen.');
+  if ((string)$connection['adapter'] !== 'local') throw new RuntimeException('Diese Bearbeitung ist nur für Legacy-Verbindungen vorgesehen.');
 
   $name = trim((string)($_POST['connection_name'] ?? ''));
-  if ($name === '') throw new RuntimeException('Bitte einen Namen fuer die Verbindung angeben.');
+  if ($name === '') throw new RuntimeException('Bitte einen Namen für die Verbindung angeben.');
 
   $config = isset($connection['config']) && is_array($connection['config']) ? $connection['config'] : array();
   $host = trim((string)($_POST['nc_host'] ?? ''));
@@ -241,11 +138,11 @@ function bratonien_tools_nc_connector_update_local_friendly()
   $activity_view = trim((string)($_POST['nc_activity_view'] ?? ''));
 
   if ($host === '') throw new RuntimeException('Datenbank-Server fehlt.');
-  if ($port < 1 || $port > 65535) throw new RuntimeException('Der Datenbank-Port ist ungueltig.');
+  if ($port < 1 || $port > 65535) throw new RuntimeException('Der Datenbank-Port ist ungültig.');
   if ($database === '') throw new RuntimeException('Datenbankname fehlt.');
   if ($user === '') throw new RuntimeException('Reader-Benutzer fehlt.');
   if ($gallery_root === '' || $gallery_root[0] !== '/') throw new RuntimeException('Der Piwigo-Galerieordner muss ein absoluter Pfad sein.');
-  if ($source_view === '' || $activity_view === '') throw new RuntimeException('Die gespeicherten Datenbankansichten duerfen nicht leer sein.');
+  if ($source_view === '' || $activity_view === '') throw new RuntimeException('Die gespeicherten Datenbankansichten dürfen nicht leer sein.');
   bratonien_tools_nc_connector_view_name($source_view);
   bratonien_tools_nc_connector_view_name($activity_view);
 
@@ -261,54 +158,11 @@ function bratonien_tools_nc_connector_update_local_friendly()
     $mount = rtrim(trim((string)($storage_mounts[$index] ?? '')), '/');
     if ($storage_id === '' && $prefix === '' && $mount === '') continue;
     if ($storage_id === '') throw new RuntimeException('Bei einem Speicherort fehlt die Storage-ID.');
-    if ($mount === '' || $mount[0] !== '/') throw new RuntimeException('Bei einem Speicherort fehlt ein gueltiger lokaler Pfad.');
+    if ($mount === '' || $mount[0] !== '/') throw new RuntimeException('Bei einem Speicherort fehlt ein gültiger lokaler Pfad.');
     $storages[] = array('storage_id'=>$storage_id, 'source_prefix'=>$prefix, 'local_mount'=>$mount);
   }
   if (!$storages) throw new RuntimeException('Mindestens ein Speicherort muss vorhanden sein.');
 
-  $credentials = bratonien_tools_nc_connector_scoped_secret($connection);
-  $new_db_password = (string)($_POST['nc_db_password'] ?? '');
-  if ($new_db_password !== '') $credentials['db_password'] = $new_db_password;
-  if (trim((string)($credentials['db_password'] ?? '')) === '') throw new RuntimeException('Fuer die Legacy-Verbindung ist kein Datenbankpasswort gespeichert.');
-
-  $nextcloud_url = trim((string)($_POST['nc_nextcloud_url'] ?? ($config['nextcloud_url'] ?? '')));
-  $nextcloud_user = trim((string)($_POST['nc_nextcloud_user'] ?? ($credentials['nextcloud_user'] ?? '')));
-  $new_nextcloud_password = (string)($_POST['nc_nextcloud_password'] ?? '');
-  if ($new_nextcloud_password !== '') $credentials['nextcloud_password'] = $new_nextcloud_password;
-  $nextcloud_password = (string)($credentials['nextcloud_password'] ?? '');
-
-  $api_key_id = trim((string)($_POST['nc_connection_api_key_id'] ?? ($credentials['api_key_id'] ?? '')));
-  $new_api_secret = trim((string)($_POST['nc_connection_api_key_secret'] ?? ''));
-  $old_api_id = trim((string)($credentials['api_key_id'] ?? ''));
-  if ($api_key_id !== $old_api_id && $new_api_secret === '')
-  {
-    throw new RuntimeException('Wenn die API-Schluessel-ID geaendert wird, muss auch das API-Geheimnis neu eingegeben werden.');
-  }
-  if ($new_api_secret !== '') $credentials['api_key_secret'] = $new_api_secret;
-  $api_key_secret = trim((string)($credentials['api_key_secret'] ?? ''));
-
-  if (($nextcloud_url === '' || $nextcloud_user === '' || $nextcloud_password === '') && ($nextcloud_url !== '' || $nextcloud_user !== '' || $nextcloud_password !== ''))
-  {
-    throw new RuntimeException('Nextcloud-Adresse, Nextcloud-Benutzer und Nextcloud-Passwort muessen fuer WebDAV gemeinsam vollstaendig sein.');
-  }
-  if (($api_key_id === '') !== ($api_key_secret === ''))
-  {
-    throw new RuntimeException('Piwigo-API-Schluessel-ID und API-Geheimnis muessen gemeinsam vollstaendig sein.');
-  }
-
-  if ($nextcloud_url !== '')
-  {
-    $validated_nc = bratonien_tools_nc_connector_validate_nextcloud_access($nextcloud_url, $nextcloud_user, $nextcloud_password);
-    $nextcloud_url = $validated_nc['base_url'];
-    $nextcloud_user = $validated_nc['username'];
-    $credentials['nextcloud_user'] = $nextcloud_user;
-  }
-  if ($api_key_id !== '')
-  {
-    bratonien_tools_nc_connector_validate_scoped_api($api_key_id, $api_key_secret);
-    $credentials['api_key_id'] = $api_key_id;
-  }
-
   $config['host'] = $host;
   $config['port'] = (string)$port;
   $config['database'] = $database;
@@ -320,16 +174,13 @@ function bratonien_tools_nc_connector_update_local_friendly()
   $config['max_wait_seconds'] = max(60, (int)($_POST['nc_max_wait_seconds'] ?? ($config['max_wait_seconds'] ?? 900)));
   $config['full_sync_seconds'] = max(300, (int)($_POST['nc_full_sync_seconds'] ?? ($config['full_sync_seconds'] ?? 86400)));
   $config['storages'] = $storages;
-  if ($nextcloud_url !== '')
-  {
-    $config['nextcloud_url'] = $nextcloud_url;
-    $config['access_user'] = $nextcloud_user;
-    $config['nextcloud_access_user'] = $nextcloud_user;
-  }
-  $config['piwigo_auth'] = 'connection-scoped';
-  $config['api_enabled'] = $api_key_id !== '' && $api_key_secret !== '';
   unset($config['verification']);
 
+  $credentials = bratonien_tools_nc_connector_scoped_secret($connection);
+  $new_db_password = (string)($_POST['nc_db_password'] ?? '');
+  if ($new_db_password !== '') $credentials['db_password'] = $new_db_password;
+  if (trim((string)($credentials['db_password'] ?? '')) === '') throw new RuntimeException('Für die Legacy-Verbindung ist kein Datenbankpasswort gespeichert.');
+
   $config_json = json_encode($config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
   if (!is_string($config_json)) throw new RuntimeException('Connector-Konfiguration konnte nicht serialisiert werden.');
   $secret_payload = json_encode($credentials, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
@@ -340,9 +191,5 @@ function bratonien_tools_nc_connector_update_local_friendly()
   $now = date('Y-m-d H:i:s');
   pwg_query("UPDATE `$table` SET name='".pwg_db_real_escape_string($name)."', config_json='".pwg_db_real_escape_string($config_json)."', secret_blob='".pwg_db_real_escape_string($secret_blob)."', updated='".pwg_db_real_escape_string($now)."' WHERE id=".$id." LIMIT 1");
 
-  $updated = bratonien_tools_nc_connector_connection($id, true);
+  return array('message'=>'Verbindung #'.$id.' wurde gespeichert. Die neuen Werte gelten ab dem nächsten Connector-Lauf.');
-  $migration = $updated ? bratonien_tools_nc_connector_migration_state($updated) : array('ready'=>false);
-  return array(
-    'message'=>'Verbindung #'.$id.' wurde gespeichert. '.(!empty($migration['ready']) ? 'Die WebDAV-Migration ist jetzt bereit.' : 'Die WebDAV-Migration ist noch nicht vollstaendig vorbereitet.'),
-  );
 }

include/nc_connector_scheduler.inc.php

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

include/nc_connector_system.inc.php

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

include/nc_connector_takeover.inc.php

@@ -0,0 +1,135 @@
+<?php
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die('Hacking attempt!');
+}
+
+/**
+ * Controlled handover preparation for verified NC Connector connections.
+ *
+ * This phase intentionally does not stop, disable or modify the legacy
+ * piwigo-sync service. It only marks a verified Connector connection as ready
+ * for a later controlled takeover. The marker can be rolled back at any time.
+ */
+
+function bratonien_tools_nc_connector_ensure_takeover_state()
+{
+  bratonien_tools_nc_connector_ensure_table();
+  $table = bratonien_tools_nc_connector_table();
+  pwg_query("ALTER TABLE `$table` MODIFY takeover_state enum('imported','verified','ready','active','disabled') NOT NULL DEFAULT 'imported'");
+}
+
+function bratonien_tools_nc_connector_prepare_takeover()
+{
+  $id = isset($_POST['connection_id']) ? (int)$_POST['connection_id'] : 0;
+  $connection = bratonien_tools_nc_connector_connection($id, false);
+  if (!$connection)
+  {
+    throw new RuntimeException('Connector-Verbindung wurde nicht gefunden.');
+  }
+  if ($connection['takeover_state'] !== 'verified')
+  {
+    throw new RuntimeException('Nur eine erfolgreich verifizierte Verbindung kann fuer die Uebergabe vorbereitet werden.');
+  }
+
+  $config = $connection['config'];
+  $verification = isset($config['verification']) && is_array($config['verification'])
+    ? $config['verification']
+    : array();
+  if (empty($verification['ok']))
+  {
+    throw new RuntimeException('Die gespeicherte Verifikation ist nicht erfolgreich. Bitte die Verbindung erneut pruefen.');
+  }
+
+  $config['takeover'] = array(
+    'prepared_at' => date('Y-m-d H:i:s'),
+    'legacy_sync_untouched' => true,
+    'connector_enabled' => false,
+    'first_run' => array(
+      'status' => 'pending',
+      'finished_at' => null,
+      'detail' => '',
+    ),
+  );
+  $config_json = json_encode($config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+  if (!is_string($config_json))
+  {
+    throw new RuntimeException('Uebergabestatus konnte nicht gespeichert werden.');
+  }
+
+  bratonien_tools_nc_connector_ensure_takeover_state();
+  $table = bratonien_tools_nc_connector_table();
+  $now = date('Y-m-d H:i:s');
+  pwg_query("UPDATE `$table` SET
+    takeover_state = 'ready',
+    enabled = 0,
+    config_json = '".pwg_db_real_escape_string($config_json)."',
+    updated = '".pwg_db_real_escape_string($now)."'
+    WHERE id = ".(int)$connection['id']);
+
+  return array(
+    'message' => 'Die verifizierte Nextcloud-Verbindung ist jetzt fuer die kontrollierte Uebergabe vorbereitet. Der Connector wurde noch nicht aktiviert und der Legacy-Sync bleibt unveraendert Produktionsverbindung.',
+  );
+}
+
+function bratonien_tools_nc_connector_cancel_takeover()
+{
+  $id = isset($_POST['connection_id']) ? (int)$_POST['connection_id'] : 0;
+  $connection = bratonien_tools_nc_connector_connection($id, false);
+  if (!$connection)
+  {
+    throw new RuntimeException('Connector-Verbindung wurde nicht gefunden.');
+  }
+  if ($connection['takeover_state'] !== 'ready')
+  {
+    throw new RuntimeException('Diese Verbindung befindet sich nicht in der Uebergabevorbereitung.');
+  }
+
+  $config = $connection['config'];
+  if (isset($config['takeover']))
+  {
+    unset($config['takeover']);
+  }
+  $config_json = json_encode($config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+  if (!is_string($config_json))
+  {
+    throw new RuntimeException('Uebergabestatus konnte nicht zurueckgesetzt werden.');
+  }
+
+  bratonien_tools_nc_connector_ensure_takeover_state();
+  $table = bratonien_tools_nc_connector_table();
+  $now = date('Y-m-d H:i:s');
+  pwg_query("UPDATE `$table` SET
+    takeover_state = 'verified',
+    enabled = 0,
+    config_json = '".pwg_db_real_escape_string($config_json)."',
+    updated = '".pwg_db_real_escape_string($now)."'
+    WHERE id = ".(int)$connection['id']);
+
+  return array(
+    'message' => 'Die Uebergabevorbereitung wurde zurueckgenommen. Die Verbindung bleibt verifiziert und deaktiviert; der Legacy-Sync bleibt unveraendert aktiv.',
+  );
+}
+
+/**
+ * Normalize the outcome of a Connector sync run during takeover.
+ *
+ * Both "changed" and "no_changes" are successful results. Only "error"
+ * represents a failed run and may trigger rollback of a controlled handover.
+ */
+function bratonien_tools_nc_connector_takeover_result($status, $detail = '')
+{
+  $status = trim((string)$status);
+  if (!in_array($status, array('changed', 'no_changes', 'error'), true))
+  {
+    throw new RuntimeException('Unbekannter Connector-Laufstatus: '.$status);
+  }
+
+  return array(
+    'status' => $status,
+    'success' => $status !== 'error',
+    'changed' => $status === 'changed',
+    'finished_at' => date('Y-m-d H:i:s'),
+    'detail' => (string)$detail,
+  );
+}

include/nc_connector_webdav.inc.php

@@ -5,8 +5,81 @@ if (!defined('PHPWG_ROOT_PATH'))
 }
 
 /**
- * Create or update one independent WebDAV connector connection.
+ * Return the only existing local connector as migration fallback.
- * No migration pair, successor or implicit legacy fallback is created.
+ */
+function bratonien_tools_nc_connector_single_local_fallback()
+{
+  bratonien_tools_nc_connector_ensure_table();
+  $table = bratonien_tools_nc_connector_table();
+  $result = pwg_query("SELECT id, enabled, takeover_state, config_json FROM `$table` WHERE adapter='local' ORDER BY id");
+  $rows = array();
+
+  while ($row = pwg_db_fetch_assoc($result))
+  {
+    $rows[] = $row;
+    if (count($rows) > 1) return null;
+  }
+
+  if (count($rows) !== 1) return null;
+
+  $row = $rows[0];
+  $config = json_decode((string)$row['config_json'], true);
+  if (!is_array($config)) $config = array();
+
+  return array(
+    'id'=>(int)$row['id'],
+    'enabled'=>(bool)$row['enabled'],
+    'takeover_state'=>(string)$row['takeover_state'],
+    'config'=>$config,
+  );
+}
+
+/**
+ * Link a WebDAV connection with the single existing local fallback.
+ */
+function bratonien_tools_nc_connector_pair_migration_fallback($webdav_id, array &$webdav_config, $now)
+{
+  $legacy = bratonien_tools_nc_connector_single_local_fallback();
+  if (!$legacy) return null;
+
+  $legacy_id = (int)$legacy['id'];
+  if ($legacy_id < 1 || $legacy_id === (int)$webdav_id) return null;
+
+  $webdav_config['migration'] = array(
+    'role'=>'webdav-primary-candidate',
+    'legacy_fallback_connection_id'=>$legacy_id,
+    'fallback_policy'=>'keep-running',
+    'paired_at'=>(string)$now,
+    'cutover_state'=>'parallel',
+  );
+
+  $legacy_config = $legacy['config'];
+  $legacy_config['migration'] = array(
+    'role'=>'legacy-fallback',
+    'webdav_successor_connection_id'=>(int)$webdav_id,
+    'fallback_policy'=>'keep-running',
+    'paired_at'=>(string)$now,
+    'cutover_state'=>'parallel',
+  );
+
+  $legacy_json = json_encode($legacy_config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+  if (!is_string($legacy_json))
+  {
+    throw new RuntimeException('Die bestehende Verbindung konnte nicht als Migrations-Fallback markiert werden.');
+  }
+
+  $table = bratonien_tools_nc_connector_table();
+  pwg_query("UPDATE `$table` SET config_json='".pwg_db_real_escape_string($legacy_json)."', updated='".pwg_db_real_escape_string((string)$now)."' WHERE id=".$legacy_id." LIMIT 1");
+
+  return $legacy_id;
+}
+
+/**
+ * Create or update a WebDAV-backed connector from the user-facing wizard.
+ *
+ * Remote connections are updated in place. When the editor was opened for a
+ * legacy connection, a WebDAV successor is created and the legacy connection
+ * stays available as fallback.
  */
 function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
 {
@@ -14,7 +87,7 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
 
   if (empty($state['scan_ok']) || empty($state['technical_complete']))
   {
-    throw new RuntimeException('Die WebDAV-Verbindung wurde im Assistenten noch nicht vollstaendig vorbereitet.');
+    throw new RuntimeException('Die WebDAV-Verbindung wurde im Assistenten noch nicht vollständig vorbereitet.');
   }
 
   $base_url = rtrim(trim((string)($state['base_url'] ?? '')), '/');
@@ -22,7 +95,7 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
   $password = (string)($state['_password'] ?? '');
   if ($base_url === '' || $username === '' || $password === '')
   {
-    throw new RuntimeException('Fuer den WebDAV-Zugang fehlen Nextcloud-Adresse oder Zugangsdaten.');
+    throw new RuntimeException('Für den WebDAV-Zugang fehlen Nextcloud-Adresse oder Zugangsdaten.');
   }
 
   $selected = isset($state['directory_selected']) && is_array($state['directory_selected'])
@@ -31,26 +104,17 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
   $selected_ids = isset($state['directory_selected_fileids']) && is_array($state['directory_selected_fileids'])
     ? $state['directory_selected_fileids']
     : array();
-
+  $selected = array_values(array_filter($selected, function($path) { return $path !== ''; }));
-  if (!$selected)
+  if (!$selected) throw new RuntimeException('Bitte mindestens ein Nextcloud-Verzeichnis auswählen.');
-  {
-    $selected = array('');
-  }
 
   $roots = array();
   foreach ($selected as $path)
   {
     $fileid = isset($selected_ids[$path]) ? (int)$selected_ids[$path] : 0;
-    if ($fileid < 1)
+    if ($fileid < 1) throw new RuntimeException('Für ein ausgewähltes Nextcloud-Verzeichnis fehlt die eindeutige Datei-ID.');
-    {
-      throw new RuntimeException('Fuer ein ausgewaehltes Nextcloud-Verzeichnis fehlt die eindeutige Datei-ID.');
-    }
-    $display_name = $path === ''
-      ? (trim((string)($state['display_name'] ?? '')) !== '' ? trim((string)$state['display_name']) : $username)
-      : basename($path);
     $roots[] = array(
       'fileid'=>$fileid,
-      'display_name'=>$display_name,
+      'display_name'=>basename($path),
       'webdav_path'=>$path,
     );
   }
@@ -74,11 +138,6 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
     && (string)($editing_connection['config']['source_mode'] ?? '') === 'webdav-placeholder'
     && $editing_mode === 'update';
 
-  if ($editing_mode === 'migrate')
-  {
-    throw new RuntimeException('Die Migrationsfunktion wurde entfernt. Bitte eine normale WebDAV-Verbindung anlegen.');
-  }
-
   $config = array(
     'origin'=>'native',
     'source_mode'=>'webdav-placeholder',
@@ -93,6 +152,7 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
     'quiet_seconds'=>120,
     'max_wait_seconds'=>900,
     'full_sync_seconds'=>86400,
+    'parallel_test'=>true,
     'piwigo_auth'=>'connection-scoped',
     'api_enabled'=>$api_enabled,
   );
@@ -100,7 +160,7 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
   if ($editing_remote)
   {
     $old_config = is_array($editing_connection['config'] ?? null) ? $editing_connection['config'] : array();
-    foreach (array('state_dir','status_file','parallel_gallery_root','source_fingerprint','runtime') as $preserve)
+    foreach (array('state_dir','status_file','parallel_gallery_root','source_fingerprint','runtime','migration') as $preserve)
     {
       if (array_key_exists($preserve, $old_config)) $config[$preserve] = $old_config[$preserve];
     }
@@ -140,12 +200,12 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
     $config_json = json_encode($config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
     if (!is_string($config_json)) throw new RuntimeException('WebDAV-Konfiguration konnte nicht serialisiert werden.');
 
-    pwg_query("UPDATE `$table` SET name='".pwg_db_real_escape_string($name)."', config_json='".pwg_db_real_escape_string($config_json)."', secret_blob='".pwg_db_real_escape_string($secret_blob)."', updated='".pwg_db_real_escape_string($now)."' WHERE id=".$editing_id." AND adapter='remote' LIMIT 1");
+    pwg_query("UPDATE `$table` SET name='".pwg_db_real_escape_string($name)."', config_json='".pwg_db_real_escape_string($config_json)."', secret_blob='".pwg_db_real_escape_string($secret_blob)."', updated='".pwg_db_real_escape_string($now)."' WHERE id=".$editing_id." LIMIT 1");
     unset($_SESSION['bratonien_nc_wizard']);
 
     return array(
       'connection_id'=>$editing_id,
-      'message'=>'WebDAV-Verbindung wurde gespeichert.',
+      'message'=>'WebDAV-Verbindung #'.$editing_id.' wurde gespeichert. Der nächste Connector-Lauf verwendet die neuen Einstellungen.',
     );
   }
 
@@ -164,14 +224,36 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
   $id = (int)pwg_db_insert_id();
   if ($id < 1) throw new RuntimeException('Die WebDAV-Verbindung konnte nicht eindeutig angelegt werden.');
 
-  $config['state_dir'] = '/var/lib/bratonien-tools/nc-connector/connection-'.$id;
+  try
-  $config['status_file'] = $config['state_dir'].'/connector-status.json';
+  {
-  $config_json = json_encode($config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+    $config['state_dir'] = '/var/lib/bratonien-tools/nc-connector/connection-'.$id;
-  if (!is_string($config_json)) throw new RuntimeException('WebDAV-Konfiguration konnte nach dem Anlegen nicht serialisiert werden.');
+    $config['status_file'] = $config['state_dir'].'/connector-status.json';
-  pwg_query("UPDATE `$table` SET config_json='".pwg_db_real_escape_string($config_json)."' WHERE id=".$id." AND adapter='remote' LIMIT 1");
+    $legacy_fallback_id = bratonien_tools_nc_connector_pair_migration_fallback($id, $config, $now);
+
+    $config_json = json_encode($config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+    if (!is_string($config_json))
+    {
+      throw new RuntimeException('Die WebDAV-Verbindung konnte nach dem Anlegen nicht serialisiert werden.');
+    }
+    pwg_query("UPDATE `$table` SET config_json='".pwg_db_real_escape_string($config_json)."' WHERE id=".$id." LIMIT 1");
+  }
+  catch (Throwable $e)
+  {
+    pwg_query("DELETE FROM `$table` WHERE id=".$id." LIMIT 1");
+    throw $e;
+  }
 
   unset($_SESSION['bratonien_nc_wizard']);
 
+  if ($legacy_fallback_id !== null)
+  {
+    return array(
+      'connection_id'=>$id,
+      'legacy_fallback_connection_id'=>$legacy_fallback_id,
+      'message'=>'WebDAV-Nachfolger wurde angelegt. Die bestehende lokale Verbindung #'.$legacy_fallback_id.' bleibt als Fallback erhalten.',
+    );
+  }
+
   return array(
     'connection_id'=>$id,
     'message'=>'WebDAV-Verbindung wurde angelegt.',

include/nc_connector_wizard_webdav_flow.inc.php

@@ -28,7 +28,7 @@ function bratonien_tools_nc_wizard_scan_webdav_first()
   {
     try
     {
-      $response = bratonien_tools_nc_transport_http($candidate_url.'/status.php');
+      $response = bratonien_tools_nc_wizard_http($candidate_url.'/status.php');
       if ($response['status'] < 200 || $response['status'] >= 300) continue;
       $candidate_status = json_decode($response['body'], true);
       if (!is_array($candidate_status) || empty($candidate_status['installed'])) continue;
@@ -44,7 +44,7 @@ function bratonien_tools_nc_wizard_scan_webdav_first()
     throw new RuntimeException('Unter dieser Adresse konnte keine Nextcloud erreicht werden. HTTP und HTTPS wurden automatisch geprüft.');
   }
 
-  $user_response = bratonien_tools_nc_transport_http(
+  $user_response = bratonien_tools_nc_wizard_http(
     $base_url.'/ocs/v2.php/cloud/user?format=json',
     $username,
     $password,
@@ -104,7 +104,7 @@ function bratonien_tools_nc_wizard_scan_webdav_first()
     'api_error'=>'',
   ));
 
-  bratonien_tools_nc_transport_refresh_directory_state($state, '');
+  bratonien_tools_nc_wizard_refresh_directory_state($state, '');
   bratonien_tools_nc_wizard_store($state);
 
   return array('message'=>'Nextcloud und WebDAV wurden bestätigt. Jetzt können die Verzeichnisse des angemeldeten Benutzers ausgewählt werden.');
@@ -126,6 +126,7 @@ function bratonien_tools_nc_wizard_save_sources_dispatch()
   $selected = isset($state['directory_selected']) && is_array($state['directory_selected'])
     ? array_values(array_unique(array_map(function($path) { return trim((string)$path, '/'); }, $state['directory_selected'])))
     : array();
+  $selected = array_values(array_filter($selected, function($path) { return $path !== ''; }));
   if (!$selected)
   {
     throw new RuntimeException('Bitte mindestens ein Nextcloud-Verzeichnis auswählen.');
@@ -142,12 +143,9 @@ function bratonien_tools_nc_wizard_save_sources_dispatch()
     {
       throw new RuntimeException('Für eine Auswahl fehlt die eindeutige Nextcloud-Datei-ID. Bitte das Verzeichnis erneut auswählen.');
     }
-    $display_name = $path === ''
-      ? (trim((string)($state['display_name'] ?? '')) !== '' ? trim((string)$state['display_name']) : (string)$state['username'])
-      : basename($path);
     $roots[] = array(
       'fileid'=>$fileid,
-      'display_name'=>$display_name,
+      'display_name'=>basename($path),
       'webdav_path'=>$path,
     );
   }
@@ -158,35 +156,9 @@ function bratonien_tools_nc_wizard_save_sources_dispatch()
   $state['technical_source'] = 'WebDAV-Verzeichnisse ausgewählt';
   $state['technical_error'] = '';
   $state['directory_selection_ready'] = false;
-
-  if ((string)($state['editing_mode'] ?? '') === 'migrate')
-  {
-    $editing_id = (int)($state['editing_connection_id'] ?? 0);
-    $connection = $editing_id > 0 ? bratonien_tools_nc_connector_connection($editing_id, true) : null;
-    if (!$connection || (string)$connection['adapter'] !== 'local')
-    {
-      throw new RuntimeException('Die zu migrierende Legacy-Verbindung ist nicht mehr verfügbar.');
-    }
-
-    $migration = bratonien_tools_nc_connector_migration_state($connection);
-    if (empty($migration['ready']))
-    {
-      throw new RuntimeException('Die WebDAV-Migration kann noch nicht abgeschlossen werden. Es fehlen: '.implode(', ', $migration['missing']).'.');
-    }
-
-    $credentials = bratonien_tools_nc_connector_scoped_secret($connection);
-    $state['_api_key_id'] = (string)($credentials['api_key_id'] ?? '');
-    $state['_api_key_secret'] = (string)($credentials['api_key_secret'] ?? '');
-    $state['api_status'] = !empty($migration['api_available']) ? 'ok' : 'skipped';
-    $state['api_error'] = '';
-    $state['step'] = 4;
-    bratonien_tools_nc_wizard_store($state);
-
-    return array('message'=>'WebDAV-Quelle wurde übernommen. Mit „Migration starten“ wird jetzt der WebDAV-Nachfolger angelegt; die Legacy-Verbindung bleibt als Fallback erhalten.');
-  }
-
   bratonien_tools_nc_wizard_store($state);
-  return array('message'=>'WebDAV-Verzeichnisse wurden übernommen. Die Verbindung ist für den nächsten Einrichtungsschritt vorbereitet.');
+
+  return array('message'=>'WebDAV-Verzeichnisse wurden übernommen. Die Verbindung ist für den parallelen Testweg vorbereitet.');
 }
 
 function bratonien_tools_nc_wizard_finish_dispatch()

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');
+  $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.');
+  $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,
-    'new_categories'=>0,
+    'del_categories' => 0,
-    'removed_duplicate_categories'=>0,
+    'new_elements' => 0,
-    'new_elements'=>0,
+    'del_elements' => 0,
-    'del_elements'=>0,
+    'upd_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()'));
+    $query = 'SELECT id, id_uppercat, uppercats, global_rank, status, visible FROM '.CATEGORIES_TABLE.' WHERE dir IS NOT NULL AND site_id = '.$site_id;
-    $fs_dirs = $site_reader->get_full_directories($basedir);
+    $db_categories = hash_from_query($query, 'id');
-    usort($fs_dirs, function($a, $b)
+    $db_fulldirs = get_fulldirs(array_keys($db_categories));
-    {
+    $basedir = preg_replace('#/*$#', '', $site_url);
-      return substr_count((string)$a, '/') <=> substr_count((string)$b, '/');
+    $db_fulldirs = array_flip($db_fulldirs);
-    });
+    $fs_fulldirs = $site_reader->get_full_directories($basedir);
 
-    $album_cache = array();
+    $next_rank = array('NULL'=>1);
-    $created_ids = array();
+    $result = pwg_query('SELECT id FROM '.CATEGORIES_TABLE);
-    $dir_to_album = array();
+    while ($row = pwg_db_fetch_assoc($result))
-    foreach ($fs_dirs as $full_dir)
     {
-      $relative = bratonien_tools_nc_relative_path($basedir, $full_dir);
+      $next_rank[$row['id']] = 1;
-      if ($relative === '') continue;
+    }
-      $before = count($created_ids);
+    $result = pwg_query('SELECT id_uppercat, MAX(`rank`)+1 AS next_rank FROM '.CATEGORIES_TABLE.' GROUP BY id_uppercat');
-      $album_id = bratonien_tools_nc_ensure_album_path($relative, $site_id, $album_cache, $created_ids);
+    while ($row = pwg_db_fetch_assoc($result))
-      if ($album_id !== null)
+    {
-      {
+      $key = empty($row['id_uppercat']) ? 'NULL' : $row['id_uppercat'];
-        $dir_to_album[$full_dir] = $album_id;
+      $next_rank[$key] = (int)$row['next_rank'];
-        if (count($created_ids) === $before) $counts['reused_categories']++;
+    }
-      }
+
+    $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);
+    $cat_ids = array_diff(array_keys($db_categories), $to_delete_categories);
-    $db_by_path = array_flip($db_elements);
+    $db_elements = array();
-
+    if ($cat_ids)
-    // Nicht-destruktiver Schutz: Bestehende Piwigo-Bilder werden niemals allein
+    {
-    // deshalb geloescht, weil sie im aktuellen WebDAV-Scan nicht vorkommen.
+      $query = 'SELECT id, path FROM '.IMAGES_TABLE.' WHERE storage_category_id IN ('.implode(',', array_map('intval', $cat_ids)).')';
-    // Das Entfernen ist erst wieder zulaessig, wenn Connector-Eigentum eindeutig
+      $db_elements = simple_hash_from_query($query, 'id', 'path');
-    // und verbindungsbezogen gespeichert wird.
+    }
 
     $next_element_id = pwg_db_nextval('id', IMAGES_TABLE);
     $image_inserts = array();
     $image_links = array();
-    $new_ids = array();
+    $format_inserts = array();
-    $all_ids = 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);
+      if (!isset($db_fulldirs[$dirname]))
-      $category_id = null;
-      if ($relative_dir !== '')
       {
-        $category_id = $dir_to_album[$dirname] ?? bratonien_tools_nc_ensure_album_path($relative_dir, $site_id, $album_cache, $created_ids);
-      }
-
-      if (isset($db_by_path[$path]))
-      {
-        // 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,
+        'id' => $id,
-        'file'=>$filename,
+        'file' => $filename,
-        'name'=>get_name_from_file($filename),
+        'name' => get_name_from_file($filename),
-        'date_available'=>$dbnow,
+        'date_available' => $dbnow,
-        'path'=>$path,
+        'path' => $path,
-        'representative_ext'=>$file_info['representative_ext'],
+        'representative_ext' => $fs[$path]['representative_ext'],
-        'storage_category_id'=>null,
+        'storage_category_id' => $db_fulldirs[$dirname],
-        'added_by'=>(int)$user['id'],
+        '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);
+      mass_inserts(IMAGE_CATEGORY_TABLE, array_keys($image_links[0]), $image_links);
-      pwg_activity('photo', $new_ids, 'add', array('sync'=>true));
+      pwg_activity('photo', $new_image_ids, 'add', array('sync'=>true));
-      $counts['new_elements'] = count($new_ids);
+      $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
+    if (!empty($conf['enable_formats']) && $db_elements)
-    // angelegte Connector-Bilder erhalten die aus der Quelle ermittelten Attribute.
-    $updates = array();
-    foreach ($new_ids as $id)
     {
-      $path_result = pwg_query('SELECT path FROM '.IMAGES_TABLE.' WHERE id='.(int)$id.' LIMIT 1');
+      $db_elements_flip = array_flip($db_elements);
-      if (!pwg_db_num_rows($path_result)) continue;
+      $existing_ids = array();
-      list($path) = pwg_db_fetch_row($path_result);
+      foreach (array_intersect_key($fs, $db_elements_flip) as $path => $unused)
-      $data = $site_reader->get_element_update_attributes($path);
+      {
-      if (!is_array($data)) continue;
+        $existing_ids[] = (int)$db_elements_flip[$path];
-      $data['id'] = (int)$id;
+      }
+
+      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(
+    // Mirror Piwigo 16.4.0 Maintenance -> "Update photos information".
-      'mode'=>'productive',
+    // This finalizes physical paths, ratings and derived photo information.
-      'piwigo_version'=>$piwigo_version,
+    images_integrity();
-      'site_id'=>$site_id,
+    update_path();
-      'site_url'=>$site_url,
+    include_once(PHPWG_ROOT_PATH.'include/functions_rate.inc.php');
-      'counts'=>$counts,
+    update_rating_score();
-      'errors'=>$errors,
+    invalidate_user_cache();
-      'database_writes'=>array_sum($counts) > 0,
-    );
   }
-  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/nc_transport.inc.php

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

include/tool_registry.inc.php

@@ -4,17 +4,6 @@ if (!defined('PHPWG_ROOT_PATH'))
   die('Hacking attempt!');
 }
 
-if (isset($GLOBALS['template']) && is_object($GLOBALS['template']) && method_exists($GLOBALS['template'], 'func_combine_script'))
-{
-  $script_version = function_exists('bratonien_tools_current_version') ? bratonien_tools_current_version() : '0.9.7.1';
-  $GLOBALS['template']->func_combine_script(array(
-    'id'=>'bratonien_nc_connector_edit_v2',
-    'path'=>BRATONIEN_TOOLS_PATH.'js/nc_connector_edit_v2.js',
-    'load'=>'footer',
-    'version'=>$script_version,
-  ));
-}
-
 require_once(BRATONIEN_TOOLS_PATH . 'tools/image_cache.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'tools/watermark.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'tools/watermark_profiles.inc.php');
@@ -28,6 +17,7 @@ require_once(BRATONIEN_TOOLS_PATH . 'include/album_shares.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/album_lock.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_manage.inc.php');
+require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_takeover.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_auth.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_create_api.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_piwigo_api.inc.php');
@@ -41,24 +31,6 @@ require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_delete_safe.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_webdav.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_wizard_webdav_flow.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_edit.inc.php');
-require_once(BRATONIEN_TOOLS_PATH . 'include/nc_transport.inc.php');
-require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_scheduler.inc.php');
-require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_system.inc.php');
-
-function bratonien_tools_nc_connector_run_now()
-{
-  $connection_id = isset($_POST['connection_id']) ? max(0, (int)$_POST['connection_id']) : 0;
-  if ($connection_id > 0)
-  {
-    $connection = bratonien_tools_nc_connector_connection($connection_id, false);
-    if (!$connection)
-    {
-      throw new RuntimeException('Die ausgewählte Verbindung existiert nicht.');
-    }
-  }
-  $result = bratonien_tools_nc_scheduler_spawn(true, $connection_id);
-  return array('message'=>(string)($result['message'] ?? ($connection_id > 0 ? 'Abgleich wurde gestartet.' : 'Abgleich für alle Verbindungen wurde gestartet.')));
-}
 
 function bratonien_tools_get_tools()
 {
@@ -83,16 +55,17 @@ function bratonien_tools_get_tools()
     'album_share_create' => array('handler' => 'bratonien_tools_create_album_share'),
     'album_share_regenerate_link' => array('handler' => 'bratonien_tools_regenerate_album_share_link'),
     'album_share_revoke' => array('handler' => 'bratonien_tools_revoke_album_share'),
+    'nc_connector_create_local' => array('handler' => 'bratonien_tools_nc_connector_create_local_api_first'),
     'nc_connector_create_webdav_parallel' => array('handler' => 'bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard'),
-    'nc_connector_edit_start' => array('handler' => 'bratonien_tools_nc_transport_edit_start'),
+    'nc_connector_edit_start' => array('handler' => 'bratonien_tools_nc_connector_edit_start'),
+    'nc_connector_migrate_start' => array('handler' => 'bratonien_tools_nc_connector_migrate_start'),
     'nc_connector_update_local' => array('handler' => 'bratonien_tools_nc_connector_update_local_friendly'),
     'nc_connector_delete' => array('handler' => 'bratonien_tools_nc_connector_delete_safe'),
     'nc_connector_update_name' => array('handler' => 'bratonien_tools_nc_connector_update_name'),
     'nc_connector_update_technical' => array('handler' => 'bratonien_tools_nc_connector_update_technical'),
-    'nc_connector_run_now' => array('handler' => 'bratonien_tools_nc_connector_run_now'),
     'nc_connector_wizard_scan' => array('handler' => 'bratonien_tools_nc_wizard_scan_webdav_first'),
     'nc_connector_wizard_save_technical' => array('handler' => 'bratonien_tools_nc_wizard_save_technical_flow'),
-    'nc_connector_wizard_directory_browse' => array('handler' => 'bratonien_tools_nc_transport_wizard_directory_browse'),
+    'nc_connector_wizard_directory_browse' => array('handler' => 'bratonien_tools_nc_wizard_directory_browse'),
     'nc_connector_wizard_directory_add' => array('handler' => 'bratonien_tools_nc_wizard_directory_add'),
     'nc_connector_wizard_directory_remove' => array('handler' => 'bratonien_tools_nc_wizard_directory_remove'),
     'nc_connector_wizard_save_mounts' => array('handler' => 'bratonien_tools_nc_wizard_save_sources_dispatch'),
@@ -102,7 +75,10 @@ function bratonien_tools_get_tools()
     'nc_connector_wizard_finish' => array('handler' => 'bratonien_tools_nc_wizard_finish_dispatch'),
     'nc_connector_wizard_back' => array('handler' => 'bratonien_tools_nc_wizard_back'),
     'nc_connector_wizard_reset' => array('handler' => 'bratonien_tools_nc_wizard_reset'),
+    'nc_connector_import_legacy' => array('handler' => 'bratonien_tools_nc_connector_import_legacy'),
     'nc_connector_verify' => array('handler' => 'bratonien_tools_nc_connector_verify_connection_scoped'),
+    'nc_connector_prepare_takeover' => array('handler' => 'bratonien_tools_nc_connector_prepare_takeover'),
+    'nc_connector_cancel_takeover' => array('handler' => 'bratonien_tools_nc_connector_cancel_takeover'),
     'nc_connector_piwigo_api_test' => array('handler' => 'bratonien_tools_nc_connector_piwigo_api_test'),
     'nc_connector_piwigo_api_delete' => array('handler' => 'bratonien_tools_nc_connector_api_delete'),
     'nc_connector_fallback_save' => array('handler' => 'bratonien_tools_nc_connector_fallback_save_scoped'),

include/watermark_engine.inc.php

@@ -8,22 +8,12 @@ require_once(BRATONIEN_TOOLS_PATH . 'include/watermark_base.inc.php');
 
 function bratonien_tools_watermark_engine_enabled()
 {
-  static $initialized = false;
-  static $enabled = false;
-
-  if ($initialized)
-  {
-    return $enabled;
-  }
-
   $config = bratonien_tools_get_watermark_engine_config();
   $enabled = !empty($config['enabled']);
-  $initialized = true;
 
   // Piwigo recalculates use_watermark for custom derivatives from the native
   // watermark file itself. Therefore an active Bratonien engine must keep the
   // native watermark file empty, not only the stored use_watermark flags false.
-  // This initialization is required only once per PHP request.
   if ($enabled)
   {
     bratonien_tools_disable_piwigo_watermarks();

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_gallery_runtime.inc.php

@@ -1,98 +0,0 @@
-<?php
-if (!defined('PHPWG_ROOT_PATH'))
-{
-  die('Hacking attempt!');
-}
-
-function bratonien_tools_webdav_derivative_matches_preview($derivative_path, $params, $image_id)
-{
-  $derivative_path = (string)$derivative_path;
-  $image_id = (int)$image_id;
-  if ($derivative_path === '' || $image_id < 1 || !is_file($derivative_path) || !is_readable($derivative_path)) return false;
-
-  $info = bratonien_tools_webdav_image_source_info($image_id);
-  if (!$info) return false;
-
-  $preview = bratonien_tools_webdav_preview_path($info);
-  if (!$preview || !is_file($preview) || !is_readable($preview)) return false;
-
-  $preview_size = @getimagesize($preview);
-  $derivative_size = @getimagesize($derivative_path);
-  if (!is_array($preview_size) || empty($preview_size[0]) || empty($preview_size[1])) return false;
-  if (!is_array($derivative_size) || empty($derivative_size[0]) || empty($derivative_size[1])) return false;
-
-  try
-  {
-    $expected_size = $params->compute_final_size(array((int)$preview_size[0], (int)$preview_size[1]));
-  }
-  catch (Throwable $e)
-  {
-    return false;
-  }
-
-  if (!is_array($expected_size) || !isset($expected_size[0], $expected_size[1])) return false;
-  if ((int)$derivative_size[0] !== (int)$expected_size[0] || (int)$derivative_size[1] !== (int)$expected_size[1]) return false;
-
-  $preview_mtime = @filemtime($preview) ?: 0;
-  $derivative_mtime = @filemtime($derivative_path) ?: 0;
-  if ($preview_mtime > 0 && $derivative_mtime < $preview_mtime) return false;
-
-  return true;
-}
-
-function bratonien_tools_webdav_ondemand_derivative_url($image_id, $params)
-{
-  $image_id = (int)$image_id;
-  if ($image_id < 1 || !is_object($params)) return null;
-
-  $type = trim((string)($params->type ?? ''));
-  if ($type === '') return null;
-
-  return get_root_url().'plugins/'.BRATONIEN_TOOLS_ID.'/webdav-derivative.php?id='.$image_id.'&type='.rawurlencode($type);
-}
-
-function bratonien_tools_filter_webdav_gallery_derivative_url($url, $params, $src_image, $rel_url)
-{
-  if (!is_object($src_image) || empty($src_image->id) || empty($src_image->rel_path)) return $url;
-
-  $source_path = str_replace('\\', '/', (string)$src_image->rel_path);
-  if (!preg_match('#/nc-webdav-source/connection-[0-9]+/root-[0-9]+/.+$#', $source_path))
-  {
-    return $url;
-  }
-
-  $image_id = (int)$src_image->id;
-  try
-  {
-    $derivative = new DerivativeImage($params, $src_image);
-    if (!$derivative->same_as_source())
-    {
-      $derivative_path = $derivative->get_path();
-      if (bratonien_tools_webdav_derivative_matches_preview($derivative_path, $params, $image_id))
-      {
-        return $url;
-      }
-    }
-  }
-  catch (Throwable $e)
-  {
-    error_log('Bratonien WebDAV derivative lookup #'.$image_id.': '.$e->getMessage());
-  }
-
-  // Auf der Picture-/Fotorama-Seite wird nicht mehr waehrend des HTML-Aufbaus
-  // synchron erzeugt. Fotorama arbeitet lazy: Erst wenn das konkrete Bild in
-  // den Fokus kommt und seine URL abruft, erzeugt dieser Endpoint genau dieses
-  // angeforderte Standard-Derivat aus dem bereits gecachten NC-Preview.
-  $script_name = basename((string)($_SERVER['SCRIPT_NAME'] ?? ''));
-  if ($script_name === 'picture.php')
-  {
-    $ondemand_url = bratonien_tools_webdav_ondemand_derivative_url($image_id, $params);
-    if ($ondemand_url) return $ondemand_url;
-  }
-
-  // Galerie-Fallback: niemals Connector-Platzhalter ausliefern. Solange kein
-  // lokales korrektes Derivat vorliegt, wird das echte vorbereitete NC-Preview
-  // verwendet. Der eigentliche Galerie-Derivattyp wird beim Sync vorgebaut.
-  $preview_url = bratonien_tools_webdav_image_url($image_id, true);
-  return $preview_url ?: $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
-    $table = defined('BRATONIEN_TOOLS_NC_CONNECTIONS_TABLE')
+    : $GLOBALS['prefixeTable'].'bratonien_tools_nc_connections';
-      ? BRATONIEN_TOOLS_NC_CONNECTIONS_TABLE
+  $connection_result = pwg_query('SELECT config_json FROM `'.$table.'` WHERE id='.$connection_id.' LIMIT 1');
-      : $GLOBALS['prefixeTable'].'bratonien_tools_nc_connections';
+  if (!pwg_db_num_rows($connection_result)) return $cache[$image_id] = null;
-    $connection_result = pwg_query('SELECT config_json FROM `'.$table.'` WHERE id='.$connection_id.' LIMIT 1');
+  $connection_row = pwg_db_fetch_assoc($connection_result);
-    if (!pwg_db_num_rows($connection_result))
+  $config = json_decode((string)$connection_row['config_json'], true);
-    {
-      $connection_cache[$connection_id] = null;
-    }
-    else
-    {
-      $connection_row = pwg_db_fetch_assoc($connection_result);
-      $decoded = json_decode((string)$connection_row['config_json'], true);
-      $connection_cache[$connection_id] = is_array($decoded) ? $decoded : null;
-    }
-  }
-
-  $config = $connection_cache[$connection_id];
   if (!is_array($config) || (string)($config['source_mode'] ?? '') !== 'webdav-placeholder')
   {
     return $cache[$image_id] = null;
   }
 
   $root_path = '';
-  $root_found = false;
   $roots = isset($config['roots']) && is_array($config['roots']) ? $config['roots'] : array();
   foreach ($roots as $root)
   {
     if ((int)($root['fileid'] ?? 0) === $root_fileid)
     {
       $root_path = trim((string)($root['webdav_path'] ?? ''), '/');
-      $root_found = true;
       break;
     }
   }
-  if (!$root_found) return $cache[$image_id] = null;
+  if ($root_path === '') return $cache[$image_id] = null;
 
-  $root_is_base = $root_path === '';
+  $webdav_path = $root_path.'/'.$relative_path;
-  $webdav_path = $root_is_base ? $relative_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();
+    $mapping_file = $state_dir.'/webdav-map.json';
-    $state_dir = rtrim((string)($config['state_dir'] ?? ''), '/');
+    if (is_readable($mapping_file))
-    if ($state_dir !== '')
     {
-      $mapping_file = $state_dir.'/webdav-map.json';
+      $mapping = json_decode((string)file_get_contents($mapping_file), true);
-      if (is_readable($mapping_file))
+      if (is_array($mapping) && isset($mapping['files']) && is_array($mapping['files']))
       {
-        $mapping = json_decode((string)file_get_contents($mapping_file), true);
+        $entry = $mapping['files'][$resolved] ?? $mapping['files'][$normalized] ?? null;
-        if (is_array($mapping) && isset($mapping['files']) && is_array($mapping['files']))
+        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;
-
+  $info = bratonien_tools_webdav_image_source_info((int)$src_image->id);
-  // Hotpath: Bei einem bereits vorbereiteten WebDAV-Derivat keinerlei
+  if (!$info) return $url;
-  // Connection-DB oder Mapping-Datei mehr anfassen. Der reale Quellpfad
-  // reicht aus, um Connector-Bilder sicher zu erkennen.
-  $source_path = $src_image->get_path();
-  $resolved_source = $source_path !== '' ? realpath($source_path) : false;
-  if ($resolved_source === false || !preg_match('#/nc-webdav-source/connection-[0-9]+/root-[0-9]+/#', str_replace('\\\\', '/', $resolved_source)))
-  {
-    return $url;
-  }
 
   try
   {

js/nc_connector_edit_v2.js

@@ -1,236 +0,0 @@
-(function () {
-  'use strict';
-
-  function ready(callback) {
-    if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', callback);
-    else callback();
-  }
-
-  ready(function () {
-    var section = document.getElementById('nc-connector');
-    if (!section) return;
-
-    var tokenInput = section.querySelector('input[name="pwg_token"]');
-    var pwgToken = tokenInput ? tokenInput.value : '';
-
-    var technicalButton = document.getElementById('bratonien-nc-technical-open');
-    if (technicalButton) technicalButton.remove();
-    var technicalCreate = document.getElementById('bratonien-nc-technical-create');
-    if (technicalCreate) technicalCreate.remove();
-
-    var statusHeading = Array.prototype.find.call(section.querySelectorAll('h4'), function (heading) {
-      return heading.textContent.trim() === 'Status';
-    });
-    var statusCard = statusHeading ? statusHeading.closest('.bratonien-card') : null;
-    if (statusCard && pwgToken && !statusCard.querySelector('[data-nc-run-now]')) {
-      var runForm = document.createElement('form');
-      runForm.method = 'post';
-      runForm.className = 'bratonien-actions';
-      runForm.style.marginTop = '1rem';
-      runForm.setAttribute('data-nc-run-now', '1');
-      runForm.innerHTML = '<input type="hidden" name="pwg_token" value="'+escapeHtml(pwgToken)+'">'
-        + '<button class="buttonLike" type="submit" name="bratonien_tool" value="nc_connector_run_now">Jetzt abgleichen</button>';
-      runForm.addEventListener('submit', function () {
-        var button = runForm.querySelector('button');
-        if (button) {
-          button.disabled = true;
-          button.textContent = 'Abgleich wird gestartet …';
-        }
-      });
-      statusCard.appendChild(runForm);
-    }
-
-    function escapeHtml(value) {
-      return String(value == null ? '' : value).replace(/[&<>"']/g, function (c) {
-        return {'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&#039;'}[c];
-      });
-    }
-
-    function loadConnection(id) {
-      return fetch('plugins/bratonien_tools/nc-connector-edit-data.php?connection_id='+encodeURIComponent(id)+'&_='+Date.now(), {
-        credentials:'same-origin', cache:'no-store', headers:{'Accept':'application/json'}
-      }).then(function (response) {
-        return response.json().then(function (data) {
-          if (!response.ok) throw new Error(data.error || ('HTTP '+response.status));
-          return data;
-        });
-      });
-    }
-
-    function createPostForm(label, tool, id) {
-      var form = document.createElement('form');
-      form.method = 'post';
-      form.style.display = 'inline';
-      form.innerHTML = '<input type="hidden" name="pwg_token" value="'+escapeHtml(pwgToken)+'">'
-        + '<input type="hidden" name="connection_id" value="'+escapeHtml(id)+'">'
-        + '<button class="buttonLike" type="submit" name="bratonien_tool" value="'+escapeHtml(tool)+'">'+escapeHtml(label)+'</button>';
-      return form;
-    }
-
-    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;
-    }
-
-    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>';
-    }
-
-    function showError(form, data) {
-      var old = form.querySelector('[data-edit-error]');
-      if (old) old.remove();
-      var box = document.createElement('div');
-      box.dataset.editError = '1';
-      box.className = 'bratonien-main-cache__warning';
-      box.style.margin = '0 0 1rem';
-      box.textContent = (data && data.message) ? data.message : 'Die Verbindung konnte nicht gespeichert werden.';
-      form.insertBefore(box, form.firstChild);
-    }
-
-    function 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();
-    });
-
-    [].slice.call(section.querySelectorAll('button[value="nc_connector_migrate_start"]')).forEach(function (button) {
-      var form = button.closest('form');
-      if (form) form.remove();
-    });
-
-    [].slice.call(section.querySelectorAll('button[value="nc_connector_delete"]')).forEach(function (deleteButton) {
-      var deleteForm = deleteButton.closest('form');
-      if (!deleteForm || !deleteForm.parentElement) return;
-      var idInput = deleteForm.querySelector('input[name="connection_id"]');
-      if (!idInput) return;
-      var id = idInput.value;
-      var actions = deleteForm.parentElement;
-
-      loadConnection(id).then(function (data) {
-        var edit;
-        if (data.adapter === 'local') {
-          edit = document.createElement('button');
-          edit.type = 'button';
-          edit.className = 'buttonLike';
-          edit.textContent = 'Bearbeiten';
-          edit.addEventListener('click', function () { openLocalEditor(id); });
-        } else {
-          edit = createPostForm('Bearbeiten', 'nc_connector_edit_start', id);
-        }
-        actions.insertBefore(edit, deleteForm);
-      }).catch(function (error) {
-        var info = document.createElement('span');
-        info.className = 'bratonien-main-cache__warning';
-        info.textContent = 'Verbindung konnte nicht geladen werden: '+(error.message || String(error));
-        actions.insertBefore(info, deleteForm);
-      });
-    });
-  });
-})();

main.inc.php

@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: Bratonien Tools
-Version: 0.9.7.14
+Version: 0.9.6.9
 Description: Erweiterbare Administrationswerkzeuge fuer die Bratonien-Piwigo-Installation.
 Plugin URI: https://github.com/Terranom674/Piwigo_Bratonien_Tools
 Author: Bratonien
@@ -17,7 +17,6 @@ define('BRATONIEN_TOOLS_PATH', PHPWG_PLUGINS_PATH . BRATONIEN_TOOLS_ID . '/');
 
 require_once(BRATONIEN_TOOLS_PATH . 'include/watermark_runtime.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/webdav_image_runtime.inc.php');
-require_once(BRATONIEN_TOOLS_PATH . 'include/webdav_gallery_runtime.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/public_selection.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/picture_navigation.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/batch_titles.inc.php');
@@ -25,16 +24,13 @@ require_once(BRATONIEN_TOOLS_PATH . 'include/album_shares.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_ws.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_orphan_ws.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_productive_ws.inc.php');
-require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_scheduler.inc.php');
 
 add_event_handler('get_admin_plugin_menu_links', 'bratonien_tools_admin_menu');
-add_event_handler('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_gallery_derivative_url', EVENT_HANDLER_PRIORITY_NEUTRAL + 50, 4);
+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

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

@@ -79,15 +79,6 @@ $payload = array(
     '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,70 +0,0 @@
-#!/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
-
-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

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();
+  $variants = bratonien_tools_webdav_derivative_variants();
-  $gallery_base_type = (string)$gallery_base_params->type;
+  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);
+      try
-      $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())
       {
-        $identity++;
+        $probe = new DerivativeImage($params, $src);
-        continue;
+        if ($probe->same_as_source())
-      }
-
-      $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])
-        )
         {
-          if (!@unlink($target))
+          $identity++;
-          {
+          continue;
-            $errors++;
+        }
-            $error_lines[] = 'Bild #'.$image_id.' Galerie: falsches Alt-Derivat konnte nicht entfernt werden: '.$target;
+
-            continue;
+        $detail = '';
-          }
+        if (bratonien_tools_webdav_generate_derivative($params, $src, $detail))
-          $legacy_derivatives_rebuilt++;
+        {
+          $generated_or_ready++;
+        }
+        else
+        {
+          $errors++;
+          $error_lines[] = 'Bild #'.$image_id.' '.$variant_name.': '.($detail !== '' ? $detail : 'Derivat konnte nicht erzeugt werden.');
         }
       }
-
+      catch (Throwable $e)
-      $detail = '';
-      if (bratonien_tools_webdav_generate_derivative($gallery_params, $src, $detail))
-      {
-        $generated_or_ready++;
-      }
-      else
       {
         $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'.
+    ' varianten='.count($variants).
-    ' modus_basis='.$gallery_base_type.
-    ' modus_varianten='.implode(',', $variant_parts).
     ' bereit='.$generated_or_ready.
     ' identisch='.$identity.
     ' metadaten_repariert='.$metadata_repaired.
-    ' alt_derivate_neu='.$legacy_derivatives_rebuilt.
     ' fehler='.$errors."\n";
 
   exit($errors > 0 ? 1 : 0);

runtime/lib/build_webdav_placeholder_source.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
 """Build a placeholder-backed local source tree from Nextcloud WebDAV.
 
-This creates only tiny placeholder files plus a metadata mapping; no Nextcloud
+This is intentionally additive: it does not replace the existing local-storage
-original media is downloaded. The authenticated Nextcloud user is never used as
+connector path. It creates only tiny placeholder files plus a metadata mapping;
-an album name.
+no Nextcloud original media is downloaded.
 """
 
 from __future__ import annotations
@@ -14,7 +14,6 @@ import getpass
 import json
 import os
 import shutil
-import socket
 import ssl
 import sys
 import tempfile
@@ -22,12 +21,13 @@ import urllib.error
 import urllib.parse
 import urllib.request
 import xml.etree.ElementTree as ET
-from contextlib import contextmanager
 from pathlib import Path, PurePosixPath
 
 DAV = "DAV:"
 OC = "http://owncloud.org/ns"
 SUPPORTED_IMAGE_EXTENSIONS = {".jpg", ".jpeg", ".png", ".gif", ".webp"}
+# 1x1 transparent GIF, 34 bytes. The filename keeps the remote extension;
+# the placeholder exists only so Piwigo can discover the logical image entry.
 PLACEHOLDER = base64.b64decode("R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==")
 
 
@@ -54,37 +54,9 @@ def safe_local_name(name: str) -> str:
     return name
 
 
-@contextmanager
-def pinned_resolution(host: str, ip: str):
-    host = host.strip("[]").lower()
-    ip = ip.strip("[]")
-    if not host or not ip or host == ip:
-        yield
-        return
-
-    original = socket.getaddrinfo
-
-    def resolve(name, port, family=0, type=0, proto=0, flags=0):
-        normalized = str(name).strip("[]").lower()
-        if normalized == host:
-            return original(ip, port, family, type, proto, flags)
-        return original(name, port, family, type, proto, flags)
-
-    socket.getaddrinfo = resolve
-    try:
-        yield
-    finally:
-        socket.getaddrinfo = original
-
-
 class WebDavClient:
-    def __init__(self, base_url: str, user: str, password: str, timeout: int = 30, connect_ip: str = "") -> None:
+    def __init__(self, base_url: str, user: str, password: str, timeout: int = 30) -> None:
         self.base_url = base_url.rstrip("/")
-        parsed = urllib.parse.urlparse(self.base_url)
-        if parsed.scheme not in {"http", "https"} or not parsed.hostname:
-            fail("Nextcloud base URL must use HTTP or HTTPS and contain a host")
-        self.host = parsed.hostname.strip("[]")
-        self.connect_ip = connect_ip.strip("[]") or self.host
         self.user = user
         self.password = password
         self.timeout = timeout
@@ -114,10 +86,9 @@ class WebDavClient:
         request.add_header("Depth", "1")
         request.add_header("Content-Type", "application/xml; charset=utf-8")
         try:
-            with pinned_resolution(self.host, self.connect_ip):
+            with urllib.request.urlopen(request, timeout=self.timeout, context=self.context) as response:
-                with urllib.request.urlopen(request, timeout=self.timeout, context=self.context) as response:
+                status = response.status
-                    status = response.status
+                payload = response.read()
-                    payload = response.read()
         except urllib.error.HTTPError as error:
             if error.code in {401, 403}:
                 fail("Nextcloud rejected the WebDAV credentials or directory access")
@@ -127,14 +98,14 @@ class WebDavClient:
         if status != 207:
             fail(f"Nextcloud PROPFIND returned HTTP {status}")
 
-        base_path = urllib.parse.unquote(urllib.parse.urlparse(url).path).rstrip("/")
-        current: dict[str, object] | None = None
-        children: list[dict[str, object]] = []
         try:
             root = ET.fromstring(payload)
         except ET.ParseError as error:
             raise RuntimeError("Nextcloud returned invalid WebDAV XML") from error
 
+        base_path = urllib.parse.unquote(urllib.parse.urlparse(url).path).rstrip("/")
+        current: dict[str, object] | None = None
+        children: list[dict[str, object]] = []
         for response in root.findall(f"{{{DAV}}}response"):
             href = response.findtext(f"{{{DAV}}}href", default="")
             href_path = urllib.parse.unquote(urllib.parse.urlparse(href).path).rstrip("/")
@@ -177,7 +148,13 @@ def link_placeholder(seed: Path, target: Path) -> None:
         target.write_bytes(PLACEHOLDER)
 
 
-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,
+    seed: Path,
+    mapping: dict[str, dict[str, object]],
+) -> tuple[int, int, int]:
     files = 0
     folders = 0
     skipped = 0
@@ -244,7 +221,6 @@ def atomic_text(path: Path, text: str) -> None:
 def main() -> int:
     parser = argparse.ArgumentParser()
     parser.add_argument("--base-url", required=True)
-    parser.add_argument("--connect-ip", default="", help="IP address used for the TCP connection while preserving the URL host for HTTP Host and TLS SNI")
     parser.add_argument("--user", required=True)
     parser.add_argument("--password-file", type=Path)
     parser.add_argument("--root", action="append", required=True, help="WebDAV path relative to the authenticated user's files root")
@@ -273,40 +249,26 @@ def main() -> int:
             shutil.rmtree(staging)
         staging.mkdir(parents=True)
 
-        client = WebDavClient(args.base_url, args.user, password, max(1, args.timeout), args.connect_ip)
+        client = WebDavClient(args.base_url, args.user, password, max(1, args.timeout))
         mapping: dict[str, dict[str, object]] = {}
         manifest: list[str] = []
         total_files = total_folders = total_skipped = 0
-        used_fileids: set[int] = set()
+        used_names: set[str] = set()
 
         for remote_root_raw in args.root:
             remote_root = validate_relative(remote_root_raw)
-            current, root_children = client.list_collection(remote_root)
+            current, _ = client.list_collection(remote_root)
             fileid = int(current["fileid"])
-            if fileid in used_fileids:
+            display = str(current.get("display_name", "")).strip() or (PurePosixPath(remote_root).name if remote_root else args.user)
-                fail(f"duplicate selected Nextcloud root fileid: {fileid}")
-            used_fileids.add(fileid)
             local_name = f"root-{fileid}"
+            if local_name in used_names:
+                fail(f"duplicate selected Nextcloud root fileid: {fileid}")
+            used_names.add(local_name)
             local_root = staging / local_name
             files, folders, skipped = build_root(client, remote_root, local_root, seed, mapping)
             total_files += files
             total_folders += folders
             total_skipped += skipped
-
-            if remote_root == "":
-                for child in sorted(root_children, key=lambda item: str(item.get("display_name", "")).casefold()):
-                    name = safe_local_name(str(child.get("display_name", "")))
-                    child_fileid = int(child.get("fileid", 0))
-                    if child_fileid < 1:
-                        fail(f"Nextcloud returned no stable fileid for root child {name!r}")
-                    child_path = source_dir / local_name / name
-                    if bool(child.get("is_dir")):
-                        manifest.append(f"webdav:{child_fileid}\tfolder\t{name}\t{child_path}")
-                    elif Path(name).suffix.lower() in SUPPORTED_IMAGE_EXTENSIONS:
-                        manifest.append(f"webdav:{child_fileid}\tfile\t{name}\t{child_path}")
-                continue
-
-            display = str(current.get("display_name", "")).strip() or PurePosixPath(remote_root).name
             manifest.append(f"webdav:{fileid}\tfolder\t{display}\t{source_dir / local_name}")
 
         if previous.exists():
@@ -335,7 +297,6 @@ def main() -> int:
         atomic_json(args.mapping, {
             "version": 1,
             "base_url": args.base_url.rstrip("/"),
-            "connect_ip": client.connect_ip,
             "user": args.user,
             "files": final_mapping,
         })
@@ -344,7 +305,6 @@ def main() -> int:
             "files": total_files,
             "folders": total_folders,
             "skipped": total_skipped,
-            "connect_ip": client.connect_ip,
             "source_dir": str(source_dir),
             "manifest": str(args.manifest),
             "mapping": str(args.mapping),

runtime/lib/piwigo-sync.php

@@ -252,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));
-
+    http_request(
-    // Der Fallback darf keinen zweiten Strukturpfad benutzen. Auch mit
+      $base_url.'/admin.php?page=site_update&site='.$site_id,
-    // Benutzer/Passwort wird exakt derselbe Bratonien-Sync wie mit API-Key
+      array('sync'=>'files','display_info'=>1,'privacy_level'=>0,'sync_meta'=>1,'simulate'=>0,'subcats-included'=>1,'bratonien_connector'=>1,'submit'=>1),
-    // ausgefuehrt. Dadurch werden alte technische WebDAV-Kategorien entfernt
-    // und vorhandene Piwigo-Alben wiederverwendet.
-    decode_ws(http_request(
-      $base_url.'/ws.php?format=json',
-      array('method'=>'bratonien.nc.syncProductive', 'site_id'=>$site_id),
       array(),
       $cookie_file
-    ));
+    );
-    $orphan = decode_ws(http_request(
+    $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));
-      $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(
+      decode_ws(http_request($base_url.'/ws.php?format=json', array('method'=>'bratonien.nc.syncOrphans', 'site_id'=>1, 'simulate'=>0), array(), $cookie_file));
-        $base_url.'/ws.php?format=json',
-        array('method'=>'bratonien.nc.syncOrphans', 'site_id'=>1, 'simulate'=>0),
-        array(),
-        $cookie_file
-      ));
     }
     $added = (int)($orphan['added_orphans'] ?? 0);
     $deleted = (int)($orphan['deleted_orphans'] ?? 0);

runtime/lib/precache-webdav-previews.php

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

runtime/lib/resolve-nextcloud-target.php

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

runtime/native-runner.php

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

runtime/reconcile-webdav.php

@@ -78,11 +78,8 @@ function webdav_source_fingerprint($baseUrl, $user, array $roots)
 $pluginRoot = dirname(__DIR__);
 $piwigoRoot = dirname($pluginRoot, 2);
 $dbConfig = $piwigoRoot.'/local/config/database.inc.php';
-$nativeMode = getenv('BRATONIEN_NC_NATIVE') === '1';
+$configDir = '/etc/bratonien-tools/nc-connector';
-$configDir = trim((string)getenv('BRATONIEN_NC_CONFIG_DIR'));
+$stateRoot = '/var/lib/bratonien-tools/nc-connector';
-if ($configDir === '') $configDir = $nativeMode ? rtrim($piwigoRoot, '/').'/_data/bratonien-tools/nc-connector-runtime' : '/etc/bratonien-tools/nc-connector';
-$stateRoot = trim((string)getenv('BRATONIEN_NC_STATE_ROOT'));
-if ($stateRoot === '') $stateRoot = $nativeMode ? rtrim($piwigoRoot, '/').'/_data/bratonien-tools/nc-connector-state' : '/var/lib/bratonien-tools/nc-connector';
 $publicSourceRoot = rtrim($piwigoRoot, '/').'/_data/bratonien-tools/nc-webdav-source';
 $publicGalleryRoot = rtrim($piwigoRoot, '/').'/_data/bratonien-tools/nc-webdav-gallery';
 $legacyGalleryRoot = rtrim($piwigoRoot, '/').'/galleries';
@@ -110,12 +107,11 @@ try
   $rows = $db->query("SELECT id,name,adapter,config_json,secret_blob FROM `{$table}` ORDER BY id DESC");
   if (!$rows) fail_webdav_reconcile('Connector-Verbindungen konnten nicht gelesen werden: '.$db->error);
 
-  foreach (array($configDir, $stateRoot, $publicSourceRoot, $publicGalleryRoot) as $dir)
+  foreach (array($configDir=>$configDir, $publicSourceRoot=>$publicSourceRoot, $publicGalleryRoot=>$publicGalleryRoot) as $dir=>$unused)
   {
-    if (!is_dir($dir) && !mkdir($dir, $dir === $configDir ? 0700 : 0750, true)) fail_webdav_reconcile('Runtime-Verzeichnis konnte nicht angelegt werden: '.$dir);
+    if (!is_dir($dir) && !mkdir($dir, $dir === $configDir ? 0700 : 0755, true)) fail_webdav_reconcile('Runtime-Verzeichnis konnte nicht angelegt werden: '.$dir);
   }
   @chmod($configDir, 0700);
-  @chmod($stateRoot, 0750);
   @chmod($publicSourceRoot, 0755);
   @chmod($publicGalleryRoot, 0755);
 
@@ -129,6 +125,7 @@ try
     if (!is_array($config)) $config = array();
     if ((string)$row['adapter'] !== 'remote') continue;
     if ((string)($config['source_mode'] ?? '') !== 'webdav-placeholder') continue;
+    if (empty($config['parallel_test'])) continue;
 
     try
     {
@@ -154,7 +151,7 @@ try
       $seenFingerprints[$fingerprint] = $id;
       $known[$id] = true;
 
-      $stateDir = $nativeMode ? $stateRoot.'/connection-'.$id : rtrim((string)($config['state_dir'] ?? ''), '/');
+      $stateDir = rtrim((string)($config['state_dir'] ?? ''), '/');
       if ($stateDir === '') $stateDir = $stateRoot.'/connection-'.$id;
       if (!is_dir($stateDir) && !mkdir($stateDir, 0750, true)) fail_webdav_reconcile('State-Verzeichnis konnte nicht angelegt werden.');
       @chmod($stateDir, 0750);
@@ -167,6 +164,8 @@ try
       }
       if (!is_dir($galleryRoot) && !mkdir($galleryRoot, 0755, true)) fail_webdav_reconcile('WebDAV-Galeriebereich konnte nicht angelegt werden.');
       @chmod($galleryRoot, 0755);
+
+      // Alte technische Wrapper unter ./galleries duerfen nicht als Piwigo-Alben auftauchen.
       webdav_remove_generated_tree($legacyDefault, $legacyGalleryRoot);
 
       $sourceDir = $publicSourceRoot.'/connection-'.$id;
@@ -190,9 +189,8 @@ try
       {
         $path = trim((string)($root['webdav_path'] ?? ''), '/');
         $display = trim((string)($root['display_name'] ?? ''));
-        $runtimePath = $path === '' ? '/' : $path;
+        if ($path === '' || $display === '' || preg_match('/[\t\r\n]/', $path.$display)) fail_webdav_reconcile('Eine gespeicherte WebDAV-Wurzel ist ungueltig.');
-        if ($display === '' || preg_match('/[\t\r\n]/', $runtimePath.$display)) fail_webdav_reconcile('Eine gespeicherte WebDAV-Wurzel ist ungueltig.');
+        $rootLines[] = $path."\t".$display;
-        $rootLines[] = $runtimePath."\t".$display;
       }
       file_put_contents($rootsPath, implode("\n", $rootLines)."\n", LOCK_EX);
       @chmod($rootsPath, 0600);
@@ -217,23 +215,21 @@ try
       file_put_contents($configPath, implode("\n", $lines)."\n", LOCK_EX);
       @chmod($configPath, 0600);
 
-      unset($config['migration'], $config['parallel_test']);
       $config['state_dir'] = $stateDir;
       $config['status_file'] = $statusFile;
       $config['parallel_gallery_root'] = $galleryRoot;
       $config['source_fingerprint'] = $fingerprint;
       $config['runtime'] = array(
-        'mode'=>$nativeMode ? 'piwigo-native-webdav' : 'webdav',
+        'mode'=>'parallel-webdav',
         'config'=>$configPath,
         'piwigo_sync_enabled'=>true,
         'reconciled_at'=>date('Y-m-d H:i:s'),
       );
       $json = json_encode($config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
-      if (!is_string($json)) fail_webdav_reconcile('WebDAV-Runtime-Konfiguration konnte nicht serialisiert werden.');
+      if (is_string($json))
-      $escaped = $db->real_escape_string($json);
-      if (!$db->query("UPDATE `{$table}` SET config_json='{$escaped}' WHERE id={$id} AND adapter='remote' LIMIT 1"))
       {
-        fail_webdav_reconcile('WebDAV-Runtime-Status konnte nicht gespeichert werden: '.$db->error);
+        $escaped = $db->real_escape_string($json);
+        $db->query("UPDATE `{$table}` SET config_json='{$escaped}' WHERE id={$id} LIMIT 1");
       }
     }
     catch (Throwable $e)

runtime/repair-webdav-cache-permissions.sh

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

runtime/run-all.sh

@@ -1,26 +1,10 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
+CONFIG_DIR="/etc/bratonien-tools/nc-connector"
 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
-PIWIGO_ROOT_DEFAULT="${BRATONIEN_NC_PIWIGO_ROOT:-$(cd -- "$SCRIPT_DIR/../../.." && pwd)}"
-CONFIG_DIR="${BRATONIEN_NC_CONFIG_DIR:-/etc/bratonien-tools/nc-connector}"
-NATIVE_MODE="${BRATONIEN_NC_NATIVE:-0}"
-TARGET_CONNECTION_ID="${BRATONIEN_NC_CONNECTION_ID:-0}"
-GLOBAL_LOCK_DIR="${PIWIGO_ROOT_DEFAULT%/}/_data/bratonien-tools/nc-connector-scheduler"
-GLOBAL_LOCK_FILE="$GLOBAL_LOCK_DIR/worker.lock"
-mkdir -p -- "$GLOBAL_LOCK_DIR"
-exec 8>"$GLOBAL_LOCK_FILE"
-if ! flock -n 8; then
-    echo "NC Connector: ein Lauf ist bereits aktiv."
-    exit 0
-fi
 shopt -s nullglob
 
-if [[ ! "$TARGET_CONNECTION_ID" =~ ^[0-9]+$ ]]; then
-    echo "NC Connector: ungültige Ziel-Verbindungs-ID: $TARGET_CONNECTION_ID" >&2
-    exit 1
-fi
-
 read_config_value() {
     local key="$1"
     local file="$2"
@@ -33,35 +17,103 @@ read_config_value() {
     printf '%s' "$value"
 }
 
+compact_text() {
+    printf '%s\n' "$1" | tail -n 20 | tr '\n' ' ' | sed 's/[[:space:]]\+/ /g; s/^[[:space:]]//; s/[[:space:]]$//'
+}
+
+read_webdav_failure_detail() {
+    local config="$1"
+    local captured_output="${2:-}"
+    local connection_id piwigo_root status_file status_detail
+
+    connection_id="$(read_config_value CONNECTION_ID "$config")"
+    piwigo_root="$(read_config_value PIWIGO_ROOT "$config")"
+    [[ -n "$piwigo_root" ]] || piwigo_root="/var/www/piwigo"
+
+    status_detail=""
+    if [[ -n "$connection_id" ]]; then
+        status_file="${piwigo_root%/}/_data/bratonien-tools/nc-connector-status/connection-${connection_id}.json"
+        if [[ -r "$status_file" ]]; then
+            status_detail="$(php -r '
+              $file = $argv[1];
+              $data = json_decode((string)@file_get_contents($file), true);
+              if (!is_array($data)) exit(0);
+              $message = trim((string)($data["message"] ?? ""));
+              $detail = trim((string)($data["error_detail"] ?? ""));
+              $parts = array();
+              if ($message !== "") $parts[] = $message;
+              if ($detail !== "") $parts[] = $detail;
+              if ($parts) {
+                $text = preg_replace("/\\s+/u", " ", implode(" - ", $parts));
+                echo trim((string)$text);
+              }
+            ' "$status_file")"
+        fi
+    fi
+
+    if [[ -n "$captured_output" ]]; then
+        captured_output="$(compact_text "$captured_output")"
+    fi
+
+    if [[ -n "$status_detail" && -n "$captured_output" ]]; then
+        printf '%s' "$status_detail | Prozessausgabe: $captured_output"
+    elif [[ -n "$status_detail" ]]; then
+        printf '%s' "$status_detail"
+    elif [[ -n "$captured_output" ]]; then
+        printf '%s' "$captured_output"
+    elif [[ -z "$connection_id" ]]; then
+        printf '%s' 'WebDAV-Prozess wurde gestartet, aber die Verbindungs-ID fehlt in der Runtime-Konfiguration.'
+    else
+        printf '%s' "WebDAV-Prozess fuer Verbindung ${connection_id} endete mit Fehler, lieferte aber weder Statusdatei noch Prozessausgabe."
+    fi
+}
+
 write_route_status() {
     local route="$1"
     local label="$2"
     local detail="$3"
-    local success="$4"
+    local fallback_used="$4"
+    local success="$5"
+
     [[ -n "${ROUTE_STATUS_FILE:-}" ]] || return 0
     mkdir -p -- "$(dirname -- "$ROUTE_STATUS_FILE")"
+
     php -r '
       $payload = array(
         "timestamp" => time(),
         "route" => (string)$argv[2],
         "label" => (string)$argv[3],
         "detail" => (string)$argv[4],
-        "fallback_used" => false,
+        "fallback_used" => $argv[5] === "1",
-        "success" => $argv[5] === "1"
+        "success" => $argv[6] === "1"
       );
       $json = json_encode($payload, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT);
-      if (!is_string($json) || file_put_contents($argv[1], $json.PHP_EOL, LOCK_EX) === false) exit(1);
+      if (!is_string($json) || file_put_contents($argv[1], $json.PHP_EOL, LOCK_EX) === false) {
+        fwrite(STDERR, "Route-Status konnte nicht geschrieben werden.\n");
+        exit(1);
+      }
       @chmod($argv[1], 0644);
-    ' "$ROUTE_STATUS_FILE" "$route" "$label" "$detail" "$success"
+    ' "$ROUTE_STATUS_FILE" "$route" "$label" "$detail" "$fallback_used" "$success"
 }
 
-if [[ "$NATIVE_MODE" != "1" ]]; then
+if ! php "$SCRIPT_DIR/reconcile.php"; then
-    php "$SCRIPT_DIR/reconcile.php"
+    echo "NC Connector: gespeicherte lokale Verbindungen konnten nicht mit der Runtime abgeglichen werden." >&2
+    exit 1
 fi
-php "$SCRIPT_DIR/reconcile-webdav.php"
+
-php "$SCRIPT_DIR/cleanup-webdav-piwigo.php"
+if ! php "$SCRIPT_DIR/reconcile-webdav.php"; then
-if [[ "$NATIVE_MODE" != "1" ]]; then
+    echo "NC Connector: WebDAV-Verbindungen konnten nicht mit der Runtime abgeglichen werden." >&2
-    php "$SCRIPT_DIR/cleanup-stale.php"
+    exit 1
+fi
+
+if ! php "$SCRIPT_DIR/cleanup-webdav-piwigo.php"; then
+    echo "NC Connector: Piwigo-Inhalte geloeschter WebDAV-Verbindungen konnten nicht bereinigt werden." >&2
+    exit 1
+fi
+
+if ! php "$SCRIPT_DIR/cleanup-stale.php"; then
+    echo "NC Connector: verwaiste Laufzeitdateien konnten nicht bereinigt werden." >&2
+    exit 1
 fi
 
 configs=("$CONFIG_DIR"/connection-*.conf)
@@ -75,120 +127,115 @@ fi
 route_piwigo_root=""
 for candidate in "${webdav_configs[@]}" "${configs[@]}"; do
     [[ -f "$candidate" ]] || continue
-    candidate_id="$(read_config_value CONNECTION_ID "$candidate")"
-    if [[ "$TARGET_CONNECTION_ID" -gt 0 && "$candidate_id" != "$TARGET_CONNECTION_ID" ]]; then
-        continue
-    fi
     route_piwigo_root="$(read_config_value PIWIGO_ROOT "$candidate")"
     [[ -n "$route_piwigo_root" ]] && break
 done
-[[ -n "$route_piwigo_root" ]] || route_piwigo_root="$PIWIGO_ROOT_DEFAULT"
+[[ -n "$route_piwigo_root" ]] || route_piwigo_root="/var/www/piwigo"
 ROUTE_STATUS_FILE="${route_piwigo_root%/}/_data/bratonien-tools/nc-connector-status/route-status.json"
 
-failure_count=0
+webdav_success=0
-webdav_count=0
+webdav_failed=0
-local_count=0
+webdav_failure_detail=""
-summary_parts=()
-matched_count=0
 
-for config in "${webdav_configs[@]}"; do
+if [[ ${#webdav_configs[@]} -eq 0 ]]; then
-    [[ -f "$config" ]] || continue
+    webdav_failed=1
-    name="$(basename "$config")"
+    webdav_failure_detail="Keine WebDAV-Runtime-Verbindung ist konfiguriert. Es existiert aktuell nur die Legacy-Verbindung; deshalb kann WebDAV nicht primaer laufen."
-    connection_id="$(read_config_value CONNECTION_ID "$config")"
+    echo "NC Connector: $webdav_failure_detail" >&2
-    if [[ ! "$connection_id" =~ ^[0-9]+$ ]] || [[ "$connection_id" -lt 1 ]]; then
+else
-        echo "NC Connector: $name besitzt keine gueltige Verbindungs-ID." >&2
+    for config in "${webdav_configs[@]}"; do
-        failure_count=$((failure_count + 1))
-        summary_parts+=("$name: ungueltige Verbindungs-ID")
-        continue
-    fi
-    if [[ "$TARGET_CONNECTION_ID" -gt 0 && "$connection_id" != "$TARGET_CONNECTION_ID" ]]; then
-        continue
-    fi
-
-    matched_count=$((matched_count + 1))
-    webdav_count=$((webdav_count + 1))
-    echo "NC Connector WebDAV #$connection_id: $name"
-    output=""
-    if output="$(env PIWIGO_CONFIG="$config" bash "$SCRIPT_DIR/sync-webdav.sh" 2>&1)"; then
-        [[ -z "$output" ]] || printf '%s\n' "$output"
-        summary_parts+=("WebDAV #$connection_id erfolgreich")
-    else
-        code=$?
-        [[ -z "$output" ]] || printf '%s\n' "$output" >&2
-        failure_count=$((failure_count + 1))
-        summary_parts+=("WebDAV #$connection_id fehlgeschlagen (Exit $code)")
-    fi
-done
-
-if [[ "$NATIVE_MODE" != "1" ]]; then
-    for config in "${configs[@]}"; do
-        [[ -f "$config" ]] || continue
         name="$(basename "$config")"
-        connection_id="0"
+        echo "NC Connector WebDAV primaer: $name"
-        if [[ "$name" =~ ^connection-([0-9]+)\.conf$ ]]; then
+        webdav_output=""
-            connection_id="${BASH_REMATCH[1]}"
+        if webdav_output="$(env PIWIGO_CONFIG="$config" bash "$SCRIPT_DIR/sync-webdav.sh" 2>&1)"; then
-        fi
+            webdav_success=1
-        if [[ "$connection_id" -lt 1 ]]; then
+            [[ -z "$webdav_output" ]] || printf '%s\n' "$webdav_output"
-            echo "NC Connector: $name besitzt keine gueltige Verbindungs-ID." >&2
-            failure_count=$((failure_count + 1))
-            summary_parts+=("$name: ungueltige Verbindungs-ID")
-            continue
-        fi
-        if [[ "$TARGET_CONNECTION_ID" -gt 0 && "$connection_id" != "$TARGET_CONNECTION_ID" ]]; then
-            continue
-        fi
-
-        matched_count=$((matched_count + 1))
-        piwigo_root="$(read_config_value PIWIGO_ROOT "$config")"
-        [[ -n "$piwigo_root" ]] || piwigo_root="$PIWIGO_ROOT_DEFAULT"
-        tombstone_dir="${piwigo_root%/}/_data/bratonien-tools/nc-connector-status"
-        if [[ -f "$tombstone_dir/deleted-$connection_id" ]]; then
-            echo "NC Connector: Verbindung $connection_id wurde geloescht; Laufzeitdateien werden entfernt."
-            rm -f -- "$CONFIG_DIR/connection-$connection_id.conf" \
-                "$CONFIG_DIR/connection-$connection_id.db-password" \
-                "$CONFIG_DIR/connection-$connection_id.piwigo-password" \
-                "$CONFIG_DIR/connection-$connection_id.storages.tsv" \
-                "$CONFIG_DIR/connection-$connection_id.roots.tsv"
-            rm -f -- "$tombstone_dir/deleted-$connection_id"
-            continue
-        fi
-
-        local_count=$((local_count + 1))
-        echo "NC Connector Local #$connection_id: $name"
-        if env PIWIGO_CONFIG="$config" bash "$SCRIPT_DIR/sync.sh"; then
-            summary_parts+=("Local #$connection_id erfolgreich")
         else
-            failure_count=$((failure_count + 1))
+            webdav_exit=$?
-            summary_parts+=("Local #$connection_id fehlgeschlagen")
+            webdav_failed=1
+            [[ -z "$webdav_output" ]] || printf '%s\n' "$webdav_output" >&2
+            webdav_failure_detail="$(read_webdav_failure_detail "$config" "$webdav_output")"
+            webdav_failure_detail="Exit-Code ${webdav_exit}: ${webdav_failure_detail}"
+            echo "NC Connector: WebDAV-Lauf fehlgeschlagen: $webdav_failure_detail" >&2
+            echo "NC Connector: Legacy-Fallback bleibt verfuegbar." >&2
         fi
     done
 fi
 
-if [[ "$TARGET_CONNECTION_ID" -gt 0 && "$matched_count" -eq 0 ]]; then
+if [[ "$webdav_success" -eq 1 ]]; then
-    write_route_status "failed" "FEHLER - Verbindung #$TARGET_CONNECTION_ID" "Keine Laufzeitkonfiguration für Verbindung #$TARGET_CONNECTION_ID gefunden." "0"
+    write_route_status \
-    echo "NC Connector: keine Laufzeitkonfiguration für Verbindung #$TARGET_CONNECTION_ID gefunden." >&2
+        "webdav" \
-    exit 1
+        "WebDAV (primaer)" \
-fi
+        "WebDAV erfolgreich. Legacy-Fallback wurde in diesem Lauf nicht ausgefuehrt." \
-
+        "0" \
-summary_detail="$(IFS='; '; printf '%s' "${summary_parts[*]}")"
+        "1"
-[[ -n "$summary_detail" ]] || summary_detail="Keine Verbindung wurde ausgefuehrt."
+    echo "NC Connector: WebDAV erfolgreich; Legacy-Verbindung wird in diesem Lauf nicht ausgefuehrt."
-
-if [[ "$failure_count" -eq 0 ]]; then
-    if [[ "$webdav_count" -gt 0 && "$local_count" -gt 0 ]]; then
-        route="mixed"
-        label="WebDAV + Local"
-    elif [[ "$webdav_count" -gt 0 ]]; then
-        route="webdav"
-        label="WebDAV"
-    else
-        route="local"
-        label="Local"
-    fi
-    write_route_status "$route" "$label" "$summary_detail" "1"
-    echo "NC Connector: angeforderte Verbindung wurde erfolgreich verarbeitet."
     exit 0
 fi
 
-write_route_status "failed" "FEHLER - angeforderte Verbindung" "$summary_detail" "0"
+if [[ ${#configs[@]} -eq 0 ]]; then
-echo "NC Connector: die angeforderte Verbindung ist fehlgeschlagen." >&2
+    [[ -n "$webdav_failure_detail" ]] || webdav_failure_detail="WebDAV ist fehlgeschlagen; Ursache konnte nicht ermittelt werden."
+    write_route_status \
+        "failed" \
+        "FEHLER - kein Datenweg" \
+        "WebDAV-Fehler: $webdav_failure_detail Keine Legacy-Fallback-Verbindung vorhanden." \
+        "0" \
+        "0"
+    echo "NC Connector: WebDAV ist fehlgeschlagen und es ist keine Legacy-Fallback-Verbindung vorhanden." >&2
+    exit 1
+fi
+
+echo "NC Connector: kein erfolgreicher WebDAV-Lauf; Legacy-Fallback wird ausgefuehrt."
+legacy_result=0
+
+for config in "${configs[@]}"; do
+    name="$(basename "$config")"
+    connection_id=""
+    if [[ "$name" =~ ^connection-([0-9]+)\.conf$ ]]; then
+        connection_id="${BASH_REMATCH[1]}"
+    fi
+
+    piwigo_root="$(read_config_value PIWIGO_ROOT "$config")"
+    [[ -n "$piwigo_root" ]] || piwigo_root="/var/www/piwigo"
+    tombstone_dir="${piwigo_root%/}/_data/bratonien-tools/nc-connector-status"
+
+    if [[ -n "$connection_id" && -f "$tombstone_dir/deleted-$connection_id" ]]; then
+        echo "NC Connector: Verbindung $connection_id wurde geloescht; Laufzeitdateien werden entfernt."
+        rm -f -- "$CONFIG_DIR/connection-$connection_id.conf" \
+            "$CONFIG_DIR/connection-$connection_id.db-password" \
+            "$CONFIG_DIR/connection-$connection_id.piwigo-password" \
+            "$CONFIG_DIR/connection-$connection_id.storages.tsv" \
+            "$CONFIG_DIR/connection-$connection_id.roots.tsv"
+        rm -f -- "$tombstone_dir/deleted-$connection_id"
+        continue
+    fi
+
+    echo "NC Connector Legacy-Fallback: $name"
+    if ! env PIWIGO_CONFIG="$config" bash "$SCRIPT_DIR/sync.sh"; then
+        legacy_result=1
+    fi
+done
+
+if [[ "$legacy_result" -eq 0 ]]; then
+    [[ -n "$webdav_failure_detail" ]] || webdav_failure_detail="WebDAV war nicht erfolgreich; Ursache konnte nicht ermittelt werden."
+    write_route_status \
+        "legacy_fallback" \
+        "LEGACY-FALLBACK AKTIV" \
+        "WebDAV-Fehler: $webdav_failure_detail Legacy-Fallback wurde erfolgreich ausgefuehrt." \
+        "1" \
+        "1"
+    echo "NC Connector: Legacy-Fallback erfolgreich."
+    exit 0
+fi
+
+[[ -n "$webdav_failure_detail" ]] || webdav_failure_detail="WebDAV war nicht erfolgreich; Ursache konnte nicht ermittelt werden."
+write_route_status \
+    "failed" \
+    "FEHLER - WebDAV und Fallback" \
+    "WebDAV-Fehler: $webdav_failure_detail Legacy-Fallback ist ebenfalls fehlgeschlagen." \
+    "1" \
+    "0"
+
+if [[ "$webdav_failed" -eq 1 ]]; then
+    echo "NC Connector: WebDAV und Legacy-Fallback sind fehlgeschlagen." >&2
+fi
 exit 1

runtime/sync-webdav.sh

@@ -59,6 +59,10 @@ for target in (status_file, public_file):
 PY
 }
 
+compact_output() {
+    tail -n 12 | tr '\n' ' ' | sed 's/[[:space:]]\+/ /g; s/^[[:space:]]//; s/[[:space:]]$//'
+}
+
 failure() {
     local code="$1" command="$2" line="$3"
     trap - ERR
@@ -75,12 +79,8 @@ done < "$WEBDAV_ROOTS_FILE"
 
 [[ ${#ROOT_ARGS[@]} -gt 0 ]] || { write_status error "Keine WebDAV-Wurzeln konfiguriert"; exit 1; }
 
-WEBDAV_CONNECT_IP="$(php "$SCRIPT_DIR/lib/resolve-nextcloud-target.php" "$WEBDAV_BASE_URL")"
-[[ -n "$WEBDAV_CONNECT_IP" ]] || { write_status error "Nextcloud-Zieladresse konnte nicht ermittelt werden"; exit 1; }
-
 python3 "$SCRIPT_DIR/lib/build_webdav_placeholder_source.py" \
     --base-url "$WEBDAV_BASE_URL" \
-    --connect-ip "$WEBDAV_CONNECT_IP" \
     --user "$WEBDAV_USER" \
     --password-file "$WEBDAV_PASSWORD_FILE" \
     "${ROOT_ARGS[@]}" \
@@ -94,6 +94,28 @@ python3 "$SCRIPT_DIR/lib/shadow_tree.py" \
     --state "$SHADOW_MAP_FILE"
 
 trap - ERR
+PREVIEW_CACHE="$PIWIGO_ROOT/_data/bratonien-tools/nc-webdav-preview/connection-$CONNECTION_ID"
+PREVIEW_OUTPUT=""
+PREVIEW_EXIT=0
+if PREVIEW_OUTPUT="$(php "$SCRIPT_DIR/lib/precache-webdav-previews.php" \
+    --mapping="$WEBDAV_MAPPING_FILE" \
+    --base-url="$WEBDAV_BASE_URL" \
+    --user="$WEBDAV_USER" \
+    --password-file="$WEBDAV_PASSWORD_FILE" \
+    --cache-dir="$PREVIEW_CACHE" 2>&1)"; then
+    PREVIEW_EXIT=0
+else
+    PREVIEW_EXIT=$?
+fi
+[[ -z "$PREVIEW_OUTPUT" ]] || printf '%s\n' "$PREVIEW_OUTPUT"
+if [[ "$PREVIEW_EXIT" -ne 0 ]]; then
+    DETAIL="Exit-Code: $PREVIEW_EXIT"
+    if [[ -n "$PREVIEW_OUTPUT" ]]; then
+        DETAIL+="; Ausgabe: $(printf '%s\n' "$PREVIEW_OUTPUT" | compact_output)"
+    fi
+    write_status error "WebDAV-Vorschaubilder konnten beim Einlesen nicht erzeugt werden" "$DETAIL"
+    exit "$PREVIEW_EXIT"
+fi
 
 if [[ "${PIWIGO_SYNC_ENABLED:-0}" == "1" ]]; then
     PIWIGO_OUTPUT=""
@@ -111,7 +133,7 @@ if [[ "${PIWIGO_SYNC_ENABLED:-0}" == "1" ]]; then
     if [[ "$PIWIGO_EXIT" -ne 0 ]]; then
         DETAIL="Exit-Code: $PIWIGO_EXIT"
         if [[ -n "$PIWIGO_OUTPUT" ]]; then
-            DETAIL+="; Ausgabe: $(printf '%s\n' "$PIWIGO_OUTPUT" | tail -n 12 | tr '\n' ' ' | sed 's/[[:space:]]\+/ /g; s/^[[:space:]]//; s/[[:space:]]$//')"
+            DETAIL+="; Ausgabe: $(printf '%s\n' "$PIWIGO_OUTPUT" | compact_output)"
         fi
 
         if grep -qi 'Invalid username/password' <<<"$PIWIGO_OUTPUT"; then
@@ -138,33 +160,28 @@ if [[ "${PIWIGO_SYNC_ENABLED:-0}" == "1" ]]; then
         exit "$PIWIGO_EXIT"
     fi
 
-    if [[ "${BRATONIEN_NC_NATIVE:-0}" == "1" ]]; then
+    DERIVATIVE_OUTPUT=""
-        if command -v timeout >/dev/null 2>&1; then
+    DERIVATIVE_EXIT=0
-            if ! timeout 30m env PIWIGO_CONFIG="$CONFIG_FILE" bash "$SCRIPT_DIR/build-webdav-media.sh"; then
+    if DERIVATIVE_OUTPUT="$(php "$SCRIPT_DIR/lib/build-webdav-derivatives.php" \
-                write_status error "Bildaufbereitung ist fehlgeschlagen oder hat das 30-Minuten-Limit erreicht"
+        --piwigo-root="$PIWIGO_ROOT" \
-                exit 1
+        --connection-id="$CONNECTION_ID" 2>&1)"; then
-            fi
+        DERIVATIVE_EXIT=0
-        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)"
+        DERIVATIVE_EXIT=$?
-        if ! systemd-run \
+    fi
-            --quiet \
+    [[ -z "$DERIVATIVE_OUTPUT" ]] || printf '%s\n' "$DERIVATIVE_OUTPUT"
-            --collect \
+    if [[ "$DERIVATIVE_EXIT" -ne 0 ]]; then
-            --unit="$MEDIA_UNIT" \
+        DETAIL="Exit-Code: $DERIVATIVE_EXIT"
-            --property=RuntimeMaxSec=30min \
+        if [[ -n "$DERIVATIVE_OUTPUT" ]]; then
-            --setenv="PIWIGO_CONFIG=$CONFIG_FILE" \
+            DETAIL+="; Ausgabe: $(printf '%s\n' "$DERIVATIVE_OUTPUT" | compact_output)"
-            /usr/bin/env bash "$SCRIPT_DIR/build-webdav-media.sh"; then
-            write_status error "Bildaufbereitung konnte nicht im Hintergrund gestartet werden"
-            exit 1
         fi
+        write_status error "Piwigo-Derivate für WebDAV-Bilder konnten nicht erzeugt werden" "$DETAIL"
+        exit "$DERIVATIVE_EXIT"
     fi
 
     if grep -q 'Piwigo-Synchronisierung per API erfolgreich' <<<"$PIWIGO_OUTPUT"; then
         write_status ok \
-            "WebDAV eingelesen und Piwigo synchronisiert; Bildaufbereitung abgeschlossen" \
+            "WebDAV eingelesen, Piwigo synchronisiert und Derivate erzeugt" \
             "" \
             "api" \
             "ok" \
@@ -173,7 +190,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, Piwigo über Fallback synchronisiert und Derivate erzeugt" \
             "" \
             "fallback" \
             "not_used" \
@@ -181,8 +198,8 @@ 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, Piwigo synchronisiert und Derivate erzeugt"
     fi
 else
-    write_status ok "WebDAV eingelesen; Piwigo-Synchronisierung ist für diese Verbindung deaktiviert"
+    write_status ok "WebDAV eingelesen und Vorschaubilder erzeugt; Registrierung erfolgt über den bestehenden produktiven Piwigo-Sync"
 fi

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;
+  $current = (int)$category_id;
-  $root = $by_id[$category_id] ?? null;
-  $is_private = $root && isset($root['status']) && $root['status'] === 'private';
-
-  if ($is_private)
-  {
-    if (isset($rules[$category_id]))
-    {
-      $rule = $rules[$category_id];
-      if ($rule['mode'] === 'disabled')
-      {
-        return array('mode'=>'disabled','profile_id'=>null,'source'=>'album');
-      }
-      if ($rule['mode'] === 'profile')
-      {
-        return array('mode'=>'profile','profile_id'=>(int)$rule['profile_id'],'source'=>'album');
-      }
-    }
-
-    $profile_id = $defaults['private_profile'] ?? null;
-    if (empty($profile_id))
-    {
-      return array('mode'=>'disabled','profile_id'=>null,'source'=>'global');
-    }
-    return array('mode'=>'profile','profile_id'=>(int)$profile_id,'source'=>'global');
-  }
-
-  $current = $category_id;
   $visited = array();
 
   while ($current > 0 && isset($by_id[$current]) && !isset($visited[$current]))
@@ -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.');
 }

webdav-derivative.php

@@ -1,144 +0,0 @@
-<?php
-define('PHPWG_ROOT_PATH', '../../');
-include_once(PHPWG_ROOT_PATH.'include/common.inc.php');
-
-if (!defined('BRATONIEN_TOOLS_PATH'))
-{
-  define('BRATONIEN_TOOLS_ID', basename(__DIR__));
-  define('BRATONIEN_TOOLS_PATH', PHPWG_ROOT_PATH.'plugins/'.BRATONIEN_TOOLS_ID.'/');
-}
-
-require_once(BRATONIEN_TOOLS_PATH.'include/webdav_image_runtime.inc.php');
-require_once(BRATONIEN_TOOLS_PATH.'include/webdav_gallery_runtime.inc.php');
-
-function bratonien_tools_webdav_derivative_abort($status, $message)
-{
-  http_response_code((int)$status);
-  header('Content-Type: text/plain; charset=utf-8');
-  header('Cache-Control: no-store');
-  echo $message;
-  exit;
-}
-
-function bratonien_tools_webdav_derivative_fallback($image_id)
-{
-  $url = bratonien_tools_webdav_image_url((int)$image_id, false);
-  if (!$url)
-  {
-    bratonien_tools_webdav_derivative_abort(404, 'WebDAV-Bildquelle ist nicht verfuegbar.');
-  }
-
-  header('Cache-Control: no-store');
-  header('Location: '.$url, true, 302);
-  exit;
-}
-
-$image_id = (int)($_GET['id'] ?? 0);
-$type = trim((string)($_GET['type'] ?? ''));
-if ($image_id < 1 || $type === '')
-{
-  bratonien_tools_webdav_derivative_abort(400, 'Bild-ID oder Derivattyp fehlt.');
-}
-
-$permission_condition = get_sql_condition_FandF(array('forbidden_categories'=>'category_id'), null, true);
-$access_result = pwg_query('SELECT 1 FROM '.IMAGE_CATEGORY_TABLE.' WHERE image_id='.$image_id.' AND '.$permission_condition.' LIMIT 1');
-if (!pwg_db_num_rows($access_result))
-{
-  bratonien_tools_webdav_derivative_abort(403, 'Kein Zugriff auf dieses Bild.');
-}
-
-if (!class_exists('ImageStdParams') || !class_exists('DerivativeImage') || !class_exists('SrcImage'))
-{
-  require_once(PHPWG_ROOT_PATH.'include/derivative.inc.php');
-}
-
-$params = @ImageStdParams::get_by_type($type);
-if (!$params)
-{
-  bratonien_tools_webdav_derivative_abort(404, 'Unbekannter Piwigo-Derivattyp.');
-}
-
-$result = pwg_query('SELECT * FROM '.IMAGES_TABLE.' WHERE id='.$image_id.' LIMIT 1');
-if (!pwg_db_num_rows($result))
-{
-  bratonien_tools_webdav_derivative_abort(404, 'Bild wurde nicht gefunden.');
-}
-$row = pwg_db_fetch_assoc($result);
-$src = new SrcImage($row);
-$info = bratonien_tools_webdav_image_source_info($image_id);
-if (!$info)
-{
-  bratonien_tools_webdav_derivative_abort(404, 'Keine WebDAV-Quelle fuer dieses Bild gefunden.');
-}
-
-$preview = bratonien_tools_webdav_preview_path($info);
-if (!$preview || !is_file($preview) || !is_readable($preview))
-{
-  // Altbestand kann noch keinen vorbereiteten Preview-Cache besitzen. Der
-  // fokussierte Fotorama-Request darf dann nicht mit 404 enden, weil Fotorama
-  // den fehlgeschlagenen Frame sonst nicht erneut laedt. Stattdessen wird nur
-  // fuer dieses angeforderte Bild auf die echte WebDAV-Quelle ausgewichen.
-  bratonien_tools_webdav_derivative_fallback($image_id);
-}
-
-$derivative = new DerivativeImage($params, $src);
-if ($derivative->same_as_source())
-{
-  // Niemals die lokale Connector-Platzhalterquelle ausliefern.
-  bratonien_tools_webdav_derivative_fallback($image_id);
-}
-
-$target = $derivative->get_path();
-if ($target === '')
-{
-  bratonien_tools_webdav_derivative_fallback($image_id);
-}
-
-if (!bratonien_tools_webdav_derivative_matches_preview($target, $params, $image_id))
-{
-  if (is_file($target))
-  {
-    @unlink($target);
-    clearstatcache(true, $target);
-  }
-
-  $detail = '';
-  if (!bratonien_tools_webdav_generate_derivative($params, $src, $detail))
-  {
-    error_log('Bratonien WebDAV on-demand derivative #'.$image_id.' type='.$type.': '.$detail);
-    bratonien_tools_webdav_derivative_fallback($image_id);
-  }
-}
-
-if (!bratonien_tools_webdav_derivative_matches_preview($target, $params, $image_id))
-{
-  bratonien_tools_webdav_derivative_fallback($image_id);
-}
-
-$size = @filesize($target);
-$mtime = @filemtime($target) ?: time();
-$etag = sha1($target.'|'.$mtime.'|'.($size ?: 0));
-$extension = strtolower(pathinfo($target, PATHINFO_EXTENSION));
-$content_type = 'image/jpeg';
-if ($extension === 'png') $content_type = 'image/png';
-elseif ($extension === 'gif') $content_type = 'image/gif';
-elseif ($extension === 'webp') $content_type = 'image/webp';
-
-header('Content-Type: '.$content_type);
-if ($size !== false) header('Content-Length: '.(string)$size);
-header('ETag: "'.$etag.'"');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s', $mtime).' GMT');
-header('Cache-Control: private, max-age=86400, must-revalidate');
-header('X-Content-Type-Options: nosniff');
-
-$client_etag = trim((string)($_SERVER['HTTP_IF_NONE_MATCH'] ?? ''), " \t\r\n\"");
-if ($client_etag !== '' && hash_equals($etag, $client_etag))
-{
-  http_response_code(304);
-  exit;
-}
-
-if (($_SERVER['REQUEST_METHOD'] ?? 'GET') !== 'HEAD')
-{
-  readfile($target);
-}

webdav-image.php

@@ -8,7 +8,6 @@ if (!defined('BRATONIEN_TOOLS_PATH'))
   define('BRATONIEN_TOOLS_PATH', PHPWG_ROOT_PATH.'plugins/'.BRATONIEN_TOOLS_ID.'/');
 }
 require_once(BRATONIEN_TOOLS_PATH.'include/webdav_image_runtime.inc.php');
-require_once(BRATONIEN_TOOLS_PATH.'include/nc_transport.inc.php');
 
 function bratonien_tools_webdav_image_abort($status, $message)
 {
@@ -121,7 +120,7 @@ $options = array(
   CURLOPT_USERPWD => $user.':'.$password,
   CURLOPT_RETURNTRANSFER => false,
   CURLOPT_FAILONERROR => false,
-  CURLOPT_USERAGENT => 'Bratonien-Tools-WebDAV-Image/0.9.7.1',
+  CURLOPT_USERAGENT => 'Bratonien-Tools-WebDAV-Image/0.9.6.1',
   CURLOPT_HEADERFUNCTION => function($ch, $line)
   {
     $length = strlen($line);
@@ -148,7 +147,6 @@ $options = array(
     return strlen($data);
   },
 );
-bratonien_tools_nc_transport_apply_curl($options, $url);
 if (!empty($_SERVER['HTTP_RANGE']))
 {
   $range = trim((string)$_SERVER['HTTP_RANGE']);