Disable all automatic workflow triggers on this branch

include/nc_connector_scheduler.inc.php

@@ -1,165 +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',
-  );
-}
-
-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_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)
-{
-  $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['queued_at'] = $now;
-  $state['next_due'] = $now + bratonien_tools_nc_scheduler_interval();
-  bratonien_tools_nc_scheduler_write_state($state);
-
-  $runner = BRATONIEN_TOOLS_PATH.'runtime/native-runner.php';
-  $command = escapeshellarg($php).' '.escapeshellarg($runner).' >> '.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)
-  {
-    throw new RuntimeException('Der native NC-Abgleich konnte nicht gestartet werden.');
-  }
-
-  return array('started'=>true, 'message'=>'NC-Abgleich wurde gestartet.');
-}
-
-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);
-  }
-  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,69 +166,99 @@ function bratonien_tools_nc_connector_connection_last_status(array $connection)
 
 function bratonien_tools_nc_connector_last_status(array $connections)
 {
-  $latest = array('timestamp'=>0,'state'=>'','message'=>'','auth_mode'=>'','api_state'=>'','api_message'=>'','fallback_state'=>'','fallback_message'=>'','error_detail'=>'');
+  $latest = array('timestamp'=>0, 'state'=>'', 'message'=>'', 'auth_mode'=>'', 'api_state'=>'', 'api_message'=>'', 'fallback_state'=>'', 'fallback_message'=>'', 'error_detail'=>'');
+
   foreach ($connections as $connection)
   {
-    if (empty($connection['enabled'])) continue;
+    if (empty($connection['enabled']))
+    {
+      continue;
+    }
+
     $status = bratonien_tools_nc_connector_connection_last_status($connection);
-    if ((int)$status['timestamp'] >= (int)$latest['timestamp']) $latest = $status;
+    if ((int)$status['timestamp'] >= (int)$latest['timestamp'])
+    {
+      $latest = $status;
+    }
   }
+
   return $latest;
 }
 
 function bratonien_tools_nc_connector_system_status(array $connections = array())
 {
-  $scheduler = bratonien_tools_nc_scheduler_read_state();
+  $timer = 'bratonien-nc-connector.timer';
-  $enabled = !isset($scheduler['enabled']) || !empty($scheduler['enabled']);
+  $service = 'bratonien-nc-connector.service';
-  $running = (string)($scheduler['state'] ?? '') === 'running';
-  $started = (int)($scheduler['started_at'] ?? 0);
-  $next = (int)($scheduler['next_due'] ?? 0);
-  $last = bratonien_tools_nc_connector_last_status($connections);
 
-  if ($next > 0)
+  $active = bratonien_tools_nc_connector_systemctl_value(array('is-active', $timer));
+  $enabled = bratonien_tools_nc_connector_systemctl_value(array('is-enabled', $timer));
+  $service_active_raw = bratonien_tools_nc_connector_systemctl_value(array('is-active', $service));
+  $service_active = in_array($service_active_raw, array('active', 'activating'), true);
+  $service_started_raw = bratonien_tools_nc_connector_systemctl_value(array('show', $service, '--property=ActiveEnterTimestamp', '--value'));
+  $service_started_timestamp = bratonien_tools_nc_connector_parse_systemd_time($service_started_raw);
+
+  $next_realtime_raw = bratonien_tools_nc_connector_systemctl_value(array('show', $timer, '--property=NextElapseUSecRealtime', '--value'));
+  $next_timestamp = bratonien_tools_nc_connector_parse_systemd_time($next_realtime_raw);
+
+  if ($next_timestamp <= 0)
   {
-    $next_label = date('d.m.Y H:i:s', $next).' (beim nächsten Piwigo-Aufruf)';
+    $next_monotonic_raw = bratonien_tools_nc_connector_systemctl_value(array('show', $timer, '--property=NextElapseUSecMonotonic', '--value'));
+    $next_timestamp = bratonien_tools_nc_connector_monotonic_to_timestamp($next_monotonic_raw);
+  }
+
+  if ($next_timestamp <= 0)
+  {
+    $next_timestamp = bratonien_tools_nc_connector_next_from_timer_list($timer);
+  }
+
+  $last = bratonien_tools_nc_connector_last_status($connections);
+  if ($last['timestamp'] <= 0)
+  {
+    $last_raw = bratonien_tools_nc_connector_systemctl_value(array('show', $service, '--property=ExecMainExitTimestamp', '--value'));
+    $last['timestamp'] = bratonien_tools_nc_connector_parse_systemd_time($last_raw);
+  }
+
+  if ($next_timestamp > 0)
+  {
+    $next_label = date('d.m.Y H:i:s', $next_timestamp);
+  }
+  elseif ($service_active && $active === 'active' && $enabled === 'enabled')
+  {
+    $next_label = 'Nach Abschluss des aktuellen Laufs';
+  }
+  elseif ($active === 'active' && $enabled === 'enabled')
+  {
+    $next_label = 'Wird von systemd neu geplant';
   }
   else
   {
-    $next_label = 'Beim nächsten Piwigo-Aufruf';
+    $next_label = 'Nicht verfügbar';
-  }
-
-  if ((int)$last['timestamp'] <= 0 && !empty($scheduler['finished_at']))
-  {
-    $last['timestamp'] = (int)$scheduler['finished_at'];
-    $last['state'] = (string)($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;
-    }
   }
 
   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,
+    'service_active' => $service_active,
-    'current_run_timestamp'=>$started,
+    'current_run_timestamp' => $service_started_timestamp,
-    'current_run_label'=>$running ? ($started > 0 ? 'Läuft seit '.date('d.m.Y H:i:s', $started) : 'Läuft gerade') : 'Kein Lauf aktiv',
+    'current_run_label' => $service_active
-    'last_run_timestamp'=>(int)$last['timestamp'],
+      ? ($service_started_timestamp > 0 ? 'Läuft seit '.date('d.m.Y H:i:s', $service_started_timestamp) : 'Läuft gerade')
-    'last_run_label'=>(int)$last['timestamp'] > 0 ? date('d.m.Y H:i:s', (int)$last['timestamp']) : 'Nicht verfügbar',
+      : 'Kein Lauf aktiv',
-    'last_run_state'=>(string)$last['state'],
+    'last_run_timestamp' => (int)$last['timestamp'],
-    'last_run_message'=>(string)$last['message'],
+    'last_run_label' => $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,
+    'last_run_fallback_message' => (string)$last['fallback_message'],
-    'next_run_label'=>$next_label,
+    'last_run_error_detail' => (string)$last['error_detail'],
-    'legacy_runtime_exists'=>is_dir('/opt/piwigo-sync'),
+    'next_run_timestamp' => $next_timestamp,
-    '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_wizard_webdav_flow.inc.php

@@ -28,7 +28,7 @@ function bratonien_tools_nc_wizard_scan_webdav_first()
   {
     try
     {
-      $response = bratonien_tools_nc_transport_http($candidate_url.'/status.php');
+      $response = bratonien_tools_nc_wizard_http($candidate_url.'/status.php');
       if ($response['status'] < 200 || $response['status'] >= 300) continue;
       $candidate_status = json_decode($response['body'], true);
       if (!is_array($candidate_status) || empty($candidate_status['installed'])) continue;
@@ -44,7 +44,7 @@ function bratonien_tools_nc_wizard_scan_webdav_first()
     throw new RuntimeException('Unter dieser Adresse konnte keine Nextcloud erreicht werden. HTTP und HTTPS wurden automatisch geprüft.');
   }
 
-  $user_response = bratonien_tools_nc_transport_http(
+  $user_response = bratonien_tools_nc_wizard_http(
     $base_url.'/ocs/v2.php/cloud/user?format=json',
     $username,
     $password,
@@ -104,7 +104,7 @@ function bratonien_tools_nc_wizard_scan_webdav_first()
     'api_error'=>'',
   ));
 
-  bratonien_tools_nc_transport_refresh_directory_state($state, '');
+  bratonien_tools_nc_wizard_refresh_directory_state($state, '');
   bratonien_tools_nc_wizard_store($state);
 
   return array('message'=>'Nextcloud und WebDAV wurden bestätigt. Jetzt können die Verzeichnisse des angemeldeten Benutzers ausgewählt werden.');

include/nc_transport.inc.php

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

include/tool_registry.inc.php

@@ -6,7 +6,7 @@ if (!defined('PHPWG_ROOT_PATH'))
 
 if (isset($GLOBALS['template']) && is_object($GLOBALS['template']) && method_exists($GLOBALS['template'], 'func_combine_script'))
 {
-  $script_version = function_exists('bratonien_tools_current_version') ? bratonien_tools_current_version() : '0.9.7.1';
+  $script_version = function_exists('bratonien_tools_current_version') ? bratonien_tools_current_version() : '0.9.6.27';
   $GLOBALS['template']->func_combine_script(array(
     'id'=>'bratonien_nc_connector_edit_v2',
     'path'=>BRATONIEN_TOOLS_PATH.'js/nc_connector_edit_v2.js',
@@ -41,14 +41,57 @@ require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_delete_safe.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_webdav.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_wizard_webdav_flow.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_edit.inc.php');
-require_once(BRATONIEN_TOOLS_PATH . 'include/nc_transport.inc.php');
-require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_scheduler.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_system.inc.php');
 
 function bratonien_tools_nc_connector_run_now()
 {
-  $result = bratonien_tools_nc_scheduler_spawn(true);
+  $service = 'bratonien-nc-connector.service';
-  return array('message'=>(string)($result['message'] ?? 'NC-Abgleich wurde gestartet.'));
+  $active = bratonien_tools_nc_connector_systemctl_value(array('is-active', $service));
+  if ($active === 'active' || $active === 'activating')
+  {
+    return array('message'=>'Der NC-Abgleich läuft bereits.');
+  }
+
+  if (!function_exists('proc_open'))
+  {
+    throw new RuntimeException('Der NC-Abgleich konnte nicht gestartet werden: proc_open ist nicht verfügbar.');
+  }
+
+  $commands = array(
+    array('/usr/bin/sudo', '-n', '/usr/bin/systemctl', 'start', '--no-block', $service),
+    array('/usr/bin/systemctl', 'start', '--no-block', $service),
+  );
+  $last_error = '';
+
+  foreach ($commands as $command)
+  {
+    if (!is_executable($command[0]))
+    {
+      continue;
+    }
+    $spec = array(
+      0=>array('file','/dev/null','r'),
+      1=>array('pipe','w'),
+      2=>array('pipe','w'),
+    );
+    $process = @proc_open($command, $spec, $pipes, null, array_merge($_ENV, array('LC_ALL'=>'C','LANG'=>'C')));
+    if (!is_resource($process))
+    {
+      continue;
+    }
+    $stdout = trim((string)stream_get_contents($pipes[1]));
+    $stderr = trim((string)stream_get_contents($pipes[2]));
+    fclose($pipes[1]);
+    fclose($pipes[2]);
+    $exit = proc_close($process);
+    if ($exit === 0)
+    {
+      return array('message'=>'NC-Abgleich wurde gestartet.');
+    }
+    $last_error = $stderr !== '' ? $stderr : $stdout;
+  }
+
+  throw new RuntimeException('Der NC-Abgleich konnte nicht gestartet werden'.($last_error !== '' ? ': '.$last_error : '.'));
 }
 
 function bratonien_tools_get_tools()
@@ -75,7 +118,7 @@ function bratonien_tools_get_tools()
     'album_share_regenerate_link' => array('handler' => 'bratonien_tools_regenerate_album_share_link'),
     'album_share_revoke' => array('handler' => 'bratonien_tools_revoke_album_share'),
     'nc_connector_create_webdav_parallel' => array('handler' => 'bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard'),
-    'nc_connector_edit_start' => array('handler' => 'bratonien_tools_nc_transport_edit_start'),
+    'nc_connector_edit_start' => array('handler' => 'bratonien_tools_nc_connector_edit_start'),
     'nc_connector_update_local' => array('handler' => 'bratonien_tools_nc_connector_update_local_friendly'),
     'nc_connector_delete' => array('handler' => 'bratonien_tools_nc_connector_delete_safe'),
     'nc_connector_update_name' => array('handler' => 'bratonien_tools_nc_connector_update_name'),
@@ -83,7 +126,7 @@ function bratonien_tools_get_tools()
     'nc_connector_run_now' => array('handler' => 'bratonien_tools_nc_connector_run_now'),
     'nc_connector_wizard_scan' => array('handler' => 'bratonien_tools_nc_wizard_scan_webdav_first'),
     'nc_connector_wizard_save_technical' => array('handler' => 'bratonien_tools_nc_wizard_save_technical_flow'),
-    'nc_connector_wizard_directory_browse' => array('handler' => 'bratonien_tools_nc_transport_wizard_directory_browse'),
+    'nc_connector_wizard_directory_browse' => array('handler' => 'bratonien_tools_nc_wizard_directory_browse'),
     'nc_connector_wizard_directory_add' => array('handler' => 'bratonien_tools_nc_wizard_directory_add'),
     'nc_connector_wizard_directory_remove' => array('handler' => 'bratonien_tools_nc_wizard_directory_remove'),
     'nc_connector_wizard_save_mounts' => array('handler' => 'bratonien_tools_nc_wizard_save_sources_dispatch'),

main.inc.php

@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: Bratonien Tools
-Version: 0.9.7.1
+Version: 0.9.6.29
 Description: Erweiterbare Administrationswerkzeuge fuer die Bratonien-Piwigo-Installation.
 Plugin URI: https://github.com/Terranom674/Piwigo_Bratonien_Tools
 Author: Bratonien
@@ -24,7 +24,6 @@ require_once(BRATONIEN_TOOLS_PATH . 'include/album_shares.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_ws.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_orphan_ws.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/nc_productive_ws.inc.php');
-require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_scheduler.inc.php');
 
 add_event_handler('get_admin_plugin_menu_links', 'bratonien_tools_admin_menu');
 add_event_handler('get_derivative_url', 'bratonien_tools_filter_derivative_url', EVENT_HANDLER_PRIORITY_NEUTRAL, 4);
@@ -36,7 +35,6 @@ add_event_handler('init', 'bratonien_tools_prepare_connector_private_import', EV
 add_event_handler('init', 'bratonien_tools_prepare_private_album_permissions', EVENT_HANDLER_PRIORITY_NEUTRAL - 20);
 add_event_handler('init', 'bratonien_tools_preserve_private_album_access', EVENT_HANDLER_PRIORITY_NEUTRAL - 10);
 add_event_handler('init', 'bratonien_tools_album_shares_init');
-add_event_handler('init', 'bratonien_tools_nc_scheduler_tick', EVENT_HANDLER_PRIORITY_NEUTRAL + 100);
 add_event_handler('delete_categories', 'bratonien_tools_album_shares_on_delete_categories');
 add_event_handler('ws_add_methods', 'bratonien_tools_register_ws_methods');
 add_event_handler('ws_add_methods', 'bratonien_tools_register_nc_orphan_ws_methods');

maintain.class.php

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

runtime/lib/build_webdav_placeholder_source.py

@@ -14,7 +14,6 @@ import getpass
 import json
 import os
 import shutil
-import socket
 import ssl
 import sys
 import tempfile
@@ -22,7 +21,6 @@ import urllib.error
 import urllib.parse
 import urllib.request
 import xml.etree.ElementTree as ET
-from contextlib import contextmanager
 from pathlib import Path, PurePosixPath
 
 DAV = "DAV:"
@@ -54,37 +52,9 @@ def safe_local_name(name: str) -> str:
     return name
 
 
-@contextmanager
-def pinned_resolution(host: str, ip: str):
-    host = host.strip("[]").lower()
-    ip = ip.strip("[]")
-    if not host or not ip or host == ip:
-        yield
-        return
-
-    original = socket.getaddrinfo
-
-    def resolve(name, port, family=0, type=0, proto=0, flags=0):
-        normalized = str(name).strip("[]").lower()
-        if normalized == host:
-            return original(ip, port, family, type, proto, flags)
-        return original(name, port, family, type, proto, flags)
-
-    socket.getaddrinfo = resolve
-    try:
-        yield
-    finally:
-        socket.getaddrinfo = original
-
-
 class WebDavClient:
-    def __init__(self, base_url: str, user: str, password: str, timeout: int = 30, connect_ip: str = "") -> None:
+    def __init__(self, base_url: str, user: str, password: str, timeout: int = 30) -> None:
         self.base_url = base_url.rstrip("/")
-        parsed = urllib.parse.urlparse(self.base_url)
-        if parsed.scheme not in {"http", "https"} or not parsed.hostname:
-            fail("Nextcloud base URL must use HTTP or HTTPS and contain a host")
-        self.host = parsed.hostname.strip("[]")
-        self.connect_ip = connect_ip.strip("[]") or self.host
         self.user = user
         self.password = password
         self.timeout = timeout
@@ -114,10 +84,9 @@ class WebDavClient:
         request.add_header("Depth", "1")
         request.add_header("Content-Type", "application/xml; charset=utf-8")
         try:
-            with pinned_resolution(self.host, self.connect_ip):
+            with urllib.request.urlopen(request, timeout=self.timeout, context=self.context) as response:
-                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 +96,14 @@ class WebDavClient:
         if status != 207:
             fail(f"Nextcloud PROPFIND returned HTTP {status}")
 
-        base_path = urllib.parse.unquote(urllib.parse.urlparse(url).path).rstrip("/")
-        current: dict[str, object] | None = None
-        children: list[dict[str, object]] = []
         try:
             root = ET.fromstring(payload)
         except ET.ParseError as error:
             raise RuntimeError("Nextcloud returned invalid WebDAV XML") from error
 
+        base_path = urllib.parse.unquote(urllib.parse.urlparse(url).path).rstrip("/")
+        current: dict[str, object] | None = None
+        children: list[dict[str, object]] = []
         for response in root.findall(f"{{{DAV}}}response"):
             href = response.findtext(f"{{{DAV}}}href", default="")
             href_path = urllib.parse.unquote(urllib.parse.urlparse(href).path).rstrip("/")
@@ -244,7 +213,6 @@ def atomic_text(path: Path, text: str) -> None:
 def main() -> int:
     parser = argparse.ArgumentParser()
     parser.add_argument("--base-url", required=True)
-    parser.add_argument("--connect-ip", default="", help="IP address used for the TCP connection while preserving the URL host for HTTP Host and TLS SNI")
     parser.add_argument("--user", required=True)
     parser.add_argument("--password-file", type=Path)
     parser.add_argument("--root", action="append", required=True, help="WebDAV path relative to the authenticated user's files root")
@@ -273,7 +241,7 @@ def main() -> int:
             shutil.rmtree(staging)
         staging.mkdir(parents=True)
 
-        client = WebDavClient(args.base_url, args.user, password, max(1, args.timeout), args.connect_ip)
+        client = WebDavClient(args.base_url, args.user, password, max(1, args.timeout))
         mapping: dict[str, dict[str, object]] = {}
         manifest: list[str] = []
         total_files = total_folders = total_skipped = 0
@@ -335,7 +303,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 +311,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/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,100 +0,0 @@
-#!/usr/bin/env php
-<?php
-if (PHP_SAPI !== 'cli')
-{
-  fwrite(STDERR, "CLI only\n");
-  exit(1);
-}
-
-$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'] = 'NC-Abgleich läuft.';
-$state['started_at'] = time();
-$state['timestamp'] = time();
-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['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 ? 'NC-Abgleich erfolgreich abgeschlossen.' : 'NC-Abgleich fehlgeschlagen.';
-$state['timestamp'] = time();
-$state['finished_at'] = time();
-$state['exit_code'] = $exit;
-$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, $publicSourceRoot, $publicGalleryRoot) as $dir)
   {
-    if (!is_dir($dir) && !mkdir($dir, $dir === $configDir ? 0700 : 0750, true)) fail_webdav_reconcile('Runtime-Verzeichnis konnte nicht angelegt werden: '.$dir);
+    if (!is_dir($dir) && !mkdir($dir, $dir === $configDir ? 0700 : 0755, true)) fail_webdav_reconcile('Runtime-Verzeichnis konnte nicht angelegt werden: '.$dir);
   }
   @chmod($configDir, 0700);
-  @chmod($stateRoot, 0750);
   @chmod($publicSourceRoot, 0755);
   @chmod($publicGalleryRoot, 0755);
 
@@ -154,7 +150,7 @@ try
       $seenFingerprints[$fingerprint] = $id;
       $known[$id] = true;
 
-      $stateDir = $nativeMode ? $stateRoot.'/connection-'.$id : rtrim((string)($config['state_dir'] ?? ''), '/');
+      $stateDir = rtrim((string)($config['state_dir'] ?? ''), '/');
       if ($stateDir === '') $stateDir = $stateRoot.'/connection-'.$id;
       if (!is_dir($stateDir) && !mkdir($stateDir, 0750, true)) fail_webdav_reconcile('State-Verzeichnis konnte nicht angelegt werden.');
       @chmod($stateDir, 0750);
@@ -223,7 +219,7 @@ try
       $config['parallel_gallery_root'] = $galleryRoot;
       $config['source_fingerprint'] = $fingerprint;
       $config['runtime'] = array(
-        'mode'=>$nativeMode ? 'piwigo-native-webdav' : 'webdav',
+        'mode'=>'webdav',
         'config'=>$configPath,
         'piwigo_sync_enabled'=>true,
         'reconciled_at'=>date('Y-m-d H:i:s'),

runtime/run-all.sh

@@ -1,18 +1,8 @@
 #!/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}"
-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
 
 read_config_value() {
@@ -49,14 +39,10 @@ write_route_status() {
     ' "$ROUTE_STATUS_FILE" "$route" "$label" "$detail" "$success"
 }
 
-if [[ "$NATIVE_MODE" != "1" ]]; then
+php "$SCRIPT_DIR/reconcile.php"
-    php "$SCRIPT_DIR/reconcile.php"
-fi
 php "$SCRIPT_DIR/reconcile-webdav.php"
 php "$SCRIPT_DIR/cleanup-webdav-piwigo.php"
-if [[ "$NATIVE_MODE" != "1" ]]; then
+php "$SCRIPT_DIR/cleanup-stale.php"
-    php "$SCRIPT_DIR/cleanup-stale.php"
-fi
 
 configs=("$CONFIG_DIR"/connection-*.conf)
 webdav_configs=("$CONFIG_DIR"/webdav-connection-*.conf)
@@ -72,7 +58,7 @@ for candidate in "${webdav_configs[@]}" "${configs[@]}"; do
     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
@@ -105,45 +91,43 @@ for config in "${webdav_configs[@]}"; do
     fi
 done
 
-if [[ "$NATIVE_MODE" != "1" ]]; then
+for config in "${configs[@]}"; do
-    for config in "${configs[@]}"; do
+    [[ -f "$config" ]] || continue
-        [[ -f "$config" ]] || continue
+    name="$(basename "$config")"
-        name="$(basename "$config")"
+    connection_id="0"
-        connection_id="0"
+    if [[ "$name" =~ ^connection-([0-9]+)\.conf$ ]]; then
-        if [[ "$name" =~ ^connection-([0-9]+)\.conf$ ]]; then
+        connection_id="${BASH_REMATCH[1]}"
-            connection_id="${BASH_REMATCH[1]}"
+    fi
-        fi
+    if [[ "$connection_id" -lt 1 ]]; then
-        if [[ "$connection_id" -lt 1 ]]; then
+        echo "NC Connector: $name besitzt keine gueltige Verbindungs-ID." >&2
-            echo "NC Connector: $name besitzt keine gueltige Verbindungs-ID." >&2
+        failure_count=$((failure_count + 1))
-            failure_count=$((failure_count + 1))
+        summary_parts+=("$name: ungueltige Verbindungs-ID")
-            summary_parts+=("$name: ungueltige Verbindungs-ID")
+        continue
-            continue
+    fi
-        fi
 
-        piwigo_root="$(read_config_value PIWIGO_ROOT "$config")"
+    piwigo_root="$(read_config_value PIWIGO_ROOT "$config")"
-        [[ -n "$piwigo_root" ]] || piwigo_root="$PIWIGO_ROOT_DEFAULT"
+    [[ -n "$piwigo_root" ]] || piwigo_root="/var/www/piwigo"
-        tombstone_dir="${piwigo_root%/}/_data/bratonien-tools/nc-connector-status"
+    tombstone_dir="${piwigo_root%/}/_data/bratonien-tools/nc-connector-status"
-        if [[ -f "$tombstone_dir/deleted-$connection_id" ]]; then
+    if [[ -f "$tombstone_dir/deleted-$connection_id" ]]; then
-            echo "NC Connector: Verbindung $connection_id wurde geloescht; Laufzeitdateien werden entfernt."
+        echo "NC Connector: Verbindung $connection_id wurde geloescht; Laufzeitdateien werden entfernt."
-            rm -f -- "$CONFIG_DIR/connection-$connection_id.conf" \
+        rm -f -- "$CONFIG_DIR/connection-$connection_id.conf" \
-                "$CONFIG_DIR/connection-$connection_id.db-password" \
+            "$CONFIG_DIR/connection-$connection_id.db-password" \
-                "$CONFIG_DIR/connection-$connection_id.piwigo-password" \
+            "$CONFIG_DIR/connection-$connection_id.piwigo-password" \
-                "$CONFIG_DIR/connection-$connection_id.storages.tsv" \
+            "$CONFIG_DIR/connection-$connection_id.storages.tsv" \
-                "$CONFIG_DIR/connection-$connection_id.roots.tsv"
+            "$CONFIG_DIR/connection-$connection_id.roots.tsv"
-            rm -f -- "$tombstone_dir/deleted-$connection_id"
+        rm -f -- "$tombstone_dir/deleted-$connection_id"
-            continue
+        continue
-        fi
+    fi
 
-        local_count=$((local_count + 1))
+    local_count=$((local_count + 1))
-        echo "NC Connector Local #$connection_id: $name"
+    echo "NC Connector Local #$connection_id: $name"
-        if env PIWIGO_CONFIG="$config" bash "$SCRIPT_DIR/sync.sh"; then
+    if env PIWIGO_CONFIG="$config" bash "$SCRIPT_DIR/sync.sh"; then
-            summary_parts+=("Local #$connection_id erfolgreich")
+        summary_parts+=("Local #$connection_id erfolgreich")
-        else
+    else
-            failure_count=$((failure_count + 1))
+        failure_count=$((failure_count + 1))
-            summary_parts+=("Local #$connection_id fehlgeschlagen")
+        summary_parts+=("Local #$connection_id fehlgeschlagen")
-        fi
+    fi
-    done
+done
-fi
 
 summary_detail="$(IFS='; '; printf '%s' "${summary_parts[*]}")"
 [[ -n "$summary_detail" ]] || summary_detail="Keine Verbindung wurde ausgefuehrt."

runtime/sync-webdav.sh

@@ -75,12 +75,8 @@ done < "$WEBDAV_ROOTS_FILE"
 
 [[ ${#ROOT_ARGS[@]} -gt 0 ]] || { write_status error "Keine WebDAV-Wurzeln konfiguriert"; exit 1; }
 
-WEBDAV_CONNECT_IP="$(php "$SCRIPT_DIR/lib/resolve-nextcloud-target.php" "$WEBDAV_BASE_URL")"
-[[ -n "$WEBDAV_CONNECT_IP" ]] || { write_status error "Nextcloud-Zieladresse konnte nicht ermittelt werden"; exit 1; }
-
 python3 "$SCRIPT_DIR/lib/build_webdav_placeholder_source.py" \
     --base-url "$WEBDAV_BASE_URL" \
-    --connect-ip "$WEBDAV_CONNECT_IP" \
     --user "$WEBDAV_USER" \
     --password-file "$WEBDAV_PASSWORD_FILE" \
     "${ROOT_ARGS[@]}" \
@@ -138,33 +134,21 @@ if [[ "${PIWIGO_SYNC_ENABLED:-0}" == "1" ]]; then
         exit "$PIWIGO_EXIT"
     fi
 
-    if [[ "${BRATONIEN_NC_NATIVE:-0}" == "1" ]]; then
+    MEDIA_UNIT="bratonien-nc-media-${CONNECTION_ID}-$(date +%s)"
-        if command -v timeout >/dev/null 2>&1; then
+    if ! systemd-run \
-            if ! timeout 30m env PIWIGO_CONFIG="$CONFIG_FILE" bash "$SCRIPT_DIR/build-webdav-media.sh"; then
+        --quiet \
-                write_status error "Bildaufbereitung ist fehlgeschlagen oder hat das 30-Minuten-Limit erreicht"
+        --collect \
-                exit 1
+        --unit="$MEDIA_UNIT" \
-            fi
+        --property=RuntimeMaxSec=30min \
-        elif ! env PIWIGO_CONFIG="$CONFIG_FILE" bash "$SCRIPT_DIR/build-webdav-media.sh"; then
+        --setenv="PIWIGO_CONFIG=$CONFIG_FILE" \
-            write_status error "Bildaufbereitung ist fehlgeschlagen"
+        /usr/bin/env bash "$SCRIPT_DIR/build-webdav-media.sh"; then
-            exit 1
+        write_status error "Bildaufbereitung konnte nicht im Hintergrund gestartet werden"
-        fi
+        exit 1
-    else
-        MEDIA_UNIT="bratonien-nc-media-${CONNECTION_ID}-$(date +%s)"
-        if ! systemd-run \
-            --quiet \
-            --collect \
-            --unit="$MEDIA_UNIT" \
-            --property=RuntimeMaxSec=30min \
-            --setenv="PIWIGO_CONFIG=$CONFIG_FILE" \
-            /usr/bin/env bash "$SCRIPT_DIR/build-webdav-media.sh"; then
-            write_status error "Bildaufbereitung konnte nicht im Hintergrund gestartet werden"
-            exit 1
-        fi
     fi
 
     if grep -q 'Piwigo-Synchronisierung per API erfolgreich' <<<"$PIWIGO_OUTPUT"; then
         write_status ok \
-            "WebDAV eingelesen und Piwigo synchronisiert; Bildaufbereitung abgeschlossen" \
+            "WebDAV eingelesen und Piwigo synchronisiert; Bildaufbereitung läuft im Hintergrund" \
             "" \
             "api" \
             "ok" \
@@ -173,7 +157,7 @@ if [[ "${PIWIGO_SYNC_ENABLED:-0}" == "1" ]]; then
             "Fallback wurde nicht benötigt"
     elif grep -q 'Piwigo-Datenbanksynchronisierung per Benutzername/Passwort-Fallback erfolgreich' <<<"$PIWIGO_OUTPUT"; then
         write_status ok \
-            "WebDAV eingelesen und Piwigo über Fallback synchronisiert; Bildaufbereitung abgeschlossen" \
+            "WebDAV eingelesen und Piwigo über Fallback synchronisiert; Bildaufbereitung läuft im Hintergrund" \
             "" \
             "fallback" \
             "not_used" \
@@ -181,7 +165,7 @@ if [[ "${PIWIGO_SYNC_ENABLED:-0}" == "1" ]]; then
             "ok" \
             "Benutzername/Passwort-Fallback erfolgreich"
     else
-        write_status ok "WebDAV eingelesen und Piwigo synchronisiert; Bildaufbereitung abgeschlossen"
+        write_status ok "WebDAV eingelesen und Piwigo synchronisiert; Bildaufbereitung läuft im Hintergrund"
     fi
 else
     write_status ok "WebDAV eingelesen; Piwigo-Synchronisierung ist für diese Verbindung deaktiviert"

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