Thomas/Piwigo_Bratonien_Tools
1
0
Fork 0
mirror of https://github.com/Terranom674/Piwigo_Bratonien_Tools.git synced 2026-09-19 15:14:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

0.9.6.19 expose exact migration fallback to runtime

Browse Source
This commit is contained in:
Terranom674
2026-08-19 16:03:50 +02:00
parent 88c787c956
commit 03e92b74a7
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
runtime/reconcile-webdav.php
View File

@@ -134,6 +134,17 @@ try
if ($baseUrl === '') fail_webdav_reconcile('Nextcloud-Adresse fehlt.');
if (!$roots) fail_webdav_reconcile('Keine WebDAV-Wurzeln gespeichert.');
$migration = isset($config['migration']) && is_array($config['migration']) ? $config['migration'] : array();
$legacyFallbackId = 0;
if ((string)($migration['role'] ?? '') === 'webdav-primary-candidate')
{
$legacyFallbackId = (int)($migration['legacy_fallback_connection_id'] ?? 0);
if ($legacyFallbackId < 1 || $legacyFallbackId === $id)
{
fail_webdav_reconcile('Die gespeicherte Migrationszuordnung zur Legacy-Verbindung ist ungueltig.');
}
}
$credentials = decrypt_webdav_credentials((string)$row['secret_blob'], $hexKey);
$user = trim($credentials['nextcloud_user']);
$password = $credentials['nextcloud_password'];
@@ -198,6 +209,7 @@ try
$lines = array(
'PIWIGO_ROOT='.webdav_shell_value($piwigoRoot),
'CONNECTION_ID='.$id,
'MIGRATION_LEGACY_CONNECTION_ID='.$legacyFallbackId,
'SOURCE_MODE=webdav-placeholder',
'WEBDAV_BASE_URL='.webdav_shell_value($baseUrl),
'WEBDAV_USER='.webdav_shell_value($user),
@@ -223,13 +235,15 @@ try
'mode'=>'parallel-webdav',
'config'=>$configPath,
'piwigo_sync_enabled'=>true,
'legacy_fallback_connection_id'=>$legacyFallbackId,
'reconciled_at'=>date('Y-m-d H:i:s'),
);
$json = json_encode($config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
if (is_string($json))
{
if (!is_string($json)) fail_webdav_reconcile('WebDAV-Runtime-Konfiguration konnte nicht serialisiert werden.');
$escaped = $db->real_escape_string($json);
$db->query("UPDATE `{$table}` SET config_json='{$escaped}' WHERE id={$id} LIMIT 1");
if (!$db->query("UPDATE `{$table}` SET config_json='{$escaped}' WHERE id={$id} AND adapter='remote' LIMIT 1"))
{
fail_webdav_reconcile('WebDAV-Runtime-Status konnte nicht gespeichert werden: '.$db->error);
}
}
catch (Throwable $e)