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

Fix Nextcloud OCS success handling in connection wizard

Browse Source
This commit is contained in:
Terranom674
2026-08-18 08:34:19 +02:00
parent a38035fc92
commit 38a8e76fee
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/nc_connector_wizard.inc.php
View File

@@ -152,14 +152,29 @@ function bratonien_tools_nc_wizard_http($url, $username = '', $password = '', ar
function bratonien_tools_nc_wizard_ocs_data($body) function bratonien_tools_nc_wizard_ocs_data($body)
{ {
$decoded = json_decode((string)$body, true); $decoded = json_decode((string)$body, true);
if (!is_array($decoded)) if (!is_array($decoded) || !isset($decoded['ocs']) || !is_array($decoded['ocs']))
{ {
throw new RuntimeException('Nextcloud hat keine gültige JSON-Antwort geliefert.'); throw new RuntimeException('Nextcloud hat keine gültige OCS-Antwort geliefert.');
} }
if (isset($decoded['ocs']['meta']['statuscode']) && (int)$decoded['ocs']['meta']['statuscode'] !== 100) $meta = isset($decoded['ocs']['meta']) && is_array($decoded['ocs']['meta'])
? $decoded['ocs']['meta']
: array();
$status = strtolower(trim((string)($meta['status'] ?? '')));
$status_code = isset($meta['statuscode']) ? (int)$meta['statuscode'] : 0;
// OCS API v1 commonly reports 100 for success, OCS API v2 commonly 200.
// Some Nextcloud versions additionally expose meta.status="ok". Treat all
// documented success forms as success instead of turning message "OK" into
// an error.
$success = $status === 'ok' || in_array($status_code, array(100, 200), true);
if (!$success)
{ {
$message = (string)($decoded['ocs']['meta']['message'] ?? 'Nextcloud hat die Anfrage abgelehnt.'); $message = trim((string)($meta['message'] ?? ''));
if ($message === '' || strtolower($message) === 'ok')
{
$message = 'Nextcloud hat die Anfrage abgelehnt.';
}
throw new RuntimeException($message); throw new RuntimeException($message);
} }