Merge pull request #47 from Terranom674/fix/09725-clean-stale-site-images

0.9.7.25: WebDAV wieder nur an Piwigo-Core übergeben

include/nc_productive_ws.inc.php

@@ -18,7 +18,7 @@ function bratonien_tools_register_nc_productive_ws_methods($arr)
         'info' => 'Piwigo storage site to synchronize. Default: 1.',
       ),
     ),
-    'Runs the approved direct Bratonien filesystem synchronization for the NC Connector.',
+    'Runs the approved Piwigo filesystem synchronization for the Bratonien NC Connector.',
     null,
     array(
       'admin_only' => true,
@@ -27,17 +27,9 @@ function bratonien_tools_register_nc_productive_ws_methods($arr)
   );
 }
 
-function bratonien_tools_nc_productive_error(&$errors, $path, $type)
-{
-  $errors[] = array(
-    'path' => (string)$path,
-    'type' => (string)$type,
-  );
-}
-
 function bratonien_tools_ws_nc_sync_productive($params, &$service)
 {
-  global $conf, $user;
+  global $conf, $user, $template, $page;
 
   $piwigo_version = defined('PHPWG_VERSION') ? (string)PHPWG_VERSION : '';
   if ($piwigo_version !== '16.4.0')
@@ -59,385 +51,92 @@ function bratonien_tools_ws_nc_sync_productive($params, &$service)
     return new PwgError(400, 'Invalid site_id.');
   }
 
-  include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
+  $saved_get = $_GET;
-  include_once(PHPWG_ROOT_PATH.'admin/site_reader_local.php');
+  $saved_post = $_POST;
-
+  $saved_request_method = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : null;
-  $query = 'SELECT galleries_url FROM '.SITES_TABLE.' WHERE id = '.$site_id.' LIMIT 1';
+  $saved_default_status = isset($conf['newcat_default_status']) ? $conf['newcat_default_status'] : null;
-  $result = pwg_query($query);
+  $saved_template_dirs = null;
-  if (!pwg_db_num_rows($result))
+  $output = '';
-  {
+  $counts = array();
-    return new PwgError(404, 'Piwigo site does not exist.');
-  }
-
-  list($site_url) = pwg_db_fetch_row($result);
-  if (url_is_remote($site_url))
-  {
-    return new PwgError(400, 'Remote Piwigo sites are not supported by this synchronization method.');
-  }
-
-  $site_reader = new LocalSiteReader($site_url);
-  if (!$site_reader->open())
-  {
-    return new PwgError(500, 'Piwigo could not open the configured local site.');
-  }
-
-  list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW()'));
-  $errors = array();
-  $counts = array(
-    'new_categories' => 0,
-    'del_categories' => 0,
-    'new_elements' => 0,
-    'del_elements' => 0,
-    'upd_elements' => 0,
-    'new_formats' => 0,
-    'del_formats' => 0,
-    'metadata_candidates' => 0,
-    'metadata_updated' => 0,
-  );
 
   try
   {
-    $query = 'SELECT id, id_uppercat, uppercats, global_rank, status, visible FROM '.CATEGORIES_TABLE.' WHERE dir IS NOT NULL AND site_id = '.$site_id;
+    if (!defined('IN_ADMIN'))
-    $db_categories = hash_from_query($query, 'id');
-    $db_fulldirs = get_fulldirs(array_keys($db_categories));
-    $basedir = preg_replace('#/*$#', '', $site_url);
-    $db_fulldirs = array_flip($db_fulldirs);
-    $fs_fulldirs = $site_reader->get_full_directories($basedir);
-
-    $next_rank = array('NULL'=>1);
-    $result = pwg_query('SELECT id FROM '.CATEGORIES_TABLE);
-    while ($row = pwg_db_fetch_assoc($result))
     {
-      $next_rank[$row['id']] = 1;
+      define('IN_ADMIN', true);
-    }
-    $result = pwg_query('SELECT id_uppercat, MAX(`rank`)+1 AS next_rank FROM '.CATEGORIES_TABLE.' GROUP BY id_uppercat');
-    while ($row = pwg_db_fetch_assoc($result))
-    {
-      $key = empty($row['id_uppercat']) ? 'NULL' : $row['id_uppercat'];
-      $next_rank[$key] = (int)$row['next_rank'];
     }
 
-    $next_id = pwg_db_nextval('id', CATEGORIES_TABLE);
+    if (is_object($template) && isset($template->smarty) && method_exists($template, 'set_template_dir'))
-    $category_inserts = array();
-
-    foreach (array_diff($fs_fulldirs, array_keys($db_fulldirs)) as $fulldir)
     {
-      $dir = basename($fulldir);
+      $saved_template_dirs = $template->smarty->getTemplateDir();
-      if (!preg_match($conf['sync_chars_regex'], $dir))
+      $template->set_template_dir(PHPWG_ROOT_PATH.'admin/themes/default/template');
-      {
-        bratonien_tools_nc_productive_error($errors, $fulldir, 'PWG-UPDATE-1');
-        continue;
     }
 
-      $insert = array(
+    $conf['newcat_default_status'] = 'private';
-        'id' => $next_id++,
+    $_SERVER['REQUEST_METHOD'] = 'POST';
-        'dir' => $dir,
+    $_GET = array(
-        'name' => str_replace('_', ' ', $dir),
+      'page' => 'site_update',
-        'site_id' => $site_id,
+      'site' => $site_id,
-        'commentable' => boolean_to_string($conf['newcat_default_commentable']),
+    );
-        'status' => 'private',
+    $_POST = array(
-        'visible' => boolean_to_string($conf['newcat_default_visible']),
+      'sync' => 'files',
+      'display_info' => 1,
+      'privacy_level' => 0,
+      'sync_meta' => 1,
+      'simulate' => 0,
+      'subcats-included' => 1,
+      'bratonien_connector' => 1,
+      'submit' => 1,
     );
 
-      $parent_path = dirname($fulldir);
+    ob_start();
-      if (isset($db_fulldirs[$parent_path]))
+    include(PHPWG_ROOT_PATH.'admin/site_update.php');
-      {
+    $output = (string)ob_get_clean();
-        $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);
-    }
-
-    $fs = $site_reader->get_elements($basedir);
-    $cat_ids = array_diff(array_keys($db_categories), $to_delete_categories);
-    $db_elements = array();
-    if ($cat_ids)
-    {
-      $query = 'SELECT id, path FROM '.IMAGES_TABLE.' WHERE storage_category_id IN ('.implode(',', array_map('intval', $cat_ids)).')';
-      $db_elements = simple_hash_from_query($query, 'id', 'path');
-    }
-
-    $next_element_id = pwg_db_nextval('id', IMAGES_TABLE);
-    $image_inserts = array();
-    $image_links = array();
-    $format_inserts = array();
-    $new_image_ids = array();
-
-    foreach (array_diff(array_keys($fs), $db_elements) as $path)
-    {
-      $dirname = dirname($path);
-      if (!isset($db_fulldirs[$dirname]))
-      {
-        continue;
-      }
-
-      $filename = basename($path);
-      if (!preg_match($conf['sync_chars_regex'], $filename))
-      {
-        bratonien_tools_nc_productive_error($errors, $path, 'PWG-UPDATE-1');
-        continue;
-      }
-
-      $id = $next_element_id++;
-      $image_inserts[] = array(
-        'id' => $id,
-        'file' => $filename,
-        'name' => get_name_from_file($filename),
-        'date_available' => $dbnow,
-        'path' => $path,
-        'representative_ext' => $fs[$path]['representative_ext'],
-        'storage_category_id' => $db_fulldirs[$dirname],
-        'added_by' => (int)$user['id'],
-      );
-      $image_links[] = array('image_id'=>$id, 'category_id'=>$db_fulldirs[$dirname]);
-      $new_image_ids[] = $id;
-
-      if (!empty($conf['enable_formats']) && !empty($fs[$path]['formats']))
-      {
-        foreach ($fs[$path]['formats'] as $ext => $filesize)
-        {
-          $format_inserts[] = array('image_id'=>$id, 'ext'=>$ext, 'filesize'=>$filesize);
-        }
-      }
-    }
-
-    if ($image_inserts)
-    {
-      mass_inserts(IMAGES_TABLE, array_keys($image_inserts[0]), $image_inserts);
-      mass_inserts(IMAGE_CATEGORY_TABLE, array_keys($image_links[0]), $image_links);
-      pwg_activity('photo', $new_image_ids, 'add', array('sync'=>true));
-      $counts['new_elements'] = count($image_inserts);
-    }
-    if ($format_inserts)
-    {
-      mass_inserts(IMAGE_FORMAT_TABLE, array_keys($format_inserts[0]), $format_inserts);
-      $counts['new_formats'] += count($format_inserts);
-    }
-
-    if (!empty($conf['enable_formats']) && $db_elements)
-    {
-      $db_elements_flip = array_flip($db_elements);
-      $existing_ids = array();
-      foreach (array_intersect_key($fs, $db_elements_flip) as $path => $unused)
-      {
-        $existing_ids[] = (int)$db_elements_flip[$path];
-      }
-
-      if ($existing_ids)
-      {
-        $db_formats = array();
-        $result = pwg_query('SELECT * FROM '.IMAGE_FORMAT_TABLE.' WHERE image_id IN ('.implode(',', $existing_ids).')');
-        while ($row = pwg_db_fetch_assoc($result))
-        {
-          $db_formats[$row['image_id']][$row['ext']] = $row['format_id'];
-        }
-
-        $formats_to_delete = array();
-        $formats_to_insert = array();
-        foreach ($existing_ids as $image_id)
-        {
-          $path = $db_elements[$image_id];
-          $known = $db_formats[$image_id] ?? array();
-          $present = $fs[$path]['formats'] ?? array();
-          foreach (array_diff_key($known, $present) as $format_id)
-          {
-            $formats_to_delete[] = (int)$format_id;
-          }
-          foreach (array_diff_key($present, $known) as $ext => $filesize)
-          {
-            $formats_to_insert[] = array('image_id'=>$image_id, 'ext'=>$ext, 'filesize'=>$filesize);
-          }
-        }
-
-        if ($formats_to_delete)
-        {
-          pwg_query('DELETE FROM '.IMAGE_FORMAT_TABLE.' WHERE format_id IN ('.implode(',', $formats_to_delete).')');
-          $counts['del_formats'] = count($formats_to_delete);
-        }
-        if ($formats_to_insert)
-        {
-          mass_inserts(IMAGE_FORMAT_TABLE, array_keys($formats_to_insert[0]), $formats_to_insert);
-          $counts['new_formats'] += count($formats_to_insert);
-        }
-      }
-    }
-
-    $to_delete_elements = array();
-    foreach (array_diff($db_elements, array_keys($fs)) as $path)
-    {
-      $id = array_search($path, $db_elements, true);
-      if ($id !== false)
-      {
-        $to_delete_elements[] = (int)$id;
-      }
-    }
-    if ($to_delete_elements)
-    {
-      delete_elements($to_delete_elements);
-      $counts['del_elements'] = count($to_delete_elements);
-    }
-
-    update_category('all');
-    update_global_rank();
-
-    $files = get_filelist('', $site_id, true, false);
-    $updates = array();
-    foreach ($files as $id => $file)
-    {
-      $data = $site_reader->get_element_update_attributes($file['path']);
-      if (!is_array($data))
-      {
-        continue;
-      }
-      $data['id'] = $id;
-      $updates[] = $data;
-    }
-    if ($updates)
-    {
-      mass_updates(
-        IMAGES_TABLE,
-        array('primary'=>array('id'), 'update'=>$site_reader->get_update_attributes()),
-        $updates
-      );
-    }
-    $counts['upd_elements'] = count($updates);
-
-    $metadata_files = get_filelist('', $site_id, true, true);
-    $counts['metadata_candidates'] = count($metadata_files);
-    $metadata_updates = array();
-    $tags_of = array();
-
-    foreach ($metadata_files as $id => $element_infos)
-    {
-      $data = $site_reader->get_element_metadata($element_infos);
-      if (!is_array($data))
-      {
-        bratonien_tools_nc_productive_error($errors, $element_infos['path'], 'PWG-ERROR-NO-FS');
-        continue;
-      }
-
-      $data['date_metadata_update'] = $dbnow;
-      $data['id'] = $id;
-      $metadata_updates[] = $data;
-
-      foreach (array('keywords','tags') as $key)
-      {
-        if (!isset($data[$key]))
-        {
-          continue;
-        }
-        $tags_of[$id] = $tags_of[$id] ?? array();
-        foreach (explode(',', $data[$key]) as $tag_name)
-        {
-          $tags_of[$id][] = tag_id_from_tag_name($tag_name);
-        }
-      }
-    }
-
-    if ($metadata_updates)
-    {
-      mass_updates(
-        IMAGES_TABLE,
-        array(
-          'primary'=>array('id'),
-          'update'=>array_unique(array_merge(
-            array_diff($site_reader->get_metadata_attributes(), array('keywords','tags')),
-            array('date_metadata_update')
-          )),
-        ),
-        $metadata_updates,
-        MASS_UPDATES_SKIP_EMPTY
-      );
-    }
-    if ($tags_of)
-    {
-      set_tags_of($tags_of);
-    }
-    $counts['metadata_updated'] = count($metadata_updates);
-
-    // Mirror Piwigo 16.4.0 Maintenance -> "Update albums informations".
-    // This repairs the derived album hierarchy and counters that the direct
-    // API sync otherwise bypasses when no admin maintenance page is invoked.
-    images_integrity();
-    categories_integrity();
-    update_uppercats();
-    update_category('all');
-    update_global_rank();
-    invalidate_user_cache(true);
-
-    // Mirror Piwigo 16.4.0 Maintenance -> "Update photos information".
-    // This finalizes physical paths, ratings and derived photo information.
-    images_integrity();
-    update_path();
-    include_once(PHPWG_ROOT_PATH.'include/functions_rate.inc.php');
-    update_rating_score();
-    invalidate_user_cache();
   }
   catch (Throwable $e)
   {
-    return new PwgError(500, 'Bratonien direct synchronization failed: '.$e->getMessage());
+    if (ob_get_level() > 0)
+    {
+      ob_end_clean();
+    }
+    return new PwgError(500, 'Piwigo core synchronization failed: '.$e->getMessage());
+  }
+  finally
+  {
+    $_GET = $saved_get;
+    $_POST = $saved_post;
+
+    if ($saved_template_dirs !== null && is_object($template) && isset($template->smarty))
+    {
+      $template->smarty->setTemplateDir($saved_template_dirs);
+    }
+
+    if ($saved_default_status === null)
+    {
+      unset($conf['newcat_default_status']);
+    }
+    else
+    {
+      $conf['newcat_default_status'] = $saved_default_status;
+    }
+    if ($saved_request_method === null)
+    {
+      unset($_SERVER['REQUEST_METHOD']);
+    }
+    else
+    {
+      $_SERVER['REQUEST_METHOD'] = $saved_request_method;
+    }
   }
 
   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' => is_array($counts) ? $counts : array(),
-    'counts' => $counts,
-    'errors' => $errors,
-    'error_count' => count($errors),
     'database_writes' => true,
+    'core_output_bytes' => strlen($output),
     'username' => isset($user['username']) ? (string)$user['username'] : '',
     'status' => isset($user['status']) ? (string)$user['status'] : '',
   );

main.inc.php

@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: Bratonien Tools
-Version: 0.9.7.24
+Version: 0.9.7.25
 Description: Erweiterbare Administrationswerkzeuge fuer die Bratonien-Piwigo-Installation.
 Plugin URI: https://github.com/Terranom674/Piwigo_Bratonien_Tools
 Author: Bratonien
@@ -22,7 +22,6 @@ require_once(BRATONIEN_TOOLS_PATH . 'include/picture_navigation.inc.php');
 require_once(BRATONIEN_TOOLS_PATH . 'include/batch_titles.inc.php');
 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');
 
@@ -38,7 +37,6 @@ add_event_handler('init', 'bratonien_tools_preserve_private_album_access', EVENT
 add_event_handler('init', 'bratonien_tools_album_shares_init');
 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');
 add_event_handler('ws_add_methods', 'bratonien_tools_register_nc_productive_ws_methods');
 
 function bratonien_tools_prepare_connector_private_import()

runtime/lib/piwigo-sync.php

@@ -15,27 +15,12 @@ function http_error_detail($body)
 {
   $body = trim((string)$body);
   if ($body === '') return '';
-
   $decoded = json_decode($body, true);
   if (is_array($decoded))
   {
     $detail = (string)($decoded['message'] ?? $decoded['err'] ?? '');
     if ($detail !== '') return $detail;
   }
-
-  if (function_exists('simplexml_load_string'))
-  {
-    $previous = libxml_use_internal_errors(true);
-    $xml = simplexml_load_string($body);
-    libxml_clear_errors();
-    libxml_use_internal_errors($previous);
-    if ($xml !== false)
-    {
-      $detail = trim((string)($xml->message ?? $xml->err ?? ''));
-      if ($detail !== '') return $detail;
-    }
-  }
-
   $plain = trim(preg_replace('/\s+/', ' ', strip_tags($body)));
   return $plain === '' ? '' : mb_substr($plain, 0, 500);
 }
@@ -74,55 +59,15 @@ function http_request($url, array $fields, array $headers = array(), $cookie_fil
   return (string)$body;
 }
 
-function xml_value_sync(SimpleXMLElement $node)
-{
-  $children = $node->children();
-  if (count($children) === 0) return (string)$node;
-  $result = array();
-  foreach ($children as $name => $child)
-  {
-    $value = xml_value_sync($child);
-    if (array_key_exists($name, $result))
-    {
-      if (!is_array($result[$name]) || !array_is_list($result[$name])) $result[$name] = array($result[$name]);
-      $result[$name][] = $value;
-    }
-    else $result[$name] = $value;
-  }
-  return $result;
-}
-
 function decode_ws($body)
 {
   $decoded = json_decode((string)$body, true);
-  if (!is_array($decoded))
+  if (!is_array($decoded)) fail_sync('Piwigo lieferte keine gueltige JSON-Webservice-Antwort.');
-  {
-    if (!function_exists('simplexml_load_string')) fail_sync('Piwigo lieferte XML, aber SimpleXML ist nicht verfuegbar.');
-    $previous = libxml_use_internal_errors(true);
-    $xml = simplexml_load_string((string)$body);
-    libxml_clear_errors();
-    libxml_use_internal_errors($previous);
-    if ($xml === false || $xml->getName() !== 'rsp') fail_sync('Piwigo lieferte weder gueltiges JSON noch eine gueltige XML-Webservice-Antwort.');
-    $decoded = array('stat'=>(string)$xml['stat']);
-    foreach ($xml->children() as $name => $child)
-    {
-      $value = xml_value_sync($child);
-      if (array_key_exists($name, $decoded))
-      {
-        if (!is_array($decoded[$name]) || !array_is_list($decoded[$name])) $decoded[$name] = array($decoded[$name]);
-        $decoded[$name][] = $value;
-      }
-      else $decoded[$name] = $value;
-    }
-  }
   if (($decoded['stat'] ?? '') !== 'ok')
   {
-    $message = (string)($decoded['message'] ?? $decoded['err'] ?? 'Piwigo-Aufruf wurde abgelehnt.');
+    fail_sync((string)($decoded['message'] ?? $decoded['err'] ?? 'Piwigo-Aufruf wurde abgelehnt.'));
-    fail_sync($message);
   }
-  if (array_key_exists('result', $decoded)) return $decoded['result'];
+  return $decoded['result'] ?? array();
-  unset($decoded['stat']);
-  return $decoded;
 }
 
 function decrypt_blob($blob, $hex_key)
@@ -134,34 +79,28 @@ function decrypt_blob($blob, $hex_key)
   $iv = base64_decode((string)($payload['iv'] ?? ''), true);
   $tag = base64_decode((string)($payload['tag'] ?? ''), true);
   $cipher = base64_decode((string)($payload['data'] ?? ''), true);
+  if (!is_string($iv) || !is_string($tag) || !is_string($cipher)) fail_sync('Gespeicherte Zugangsdaten sind unvollstaendig.');
   $plain = openssl_decrypt($cipher, 'aes-256-gcm', hex2bin($hex_key), OPENSSL_RAW_DATA, $iv, $tag);
   if ($plain === false) fail_sync('Gespeicherte Zugangsdaten konnten nicht entschluesselt werden.');
-  return (string)$plain;
+  $decoded = json_decode((string)$plain, true);
+  return is_array($decoded) ? $decoded : array();
 }
 
 function ensure_webdav_site(mysqli $db, $prefixeTable, $piwigo_root, array $connection_config, $connection_id)
 {
-  if ((string)($connection_config['source_mode'] ?? '') !== 'webdav-placeholder') return 1;
-
   $gallery_root = rtrim((string)($connection_config['parallel_gallery_root'] ?? ''), '/');
   if ($gallery_root === '') fail_sync('WebDAV-Galeriewurzel fehlt in der Verbindungskonfiguration.');
+
   $piwigo_root = rtrim((string)$piwigo_root, '/');
-  if (strpos($gallery_root, $piwigo_root.'/') !== 0)
+  if (strpos($gallery_root, $piwigo_root.'/') !== 0) fail_sync('WebDAV-Galeriewurzel liegt ausserhalb der Piwigo-Installation.');
-  {
-    fail_sync('WebDAV-Galeriewurzel liegt ausserhalb der Piwigo-Installation.');
-  }
   if (!is_dir($gallery_root)) fail_sync('WebDAV-Galeriewurzel existiert nicht: '.$gallery_root);
 
   $relative = ltrim(substr($gallery_root, strlen($piwigo_root)), '/');
-  if ($relative === '') fail_sync('WebDAV-Galeriewurzel darf nicht dem Piwigo-Hauptverzeichnis entsprechen.');
   $site_url = './'.rtrim($relative, '/').'/';
   $escaped = $db->real_escape_string($site_url);
   $result = $db->query("SELECT id FROM `{$prefixeTable}sites` WHERE galleries_url='{$escaped}' LIMIT 1");
   if (!$result) fail_sync('Piwigo-Site konnte nicht gelesen werden: '.$db->error);
-  if ($result->num_rows)
+  if ($result->num_rows) return (int)$result->fetch_assoc()['id'];
-  {
-    return (int)$result->fetch_assoc()['id'];
-  }
 
   if (!$db->query("INSERT INTO `{$prefixeTable}sites` (galleries_url) VALUES ('{$escaped}')"))
   {
@@ -186,7 +125,6 @@ try
   $conf = array();
   $prefixeTable = 'piwigo_';
   require $db_config;
-  foreach (array('db_host','db_user','db_password','db_base') as $key) if (!isset($conf[$key])) fail_sync('Piwigo-Datenbankkonfiguration ist unvollstaendig: '.$key);
 
   $db = new mysqli($conf['db_host'], $conf['db_user'], $conf['db_password'], $conf['db_base']);
   if ($db->connect_errno) fail_sync('Piwigo-Datenbank ist nicht erreichbar: '.$db->connect_error);
@@ -202,80 +140,43 @@ try
   $connection_row = $connection_result->fetch_assoc();
   $connection_config = json_decode((string)$connection_row['config_json'], true);
   if (!is_array($connection_config)) $connection_config = array();
-  $connection_plain = decrypt_blob((string)$connection_row['secret_blob'], $hex_key);
+  $credentials = decrypt_blob((string)$connection_row['secret_blob'], $hex_key);
-  $connection_credentials = json_decode($connection_plain, true);
-  if (!is_array($connection_credentials)) $connection_credentials = array();
 
   $site_id = ensure_webdav_site($db, $prefixeTable, $piwigo_root, $connection_config, $connection_id);
 
-  $api = array('key_id'=>'', 'key_secret'=>'');
+  $api_enabled = !empty($connection_config['api_enabled']);
-  $connection_scoped = (string)($connection_config['piwigo_auth'] ?? '') === 'connection-scoped' || array_key_exists('api_enabled', $connection_config);
+  $api_key_id = $api_enabled ? trim((string)($credentials['api_key_id'] ?? '')) : '';
-  if ($connection_scoped)
+  $api_key_secret = $api_enabled ? trim((string)($credentials['api_key_secret'] ?? '')) : '';
-  {
-    if (!empty($connection_config['api_enabled']))
-    {
-      $api['key_id'] = trim((string)($connection_credentials['api_key_id'] ?? ''));
-      $api['key_secret'] = trim((string)($connection_credentials['api_key_secret'] ?? ''));
-    }
-  }
-  else
-  {
-    $api_result = $db->query("SELECT value FROM `{$prefixeTable}config` WHERE param='bratonien_nc_piwigo_api' LIMIT 1");
-    if ($api_result && $api_result->num_rows)
-    {
-      $api_blob = (string)$api_result->fetch_assoc()['value'];
-      if ($api_blob !== '')
-      {
-        $api_plain = decrypt_blob($api_blob, $hex_key);
-        $api_decoded = json_decode($api_plain, true);
-        if (is_array($api_decoded))
-        {
-          $api['key_id'] = (string)($api_decoded['key_id'] ?? '');
-          $api['key_secret'] = (string)($api_decoded['key_secret'] ?? '');
-        }
-      }
-    }
-  }
 
-  $fallback_user = (string)($connection_credentials['piwigo_user'] ?? '');
+  if ($api_key_id !== '' && $api_key_secret !== '')
-  $fallback_password = (string)($connection_credentials['piwigo_password'] ?? '');
-
-  $api_error = null;
-  if ($api['key_id'] !== '' && $api['key_secret'] !== '')
   {
     try
     {
       $headers = array(
-        'X-PIWIGO-API: '.$api['key_id'].':'.$api['key_secret'],
+        'X-PIWIGO-API: '.$api_key_id.':'.$api_key_secret,
-        'Accept: application/json, text/xml;q=0.9',
+        'Accept: application/json',
         'Content-Type: application/x-www-form-urlencoded',
       );
-      decode_ws(http_request($base_url.'/ws.php?format=json', array('method'=>'bratonien.nc.syncProductive', 'site_id'=>$site_id), $headers));
+      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), $headers));
+        $base_url.'/ws.php?format=json',
-      // Entfernt alte technische bratonien-webdav-N Wrapper aus Site 1,
+        array('method'=>'bratonien.nc.syncProductive', 'site_id'=>$site_id),
-      // nachdem deren generierte Verzeichnisse beim Reconcile entfernt wurden.
+        $headers
-      if ($site_id !== 1)
+      ));
-      {
+      echo "Piwigo-Synchronisierung per API erfolgreich (Piwigo-Core, Site $site_id)\n";
-        decode_ws(http_request($base_url.'/ws.php?format=json', array('method'=>'bratonien.nc.syncOrphans', 'site_id'=>1, 'simulate'=>0), $headers));
-      }
-      $added = (int)($orphan['added_orphans'] ?? 0);
-      $deleted = (int)($orphan['deleted_orphans'] ?? 0);
-      echo "Piwigo-Synchronisierung per API erfolgreich (Site $site_id)\n";
-      echo "Piwigo-Orphans synchronisiert: +$added / -$deleted\n";
       exit(0);
     }
     catch (Throwable $e)
     {
-      $api_error = $e->getMessage();
+      fwrite(STDERR, 'Piwigo-API nicht nutzbar: '.$e->getMessage()."\n");
-      fwrite(STDERR, "Piwigo-API nicht nutzbar: ".$api_error."\n");
     }
   }
   else
   {
-    $api_error = $connection_scoped ? 'Fuer diese Verbindung ist keine API konfiguriert.' : 'Keine gespeicherten API-Zugangsdaten.';
+    fwrite(STDERR, "Piwigo-API nicht nutzbar: Fuer diese Verbindung ist keine API konfiguriert.\n");
-    fwrite(STDERR, "Piwigo-API nicht nutzbar: ".$api_error."\n");
   }
 
+  $fallback_user = trim((string)($credentials['piwigo_user'] ?? ''));
+  $fallback_password = (string)($credentials['piwigo_password'] ?? '');
   if ($fallback_user === '' || $fallback_password === '') fail_sync('Kein gespeicherter Benutzername/Passwort-Fallback fuer diese Verbindung vorhanden.');
 
   $cookie_file = tempnam(sys_get_temp_dir(), 'br-nc-sync-');
@@ -283,22 +184,30 @@ 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));
+    decode_ws(http_request(
+      $base_url.'/ws.php?format=json',
+      array('method'=>'pwg.session.login', 'username'=>$fallback_user, 'password'=>$fallback_password),
+      array(),
+      $cookie_file
+    ));
+
     http_request(
       $base_url.'/admin.php?page=site_update&site='.$site_id,
-      array('sync'=>'files','display_info'=>1,'privacy_level'=>0,'sync_meta'=>1,'simulate'=>0,'subcats-included'=>1,'bratonien_connector'=>1,'submit'=>1),
+      array(
+        'sync'=>'files',
+        'display_info'=>1,
+        'privacy_level'=>0,
+        'sync_meta'=>1,
+        'simulate'=>0,
+        'subcats-included'=>1,
+        'bratonien_connector'=>1,
+        'submit'=>1,
+      ),
       array(),
       $cookie_file
     );
-    $orphan = decode_ws(http_request($base_url.'/ws.php?format=json', array('method'=>'bratonien.nc.syncOrphans', 'site_id'=>$site_id, 'simulate'=>0), array(), $cookie_file));
+
-    if ($site_id !== 1)
+    echo "Piwigo-Datenbanksynchronisierung per Benutzername/Passwort-Fallback erfolgreich (Piwigo-Core, Site $site_id)\n";
-    {
-      decode_ws(http_request($base_url.'/ws.php?format=json', array('method'=>'bratonien.nc.syncOrphans', 'site_id'=>1, 'simulate'=>0), array(), $cookie_file));
-    }
-    $added = (int)($orphan['added_orphans'] ?? 0);
-    $deleted = (int)($orphan['deleted_orphans'] ?? 0);
-    echo "Piwigo-Datenbanksynchronisierung per Benutzername/Passwort-Fallback erfolgreich (Site $site_id)\n";
-    echo "Piwigo-Orphans synchronisiert: +$added / -$deleted\n";
   }
   finally
   {
@@ -307,6 +216,6 @@ try
 }
 catch (Throwable $e)
 {
-  fwrite(STDERR, $e->getMessage()."\n");
+  fwrite(STDERR, 'Piwigo-Synchronisierung fehlgeschlagen: '.$e->getMessage()."\n");
   exit(1);
 }