Commit 907e1508 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Merge branch '6015-add-support-for-supann-cms-carte-multi-service' into '1.4-dev'

Resolve "Add support for SupAnn CMS (Carte Multi Service)"

See merge request fusiondirectory/fd-plugins!694
parents cae365ce 5ba9e3de
...@@ -30,14 +30,16 @@ class TaggedAttribute extends SetAttribute ...@@ -30,14 +30,16 @@ class TaggedAttribute extends SetAttribute
{ {
$this->value = []; $this->value = [];
$pattern = '/^'.preg_quote($this->getLdapName(), '/').';(.+)$/'; $pattern = '/^'.preg_quote($this->getLdapName(), '/').';(.+)$/';
for ($i = 0; $i < $attrs['count']; $i++) { if (!empty($attrs)) {
if ($attrs[$i] == $this->getLdapName()) { for ($i = 0; $i < $attrs['count']; $i++) {
for ($j = 0; $j < $attrs[$attrs[$i]]['count']; $j++) { if ($attrs[$i] == $this->getLdapName()) {
$this->value[] = ';'.$attrs[$attrs[$i]][$j]; for ($j = 0; $j < $attrs[$attrs[$i]]['count']; $j++) {
} $this->value[] = ';'.$attrs[$attrs[$i]][$j];
} elseif (preg_match($pattern, $attrs[$i], $m)) { }
for ($j = 0; $j < $attrs[$attrs[$i]]['count']; $j++) { } elseif (preg_match($pattern, $attrs[$i], $m)) {
$this->value[] = $m[1].';'.$attrs[$attrs[$i]][$j]; for ($j = 0; $j < $attrs[$attrs[$i]]['count']; $j++) {
$this->value[] = $m[1].';'.$attrs[$attrs[$i]][$j];
}
} }
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment