From f83beece8752dd85714d6808084a2f17975ac925 Mon Sep 17 00:00:00 2001 From: Deon George Date: Sun, 16 Mar 2025 21:52:55 +1100 Subject: [PATCH] Fix export to work with no_attr_tags --- app/Classes/LDAP/Export/LDIF.php | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/app/Classes/LDAP/Export/LDIF.php b/app/Classes/LDAP/Export/LDIF.php index 3e37517e..f5822cc3 100644 --- a/app/Classes/LDAP/Export/LDIF.php +++ b/app/Classes/LDAP/Export/LDIF.php @@ -41,15 +41,25 @@ class LDIF extends Export // Display Attributes foreach ($o->getObjects() as $ao) { - foreach ($ao->values as $tag => $tagvalues) { - foreach ($tagvalues as $value) { + if ($ao->no_attr_tags) + foreach ($ao->values as $value) { $result .= $this->multiLineDisplay( Str::isAscii($value) - ? sprintf('%s: %s',$ao->name.($tag ? ';'.$tag : ''),$value) - : sprintf('%s:: %s',$ao->name.($tag ? ';'.$tag : ''),base64_encode($value)) - ,$this->br); + ? sprintf('%s: %s',$ao->name,$value) + : sprintf('%s:: %s',$ao->name,base64_encode($value)) + ,$this->br); + } + + else + foreach ($ao->values as $tag => $tagvalues) { + foreach ($tagvalues as $value) { + $result .= $this->multiLineDisplay( + Str::isAscii($value) + ? sprintf('%s: %s',$ao->name.($tag ? ';'.$tag : ''),$value) + : sprintf('%s:: %s',$ao->name.($tag ? ';'.$tag : ''),base64_encode($value)) + ,$this->br); + } } - } } }