From afd862085939e86d975bbecddc622135d066ab3d Mon Sep 17 00:00:00 2001 From: Terranom674 Date: Wed, 19 Aug 2026 16:08:24 +0200 Subject: [PATCH] 0.9.6.19 allow migration with connection-scoped fallback --- include/nc_connector_edit.inc.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/include/nc_connector_edit.inc.php b/include/nc_connector_edit.inc.php index 17c261c..10a8da2 100644 --- a/include/nc_connector_edit.inc.php +++ b/include/nc_connector_edit.inc.php @@ -13,12 +13,22 @@ function bratonien_tools_nc_connector_migration_state(array $connection) if (trim((string)($config['nextcloud_url'] ?? '')) === '') $missing[] = 'Nextcloud-Adresse'; if (trim((string)($credentials['nextcloud_user'] ?? '')) === '') $missing[] = 'Nextcloud-Benutzer'; if ((string)($credentials['nextcloud_password'] ?? '') === '') $missing[] = 'Nextcloud-Passwort'; - if (trim((string)($credentials['api_key_id'] ?? '')) === '') $missing[] = 'Piwigo-API-Schluessel-ID'; - if (trim((string)($credentials['api_key_secret'] ?? '')) === '') $missing[] = 'Piwigo-API-Geheimnis'; + + $api_id = trim((string)($credentials['api_key_id'] ?? '')); + $api_secret = trim((string)($credentials['api_key_secret'] ?? '')); + $fallback_user = trim((string)($credentials['piwigo_user'] ?? '')); + $fallback_password = (string)($credentials['piwigo_password'] ?? ''); + $api_complete = $api_id !== '' && $api_secret !== ''; + $fallback_complete = $fallback_user !== '' && $fallback_password !== ''; + + if (($api_id === '') !== ($api_secret === '')) $missing[] = 'vollstaendiger Piwigo-API-Zugang'; + if (!$api_complete && !$fallback_complete) $missing[] = 'Piwigo-API oder Benutzer/Passwort-Fallback'; return array( 'ready'=>!$missing, 'missing'=>$missing, + 'api_available'=>$api_complete, + 'fallback_available'=>$fallback_complete, ); }