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

Fix XML reflection method discovery

Browse Source
This commit is contained in:
Terranom674
2026-08-17 21:49:47 +02:00
parent 0a300b6cbf
commit a9a54720bb
1 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
include/nc_connector_piwigo_api.inc.php
View File

@@ -86,6 +86,38 @@ function bratonien_tools_nc_connector_api_payload(array $decoded)
return $decoded; return $decoded;
} }
function bratonien_tools_nc_connector_collect_method_names($value, array &$methods)
{
if (is_string($value))
{
$value = trim($value);
if ($value !== '' && preg_match('/^[A-Za-z0-9_]+(?:\.[A-Za-z0-9_]+)+$/', $value))
{
$methods[$value] = true;
}
return;
}
if (!is_array($value))
{
return;
}
if (isset($value['name']) && is_string($value['name']))
{
$name = trim($value['name']);
if ($name !== '')
{
$methods[$name] = true;
}
}
foreach ($value as $entry)
{
bratonien_tools_nc_connector_collect_method_names($entry, $methods);
}
}
function bratonien_tools_nc_connector_piwigo_api_request($api_key_id, $api_key_secret, $method) function bratonien_tools_nc_connector_piwigo_api_request($api_key_id, $api_key_secret, $method)
{ {
if (!function_exists('curl_init')) if (!function_exists('curl_init'))
@@ -175,30 +207,10 @@ function bratonien_tools_nc_connector_piwigo_api_test()
} }
$method_result = bratonien_tools_nc_connector_piwigo_api_request($api_key_id, $api_key_secret, 'reflection.getMethodList'); $method_result = bratonien_tools_nc_connector_piwigo_api_request($api_key_id, $api_key_secret, 'reflection.getMethodList');
$methods = array(); $method_map = array();
if (is_array($method_result)) bratonien_tools_nc_connector_collect_method_names($method_result, $method_map);
{ $methods = array_keys($method_map);
if (isset($method_result['method'])) sort($methods, SORT_STRING);
{
$entries = is_array($method_result['method']) ? $method_result['method'] : array($method_result['method']);
}
else
{
$entries = $method_result;
}
foreach ($entries as $entry)
{
if (is_string($entry))
{
$methods[] = $entry;
}
elseif (is_array($entry) && isset($entry['name']))
{
$methods[] = (string)$entry['name'];
}
}
}
$required_methods = array('bratonien.nc.syncProductive', 'bratonien.nc.syncOrphans'); $required_methods = array('bratonien.nc.syncProductive', 'bratonien.nc.syncOrphans');
$missing = array_values(array_diff($required_methods, $methods)); $missing = array_values(array_diff($required_methods, $methods));
@@ -213,7 +225,6 @@ function bratonien_tools_nc_connector_piwigo_api_test()
{ {
return preg_match('/sync|synchron|site/i', (string)$method) === 1; return preg_match('/sync|synchron|site/i', (string)$method) === 1;
})); }));
sort($sync_candidates, SORT_STRING);
$result = array( $result = array(
'ok' => true, 'ok' => true,