When rendering dynamic attributes, dont make them editable. Closes #10 and #89.

Also some minor fixes when returning from a post for a DN with attribute tags.

app/Classes/LDAP/Attribute.php

@@ -242,6 +242,10 @@ class Attribute implements \Countable, \ArrayAccess
 		if ($this->required()->count())
 			$result->put(__('required'),sprintf('%s: %s',__('Required Attribute by ObjectClass(es)'),$this->required()->join(', ')));
 
+		// If this attribute is a dynamic attribute
+		if ($this->isDynamic())
+			$result->put(__('dynamic'),__('These are dynamic values present as a result of another attribute'));
+
 		return $result->toArray();
 	}
 
@@ -257,6 +261,19 @@ class Attribute implements \Countable, \ArrayAccess
 			|| ($a->diff($b)->count() !== 0);
 	}
 
+	/**
+	 * Are these values as a result of a dynamic attribute
+	 *
+	 * @return bool
+	 */
+	public function isDynamic(): bool
+	{
+		return $this->schema->used_in_object_classes
+			->keys()
+			->intersect($this->schema->heirachy($this->oc))
+			->count() === 0;
+	}
+
 	/**
 	 * Work out if this attribute is an RDN attribute
 	 *

app/Classes/LDAP/Schema/AttributeType.php

@@ -486,6 +486,28 @@ final class AttributeType extends Base {
 		return $this->used_in_object_classes;
 	}
 
+	/**
+	 * For a list of objectclasses return all parent objectclasses as well
+	 *
+	 * @param Collection $ocs
+	 * @return Collection
+	 */
+	public function heirachy(Collection $ocs): Collection
+	{
+		$result = collect();
+
+		foreach ($ocs as $oc) {
+			$schema = config('server')
+				->schema('objectclasses',$oc)
+				->getParents(TRUE)
+				->pluck('name');
+
+			$result = $result->merge($schema)->push($oc);
+		}
+
+		return $result;
+	}
+
 	/**
 	 * @return bool
 	 * @deprecated use $this->forced_as_may
@@ -555,15 +577,9 @@ final class AttributeType extends Base {
 	public function validation(array $array): ?array
 	{
 		// For each item in array, we need to get the OC hierarchy
-		$heirachy = collect($array)
+		$heirachy = $this->heirachy(collect($array)
 			->flatten()
-			->filter()
+			->filter());
-			->map(fn($item)=>config('server')
-				->schema('objectclasses',$item)
-				->getSupClasses()
-				->push($item))
-			->flatten()
-			->unique();
 
 		// Get any config validation
 		$validation = collect(Arr::get(config('ldap.validation'),$this->name_lc,[]));

app/View/Components/AttributeType.php

@@ -13,15 +13,17 @@ class AttributeType extends Component
 {
 	private LDAPAttribute $o;
 	private bool $new;
+	private bool $edit;
 	private string $langtag;
 
 	/**
 	 * Create a new component instance.
 	 */
-	public function __construct(LDAPAttribute $o,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG)
+	public function __construct(LDAPAttribute $o,bool $new=FALSE,bool $edit=FALSE,string $langtag=Entry::TAG_NOTAG)
 	{
 		$this->o = $o;
 		$this->new = $new;
+		$this->edit = $edit;
 		$this->langtag = $langtag;
 	}
 
@@ -33,6 +35,7 @@ class AttributeType extends Component
 		return view('components.attribute-type')
 			->with('o',$this->o)
 			->with('new',$this->new)
+			->with('edit',$this->edit)
 			->with('langtag',$this->langtag);
 	}
 }

public/css/custom.css

@@ -2,7 +2,7 @@
 attribute#userPassword .select2-container--bootstrap-5 .select2-selection {
 	font-size: inherit;
 	width: 9em;
-	border: #444054 1px solid;
+	border: var(--bs-gray-500) 1px solid;
 	background-color: #f0f0f0;
 }
 

resources/views/components/attribute-type.blade.php

@@ -15,7 +15,7 @@
 			</div>
 		</div>
 
-		<x-attribute :o="$o" :edit="true" :new="$new ?? FALSE" :langtag="$langtag"/>
+		<x-attribute :o="$o" :edit="$edit" :new="$new" :langtag="$langtag"/>
 	</div>
 </div>
 

resources/views/components/attribute.blade.php

@@ -1,10 +1,10 @@
 <!-- $o=Attribute::class -->
-<x-attribute.layout :edit="$edit ?? FALSE" :new="$new ?? FALSE" :o="$o">
+<x-attribute.layout :edit="$edit" :new="$new" :o="$o">
 	<div class="col-12">
-		@foreach(Arr::get(old($o->name_lc,[$langtag=>($new ?? FALSE) ? [NULL] : $o->tagValues($langtag)]),$langtag) as $key => $value)
+		@foreach(Arr::get(old($o->name_lc,[$langtag=>$new ? [NULL] : $o->tagValues($langtag)]),$langtag,[]) as $key => $value)
-			@if(($edit ?? FALSE) && ! $o->is_rdn)
+			@if($edit && (! $o->is_rdn))
 				<div class="input-group has-validation">
-					<input type="text" @class(['form-control','is-invalid'=>($e=$errors->get($o->name_lc.'.'.$langtag.'.'.$loop->index)),'mb-1','border-focus'=>! ($tv=$o->tagValuesOld($langtag))->contains($value)]) name="{{ $o->name_lc }}[{{ $langtag }}][]" value="{{ $value }}" placeholder="{{ ! is_null($x=$tv->get($loop->index)) ? $x : '['.__('NEW').']' }}" @readonly(! ($new ?? FALSE))>
+					<input type="text" @class(['form-control','is-invalid'=>($e=$errors->get($o->name_lc.'.'.$langtag.'.'.$loop->index)),'mb-1','border-focus'=>! ($tv=$o->tagValuesOld($langtag))->contains($value)]) name="{{ $o->name_lc }}[{{ $langtag }}][]" value="{{ $value }}" placeholder="{{ ! is_null($x=$tv->get($loop->index)) ? $x : '['.__('NEW').']' }}" @readonly(! $new) @disabled($o->isDynamic())>
 
 					<div class="invalid-feedback pb-2">
 						@if($e)

resources/views/components/attribute/binary/jpegphoto.blade.php

@@ -1,6 +1,6 @@
 <!-- @todo We are not handling redirect backs yet with updated photos -->
 <!-- $o=Binary\JpegPhoto::class -->
-<x-attribute.layout :edit="$edit ?? FALSE" :new="$new ?? FALSE" :o="$o" :langtag="$langtag">
+<x-attribute.layout :edit="$edit" :new="$new" :o="$o" :langtag="$langtag">
 	<table class="table table-borderless p-0 m-0">
 		@foreach($o->tagValuesOld() as $key => $value)
 			<tr>

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

@@ -1,6 +1,6 @@
 <!-- @todo We are not handling redirect backs yet with updated passwords -->
 <!-- $o=KrbPrincipleKey::class -->
-<x-attribute.layout :edit="$edit ?? FALSE" :new="$new ?? FALSE" :o="$o" :langtag="$langtag">
+<x-attribute.layout :edit="$edit" :new="$new" :o="$o" :langtag="$langtag">
 	@foreach($o->tagValuesOld($langtag) as $key => $value)
 		@if($edit)
 			<div class="input-group has-validation mb-3">

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

@@ -1,5 +1,5 @@
 <!-- $o=KrbTicketFlags::class -->
-<x-attribute.layout :edit="$edit ?? FALSE" :new="$new ?? FALSE" :o="$o">
+<x-attribute.layout :edit="$edit" :new="$new" :o="$o">
 	@foreach(Arr::get(old($o->name_lc,[$langtag=>$o->tagValues($langtag)]),$langtag,[]) as $key => $value)
 		@if($edit)
 			<div id="32"></div>

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

@@ -1,10 +1,10 @@
 <!-- $o=Attribute/ObjectClass::class -->
 <x-attribute.layout :edit="$edit" :new="$new" :o="$o" :langtag="$langtag">
-	@foreach(Arr::get(old($o->name_lc,[$langtag=>($new ?? FALSE) ? [NULL] : $o->tagValues($langtag)]),$langtag) as $key => $value)
+	@foreach(Arr::get(old($o->name_lc,[$langtag=>$new ? [NULL] : $o->tagValues($langtag)]),$langtag,[]) as $key => $value)
 		@if($edit)
 			<x-attribute.widget.objectclass :o="$o" :edit="$edit" :new="$new" :loop="$loop" :value="$value" :langtag="$langtag"/>
 		@else
-			{{ $o->render_item_old($langtag.'.'.$key) }}
+			{{ $o->render_item_old($key) }}
 			@if ($o->isStructural($value))
 				<input type="hidden" name="{{ $o->name_lc }}[{{ $langtag }}][]" value="{{ $value }}">
 				<span class="float-end">@lang('structural')</span>

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

@@ -1,6 +1,6 @@
 <!-- @todo We are not handling redirect backs yet with updated passwords -->
 <!-- $o=Password::class -->
-<x-attribute.layout :edit="$edit ?? FALSE" :new="$new ?? FALSE" :o="$o" :langtag="$langtag">
+<x-attribute.layout :edit="$edit" :new="$new" :o="$o" :langtag="$langtag">
 	@foreach($o->tagValuesOld($langtag) as $key => $value)
 		@if($edit)
 			<div class="input-group has-validation mb-3">

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

@@ -1,5 +1,5 @@
 <!-- $o=RDN::class -->
-<x-attribute.layout :edit="$edit ?? FALSE" :new="$new ?? FALSE" :o="$o">
+<x-attribute.layout :edit="$edit" :new="$new" :o="$o">
 	@foreach(($o->values->count() ? $o->values : ['']) as $value)
 		@if($edit)
 			<div class="input-group has-validation mb-3">

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

@@ -1,11 +1,11 @@
 <!-- $o=UserCertificate::class -->
-<x-attribute.layout :edit="$edit ?? FALSE" :new="$new ?? FALSE" :o="$o" langtag="binary">
+<x-attribute.layout :edit="$edit" :new="$new" :o="$o" langtag="binary">
 	@foreach($o->tagValuesOld('binary') as $key => $value)
 		@if($edit)
 			<input type="hidden" name="name={{ $o->name_lc }}[binary][]" value="{{ md5($value) }}">
 
 			<div class="input-group has-validation mb-3">
-				<textarea class="form-control mb-1 font-monospace" rows="{{ count(explode("\n",$x=$o->certificate())) }}" style="overflow:hidden" disabled>{{ $x }}</textarea>
+				<textarea class="form-control mb-1 font-monospace" rows="{{ count(explode("\n",$x=$o->certificate())) }}" style="overflow: hidden; font-size: 90%;" disabled>{{ $x }}</textarea>
 
 				<div class="invalid-feedback pb-2">
 					@if($e=$errors->get($o->name_lc.'.'.$langtag.'.'.$loop->index))

resources/views/components/attribute/widget/options.blade.php

@@ -244,6 +244,7 @@
 
 			<!-- All other attributes -->
 			@default
+				@if($o->isDynamic()) @break @endif
 				@php($clone=TRUE)
 				<span @class(['btn','btn-sm','btn-outline-primary','mt-3','addable','d-none'=>(! $new)]) id="{{ $o->name }}-addnew"><i class="fas fa-fw fa-plus"></i> @lang('Add Value')</span>
 

resources/views/components/form/disabled/datetime.blade.php

@@ -1,5 +1,5 @@
 <!-- $o=Attribute::class -->
-<x-attribute.layout :edit="false" :new="false" :detail="true" :o="$o">
+<x-attribute.layout :edit="false" :new="false" :o="$o" :detail="true">
 	@foreach(Arr::get(old($o->name_lc,[$langtag=>$o->tagValues($langtag)]),$langtag,[]) as $value)
 		<div class="input-group">
 			<input type="text" class="form-control mb-1" value="{{ \Carbon\Carbon::createFromTimestamp(strtotime($value))->format(config('pla.datetime_format','Y-m-d H:i:s')) }}" disabled>

resources/views/components/form/disabled/input.blade.php

@@ -1,5 +1,5 @@
 <!-- $o=Attribute::class -->
-<x-attribute.layout :edit="false" :new="false" :detail="true" :o="$o">
+<x-attribute.layout :edit="false" :new="false" :o="$o" :detail="true">
 	@foreach(Arr::get(old($o->name_lc,[$langtag=>$o->tagValues($langtag)]),$langtag,[]) as $value)
 		<div class="input-group">
 			<input type="text" class="form-control mb-1" value="{{ $value }}" disabled>