Automatically work out if attributes are internal (because they are not used in objectclasses)

app/Classes/LDAP/Attribute.php

@@ -18,7 +18,7 @@ class Attribute implements \Countable, \ArrayAccess
 	protected string $name;
 
 	// Is this attribute an internal attribute
-	protected(set) bool $is_internal = FALSE;
+	protected ?bool $_is_internal = NULL;
 	protected(set) bool $no_attr_tags = FALSE;
 
 	// MIN/MAX number of values
@@ -144,6 +144,8 @@ class Attribute implements \Countable, \ArrayAccess
 			'hints' => $this->hints(),
 			// Can this attribute be edited
 			'is_editable' => $this->schema ? $this->schema->{$key} : NULL,
+			// Is this an internal attribute
+			'is_internal' => is_null($this->_is_internal) ? ($this->used_in->count() === 0) : $this->_is_internal,
 			// Objectclasses that required this attribute for an LDAP entry
 			'required' => $this->required(),
 			// Is this attribute an RDN attribute
@@ -157,7 +159,7 @@ class Attribute implements \Countable, \ArrayAccess
 			// Used in Object Classes
 			'used_in' => $this->schema?->used_in_object_classes ?: collect(),
 			// The current attribute values
-			'values' => $this->no_attr_tags ? $this->tagValues() : $this->_values,
+			'values' => ($this->no_attr_tags || $this->is_internal) ? $this->tagValues() : $this->_values,
 			// The original attribute values
 			'values_old' => $this->no_attr_tags ? $this->tagValuesOld() : $this->_values_old,
 
@@ -313,6 +315,11 @@ class Attribute implements \Countable, \ArrayAccess
 	 */
 	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE): View
 	{
+		if ($this->is_internal)
+			// @note Internal attributes cannot be edited
+			return view('components.attribute.internal')
+				->with('o',$this);
+
 		$view = match ($this->schema?->syntax_oid) {
 			self::SYNTAX_CERTIFICATE => view('components.syntax.certificate'),
 			self::SYNTAX_CERTIFICATE_LIST => view('components.syntax.certificatelist'),

app/Classes/LDAP/Attribute/Factory.php

@@ -24,13 +24,7 @@ class Factory
 		'cacertificate' => Certificate::class,
 		'certificaterevocationlist' => CertificateList::class,
 		'createtimestamp' => Internal\Timestamp::class,
-		'creatorsname' => Internal\DN::class,
 		'configcontext' => Schema\Generic::class,
-		'contextcsn' => Internal\CSN::class,
-		'entrycsn' => Internal\CSN::class,
-		'entrydn' => Internal\DN::class,
-		'entryuuid' => Internal\UUID::class,
-		'etag' => Internal\Etag::class,
 		'krblastfailedauth' => Attribute\NoAttrTags\Generic::class,
 		'krblastpwdchange' => Attribute\NoAttrTags\Generic::class,
 		'krblastsuccessfulauth' => Attribute\NoAttrTags\Generic::class,
@@ -39,17 +33,11 @@ class Factory
 		'krbprincipalkey' => KrbPrincipalKey::class,
 		'krbticketflags' => KrbTicketFlags::class,
 		'gidnumber' => GidNumber::class,
-		'hassubordinates' => Internal\HasSubordinates::class,
 		'jpegphoto' => Binary\JpegPhoto::class,
 		'modifytimestamp' => Internal\Timestamp::class,
-		'modifiersname' => Internal\DN::class,
 		'monitorcontext' => Schema\Generic::class,
 		'namingcontexts' => Schema\Generic::class,
-		'numsubordinates' => Internal\NumSubordinates::class,
 		'objectclass' => ObjectClass::class,
-		'pwdpolicysubentry' => Internal\PwdPolicySubentry::class,
-		'structuralobjectclass' => Internal\StructuralObjectClass::class,
-		'subschemasubentry' => Internal\SubschemaSubentry::class,
 		'supportedcontrol' => Schema\OID::class,
 		'supportedextension' => Schema\OID::class,
 		'supportedfeatures' => Schema\OID::class,

app/Classes/LDAP/Attribute/Internal.php

@@ -2,23 +2,13 @@
 
 namespace App\Classes\LDAP\Attribute;
 
-use Illuminate\Contracts\View\View;
-
 use App\Classes\LDAP\Attribute;
-use App\Ldap\Entry;
 
 /**
  * Represents an attribute whose values are internal
  */
 abstract class Internal extends Attribute
 {
-	protected(set) bool $is_internal = TRUE;
+	protected ?bool $_is_internal = TRUE;
 	protected(set) bool $no_attr_tags = TRUE;
-
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE): View
-	{
-		// @note Internal attributes cannot be edited
-		return view('components.attribute.internal')
-			->with('o',$this);
-	}
 }

app/Classes/LDAP/Attribute/Internal/CSN.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Classes\LDAP\Attribute\Internal;
-
-use App\Classes\LDAP\Attribute\Internal;
-
-/**
- * Represents an CSN Attribute
- */
-final class CSN extends Internal
-{
-}

app/Classes/LDAP/Attribute/Internal/DN.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Classes\LDAP\Attribute\Internal;
-
-use App\Classes\LDAP\Attribute\Internal;
-
-/**
- * Represents an DN Attribute
- */
-final class DN extends Internal
-{
-}

app/Classes/LDAP/Attribute/Internal/Etag.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Classes\LDAP\Attribute\Internal;
-
-use App\Classes\LDAP\Attribute\Internal;
-
-/**
- * Represents an Etag Attribute
- */
-final class Etag extends Internal
-{
-}

app/Classes/LDAP/Attribute/Internal/HasSubordinates.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Classes\LDAP\Attribute\Internal;
-
-use App\Classes\LDAP\Attribute\Internal;
-
-/**
- * Represents an HasSubordinates Attribute
- */
-final class HasSubordinates extends Internal
-{
-}

app/Classes/LDAP/Attribute/Internal/NumSubordinates.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Classes\LDAP\Attribute\Internal;
-
-use App\Classes\LDAP\Attribute\Internal;
-
-/**
- * Represents an NumSubordinates Attribute
- */
-final class NumSubordinates extends Internal
-{
-}

app/Classes/LDAP/Attribute/Internal/PwdPolicySubentry.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Classes\LDAP\Attribute\Internal;
-
-use App\Classes\LDAP\Attribute\Internal;
-
-/**
- * Represents an PwdPolicySubentry Attribute
- */
-final class PwdPolicySubentry extends Internal
-{
-}

app/Classes/LDAP/Attribute/Internal/StructuralObjectClass.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Classes\LDAP\Attribute\Internal;
-
-use App\Classes\LDAP\Attribute\Internal;
-
-/**
- * Represents an StructuralObjectClass Attribute
- */
-final class StructuralObjectClass extends Internal
-{
-}

app/Classes/LDAP/Attribute/Internal/SubschemaSubentry.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Classes\LDAP\Attribute\Internal;
-
-use App\Classes\LDAP\Attribute\Internal;
-
-/**
- * Represents an SubschemaSubentry Attribute
- */
-final class SubschemaSubentry extends Internal
-{
-}

app/Classes/LDAP/Attribute/Internal/UUID.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Classes\LDAP\Attribute\Internal;
-
-use App\Classes\LDAP\Attribute\Internal;
-
-/**
- * Represents an UUID Attribute
- */
-final class UUID extends Internal
-{
-}

resources/views/components/attribute/internal.blade.php

@@ -1,4 +1,4 @@
-<!-- $o=Internal::class -->
+<!-- $o=Attribute|Internal::class -->
 @foreach(old($o->name_lc,$o->values) as $value)
 	@if($loop->index)<br>@endif
 	{{ $value }}