museum-digital/MDAllowedValueSets
36
0
Fork 2
Code Issues 14 Pull Requests Releases Wiki Activity

Accept iconclass names with specifying brackets

Browse Source
This commit is contained in:
Joshua Ramon Enslin
2026-02-12 14:08:10 +01:00
parent ab38fe88c4
commit 0792438a83
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/enums/MDNodaRepository.php
View File

@@ -399,26 +399,25 @@ enum MDNodaRepository implements MDValueEnumInterface, JsonSerializable {
*/
private static function validateIconclassId(string $id):string|false {
if (filter_var($id, FILTER_VALIDATE_URL) !== false) {
$id = rtrim(strtr($id, [
'http://iconclass.org/rkd/' => '',
'http://iconclass.org/' => '',
'https://iconclass.org/' => '',
'http://www.iconclass.org/rkd/' => '',
'http://www.iconclass.org/' => '',
'https://www.iconclass.org/' => '',
]), '/');
}
$id = trim($id, "/");
$id = trim(strtr($id, [
'http://iconclass.org/rkd/' => '',
'http://iconclass.org/' => '',
'https://iconclass.org/' => '',
'http://www.iconclass.org/rkd/' => '',
'http://www.iconclass.org/' => '',
'https://www.iconclass.org/' => '',
]), '/');
if (!empty(trim($id, '0123456789abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ(+)'))) {
if (!empty(trim($id, '0123456789abcdefghijklmnopqrstuvwxyzäüö-/ABCDEFGHIJKLMNOPQRSTUVWXYZÄÜÖ(+)'))) {
// Try url_decoding
$id = urldecode($id);
if (!empty(trim($id, '0123456789abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ(+)'))) {
if (!empty(trim($id, '0123456789abcdefghijklmnopqrstuvwxyzäüö-/ABCDEFGHIJKLMNOPQRSTUVWXYZÄÜÖ(+)'))) {
return false;
}
}
if (!is_numeric(substr($id, 0, 1))) return false;
return $id;
}