tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-09-25 18:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow Or modules without version also

Browse Source
This commit is contained in:
Sukhwinder Dhillon 2021-10-14 10:11:27 +02:00
parent b1c48a9069
commit 9cb9387206
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/Icinga/Application/Modules/Module.php
View File

@ -1003,11 +1003,13 @@ class Module
$parts = preg_split('/,\s+/', $val); $parts = preg_split('/,\s+/', $val);
foreach ($parts as $i => $part) { foreach ($parts as $i => $part) {
if (strpos($part, '|') !== false) { if (strpos($part, ' | ') !== false) {
$orParts = array_map('trim', explode('|', $part)); $orParts = array_map('trim', explode('|', $part));
foreach ($orParts as $orPart) { foreach ($orParts as $orPart) {
if (preg_match('/^([\w\-\/]+)\s+\((.+)\)$/', $orPart, $m)) { if (preg_match('/^([\w\-\/]+)\s+\((.+)\)$/', $orPart, $m)) {
$metadata->{$key}['|' . $i][$m[1]] = $m[2]; $metadata->{$key}['|' . $i][$m[1]] = $m[2];
} elseif (preg_match('/^([\w\-\/]+)$/', $orPart, $m)) {
$metadata->{$key}['|' . $i][$m[1]] = null;
} }
} }
} elseif (preg_match('/^([\w\-\/]+)\s+\((.+)\)$/', $part, $m)) { } elseif (preg_match('/^([\w\-\/]+)\s+\((.+)\)$/', $part, $m)) {