deon/phpldapadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for showing no_lang_tag attrs (which are displayed without values) on a lang_tag attr pane when viewing a DN

Browse Source
This commit is contained in:
Deon George 2025-04-08 14:29:21 +10:00
parent 6b2fb8dee4
commit 2abc321eca
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Classes/LDAP/Import/LDIF.php
View File

@ -66,6 +66,7 @@ class LDIF extends Import
$m = [];
preg_match('/^([a-zA-Z0-9;-]+)(:+)\s+(.*)$/',$line,$m);
dump(['m'=>$m,'line'=>$line]);
switch (Arr::get($m,1)) {
case 'changetype':
@ -156,7 +157,7 @@ class LDIF extends Import
return $result;
}
public function readEntry() {
public function xreadEntry() {
static $haveVersion = FALSE;
if ($lines = $this->nextLines()) {
@ -218,7 +219,7 @@ class LDIF extends Import
default:
if (! $server->dnExists($dn))
return $this->error(_('Unkown change type'),$lines);
return $this->error(_('Unknown change type'),$lines);
}
} else

4
app/Http/Controllers/HomeController.php
View File

@ -95,8 +95,10 @@ class HomeController extends Controller
? view(sprintf('components.attribute.widget.%s',$id))
->with('o',Factory::create($dn,$id,[],$request->objectclasses))
->with('value',$request->value)
->with('langtag',Entry::TAG_NOTAG)
->with('loop',$xx)
: new AttributeType(Factory::create($dn,$id,[],$request->objectclasses),TRUE)->render();
: new AttributeType(Factory::create($dn,$id,[],$request->objectclasses),TRUE)
->render();
}
public function entry_create(EntryAddRequest $request): \Illuminate\Http\RedirectResponse

16
app/Ldap/Entry.php
View File

@ -422,22 +422,22 @@ class Entry extends Model
/**
* Return this list of user attributes
*
* @param string|null $tag If null return all tags
* @param string $tag If null return all tags
* @return Collection
*/
public function getVisibleAttributes(?string $tag=NULL): Collection
public function getVisibleAttributes(string $tag=''): Collection
{
static $cache = NULL;
static $cache = [];
if (is_null($cache)) {
if (! Arr::get($cache,$tag ?: '_all_')) {
$ot = $this->getOtherTags();
$cache = $this->objects
->filter(fn($item)=>! $item->is_internal)
->filter(fn($item)=>is_null($tag) || $ot->has($item->name_lc) || count($item->tagValues($tag)) > 0);
$cache[$tag ?: '_all_'] = $this->objects
->filter(fn($item)=>(! $item->is_internal) && ((! $item->no_attr_tags) || (! $tag) || ($tag === Entry::TAG_NOTAG)))
->filter(fn($item)=>(! $tag) || $ot->has($item->name_lc) || count($item->tagValues($tag)) > 0);
}
return $cache;
return $cache[$tag ?: '_all_'];
}
public function hasAttribute(int|string $key): bool