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

NC Connector: expose Piwigo API HTTP error details

Browse Source
This commit is contained in:
Terranom674
2026-08-17 22:43:02 +02:00
parent 754d574626
commit 29001b7ccd
1 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
runtime/lib/piwigo-sync.php
View File

@@ -11,6 +11,48 @@ function fail_sync($message)
throw new RuntimeException($message); throw new RuntimeException($message);
} }
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)));
if ($plain === '')
{
return '';
}
return mb_substr($plain, 0, 500);
}
function http_request($url, array $fields, array $headers = array(), $cookie_file = null) function http_request($url, array $fields, array $headers = array(), $cookie_file = null)
{ {
$ch = curl_init($url); $ch = curl_init($url);
@@ -21,7 +63,7 @@ function http_request($url, array $fields, array $headers = array(), $cookie_fil
CURLOPT_CONNECTTIMEOUT => 10, CURLOPT_CONNECTTIMEOUT => 10,
CURLOPT_TIMEOUT => 900, CURLOPT_TIMEOUT => 900,
CURLOPT_FOLLOWLOCATION => false, CURLOPT_FOLLOWLOCATION => false,
CURLOPT_USERAGENT => 'Bratonien-NC-Connector/0.9.3.19', CURLOPT_USERAGENT => 'Bratonien-NC-Connector/0.9.3.26',
); );
if ($headers) if ($headers)
{ {
@@ -45,7 +87,8 @@ function http_request($url, array $fields, array $headers = array(), $cookie_fil
} }
if ($http < 200 || $http >= 300) if ($http < 200 || $http >= 300)
{ {
fail_sync('HTTP-Aufruf antwortete mit Status '.$http.'.'); $detail = http_error_detail((string)$body);
fail_sync('HTTP-Aufruf antwortete mit Status '.$http.($detail !== '' ? ': '.$detail : '.'));
} }
return (string)$body; return (string)$body;