Enabled adding new attributes to a DN

app/Classes/LDAP/Attribute.php

@@ -97,6 +97,7 @@ class Attribute
 		$this->name = $name;
 		$this->values = collect($values);
 		$this->lang_tags = collect();
+		$this->required_by = collect();
 
 		// No need to load our schema for internal attributes
 		if (! $this->is_internal)
@@ -182,9 +183,10 @@ class Attribute
 	 * Display the attribute value
 	 *
 	 * @param bool $edit
+	 * @param bool $blank
 	 * @return View
 	 */
-	public function render(bool $edit=FALSE): View
+	public function render(bool $edit=FALSE,bool $blank=FALSE): View
 	{
 		return view('components.attribute')
 			->with('edit',$edit)

app/Classes/LDAP/Attribute/Binary/JpegPhoto.php

@@ -18,10 +18,11 @@ final class JpegPhoto extends Binary
 		$this->internal = FALSE;
 	}
 
-	public function render(bool $edit=FALSE): View
+	public function render(bool $edit=FALSE,bool $blank=FALSE): View
 	{
 		return view('components.attribute.binary.jpegphoto')
 			->with('edit',$edit)
+			->with('blank',$blank)
 			->with('o',$this)
 			->with('f',new \finfo);
 	}

app/Classes/LDAP/Attribute/Internal.php

@@ -13,7 +13,7 @@ abstract class Internal extends Attribute
 {
 	protected bool $is_internal = TRUE;
 
-	public function render(bool $edit=FALSE): View
+	public function render(bool $edit=FALSE,bool $blank=FALSE): View
 	{
 		// @note Internal attributes cannot be edited
 		return view('components.attribute.internal')

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

@@ -11,7 +11,7 @@ use App\Classes\LDAP\Attribute\Internal;
  */
 final class Timestamp extends Internal
 {
-	public function render(bool $edit=FALSE): View
+	public function render(bool $edit=FALSE,bool $blank=FALSE): View
 	{
 		// @note Internal attributes cannot be edited
 		return view('components.attribute.internal.timestamp')

app/Classes/LDAP/Attribute/ObjectClass.php

@@ -39,7 +39,7 @@ final class ObjectClass extends Attribute
 		return $this->structural->search($value) !== FALSE;
 	}
 
-	public function render(bool $edit=FALSE): View
+	public function render(bool $edit=FALSE,bool $blank=FALSE): View
 	{
 		return view('components.attribute.objectclass')
 			->with('edit',$edit)

app/Classes/LDAP/Attribute/Password.php

@@ -11,10 +11,11 @@ use App\Classes\LDAP\Attribute;
  */
 final class Password extends Attribute
 {
-	public function render(bool $edit=FALSE): View
+	public function render(bool $edit=FALSE,bool $blank=FALSE): View
 	{
 		return view('components.attribute.password')
 			->with('edit',$edit)
+			->with('blank',$blank)
 			->with('o',$this);
 	}
 }

app/Classes/LDAP/Attribute/Schema.php

@@ -49,7 +49,7 @@ abstract class Schema extends Attribute
 		return Arr::get(($array ? $array->get($string) : []),$key);
 	}
 
-	public function render(bool $edit=FALSE): View
+	public function render(bool $edit=FALSE,bool $blank=FALSE): View
 	{
 		// @note Schema attributes cannot be edited
 		return view('components.attribute.internal')

app/Classes/LDAP/Attribute/Schema/Mechanisms.php

@@ -33,7 +33,7 @@ final class Mechanisms extends Schema
 		return parent::_get(config_path('ldap_supported_saslmechanisms.txt'),$string,$key);
 	}
 
-	public function render(bool $edit=FALSE): View
+	public function render(bool $edit=FALSE,bool $blank=FALSE): View
 	{
 		// @note Schema attributes cannot be edited
 		return view('components.attribute.schema.mechanisms')

app/Classes/LDAP/Attribute/Schema/OID.php

@@ -34,7 +34,7 @@ final class OID extends Schema
 		return parent::_get(config_path('ldap_supported_oids.txt'),$string,$key);
 	}
 
-	public function render(bool $edit=FALSE): View
+	public function render(bool $edit=FALSE,bool $blank=FALSE): View
 	{
 		// @note Schema attributes cannot be edited
 		return view('components.attribute.schema.oid')

app/Http/Controllers/HomeController.php

@@ -8,14 +8,16 @@ use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\File;
-use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Redirect;
 use LdapRecord\Exceptions\InsufficientAccessException;
 use LdapRecord\LdapRecordException;
 use LdapRecord\Query\ObjectNotFoundException;
 
-use App\Classes\LDAP\Server;
+use App\Classes\LDAP\{Attribute,Server};
 use App\Exceptions\InvalidUsage;
 use App\Http\Requests\EntryRequest;
+use App\View\Components\AttributeType;
 
 class HomeController extends Controller
 {
@@ -47,7 +49,20 @@ class HomeController extends Controller
 			->with('page_actions',$page_actions);
 	}
 
-	public function entry_update(EntryRequest $request)
+	public function entry_newattr(string $id)
+	{
+		$x = new AttributeType(new Attribute($id,[]),TRUE);
+		return $x->render();
+	}
+
+	/**
+	 * Show a confirmation to update a DN
+	 *
+	 * @param EntryRequest $request
+	 * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View|\Illuminate\Foundation\Application|\Illuminate\Http\RedirectResponse
+	 * @throws ObjectNotFoundException
+	 */
+	public function entry_pending_update(EntryRequest $request)
 	{
 		$dn = Crypt::decryptString($request->dn);
 
@@ -56,10 +71,60 @@ class HomeController extends Controller
 		foreach ($request->except(['_token','dn']) as $key => $value)
 			$o->{$key} = array_filter($value);
 
-		Session::put('dn',$request->dn);
+		if (! $o->getDirty())
+			return back()
+				->withInput()
+				->with('note',__('No attributes changed'));
+
+		$base = Server::baseDNs() ?: collect();
+
+		$bases = $base->transform(function($item) {
+			return [
+				'title'=>$item->getRdn(),
+				'item'=>$item->getDNSecure(),
+				'lazy'=>TRUE,
+				'icon'=>'fa-fw fas fa-sitemap',
+				'tooltip'=>$item->getDn(),
+			];
+		});
+
+		return view('frames.update')
+			->with('bases',$bases)
+			->with('dn',$dn)
+			->with('o',$o);
+	}
+
+	/**
+	 * Update a DN entry
+	 *
+	 * @param EntryRequest $request
+	 * @return \Illuminate\Http\RedirectResponse
+	 * @throws ObjectNotFoundException
+	 */
+	public function entry_update(EntryRequest $request)
+	{
+		$base = Server::baseDNs() ?: collect();
+
+		$bases = $base->transform(function($item) {
+			return [
+				'title'=>$item->getRdn(),
+				'item'=>$item->getDNSecure(),
+				'lazy'=>TRUE,
+				'icon'=>'fa-fw fas fa-sitemap',
+				'tooltip'=>$item->getDn(),
+			];
+		});
+
+		$dn = Crypt::decryptString($request->dn);
+
+		$o = config('server')->fetch($dn);
+
+		foreach ($request->except(['_token','dn']) as $key => $value)
+			$o->{$key} = array_filter($value);
 
 		if (! $dirty=$o->getDirty())
 			return back()
+				->withInput()
 				->with('note',__('No attributes changed'));
 
 		try {
@@ -70,7 +135,8 @@ class HomeController extends Controller
 
 			switch ($x=$e->getDetailedError()->getErrorCode()) {
 				case 50:
-					return back()
+					return Redirect::to('/')
+						->withInput()
 						->withErrors(sprintf('%s: %s (%s)',__('LDAP Server Error Code'),$x,__($e->getDetailedError()->getErrorMessage())));
 
 				default:
@@ -82,7 +148,8 @@ class HomeController extends Controller
 
 			switch ($x=$e->getDetailedError()->getErrorCode()) {
 				case 8:
-					return back()
+					return Redirect::to('/')
+						->withInput()
 						->withErrors(sprintf('%s: %s (%s)',__('LDAP Server Error Code'),$x,__($e->getDetailedError()->getErrorMessage())));
 
 				default:
@@ -90,7 +157,8 @@ class HomeController extends Controller
 			}
 		}
 
-		return back()
+		return Redirect::to('/')
+			->withInput()
 			->with('success',__('Entry updated'))
 			->with('updated',$dirty);
 	}

app/View/Components/Attribute.php

@@ -10,16 +10,18 @@ class Attribute extends Component
 {
 	public LDAPAttribute $o;
 	public bool $edit;
+	public bool $new;
 
     /**
      * Create a new component instance.
      *
      * @return void
      */
-    public function __construct(bool $edit,LDAPAttribute $o)
+    public function __construct(bool $edit,LDAPAttribute $o,bool $new=FALSE)
     {
 		$this->edit = $edit;
 		$this->o = $o;
+		$this->new = $new;
     }
 
     /**
@@ -29,6 +31,6 @@ class Attribute extends Component
      */
     public function render()
     {
-		return $this->o->render($this->edit);
+		return $this->o->render($this->edit,$this->new);
     }
 }

app/View/Components/AttributeType.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\View\Components;
+
+use Closure;
+use Illuminate\Contracts\View\View;
+use Illuminate\View\Component;
+
+use App\Classes\LDAP\Attribute as LDAPAttribute;
+
+class AttributeType extends Component
+{
+	public LDAPAttribute $o;
+	public bool $new;
+
+	/**
+	 * Create a new component instance.
+	 */
+	public function __construct(LDAPAttribute $o,bool $new=FALSE)
+	{
+		$this->o = $o;
+		$this->new = $new;
+	}
+
+	/**
+	 * Get the view / contents that represent the component.
+	 */
+	public function render(): View|Closure|string
+	{
+		return view('components.attribute-type')
+			->with('o',$this->o)
+			->with('new',$this->new);
+	}
+}

config/ldap.php

@@ -123,7 +123,7 @@ return [
 	'validation' => [
 		'objectclass' => ['objectclass'=>['array','min:1']],
 		'gidnumber' => ['gidnumber'=>['sometimes','array','max:1'],'gidnumber.*'=>['integer','max:65535']],
-		'mail' => ['mail'=>['sometimes','array','min:1'],'mail.*'=>['email']],
+		'mail' => ['mail'=>['sometimes','array','min:1'],'mail.*'=>['nullable','email']],
 		'uidnumber' => ['uidnumber'=>['sometimes','array','max:1'],'uidnumber.*'=>['integer','max:65535']],
 	],
 ];

public/js/custom.js

@@ -13,7 +13,7 @@ function expandChildren(node) {
 
 function getNode(item) {
 	$.ajax({
-		url: 'dn',
+		url: '/dn',
 		method: 'POST',
 		data: { key: item },
 		dataType: 'html',

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

@@ -0,0 +1,20 @@
+<!-- $o=AttributeType::class -->
+<div class="row pb-3">
+	<div class="col-12 col-sm-1 col-md-2"></div>
+	<div class="col-12 col-sm-10 col-md-8">
+		<div class="row">
+			<div class="col-12 bg-light text-dark p-2">
+				<strong><abbr title="{{ $o->description }}">{{ $o->name }}</abbr></strong>
+				<!-- Attribute Hints -->
+				<span class="float-end small">
+					@foreach($o->hints as $name => $description)
+						@if ($loop->index),@endif
+						<abbr title="{{ $description }}">{{ $name }}</abbr>
+					@endforeach
+				</span>
+			</div>
+		</div>
+
+		<x-attribute :edit="true" :new="$new" :o="$o"/>
+	</div>
+</div>

resources/views/components/attribute.blade.php

@@ -1,31 +1,26 @@
 <!-- $o=Attribute::class -->
-<div class="row">
+<div class="row pt-2">
-	<div class="col-12">
+	<div class="col-1"></div>
+	<div class="col-10 p-2">
 		<div id="{{ $o->name_lc }}">
-			@foreach (old($o->name_lc,$o->values) as $value)
+			@foreach (old($o->name_lc,$new ? [NULL] : $o->values) as $value)
 				@if ($edit && ! $o->is_rdn)
 					<div class="input-group has-validation">
-						<input type="text" class="form-control @if($e=$errors->get($o->name_lc.'.'.$loop->index))is-invalid @endif mb-1 @if($o->values->search($value) === FALSE) border-focus @endif" name="{{ $o->name_lc }}[]" value="{{ $value }}" placeholder="{{ ! is_null($x=Arr::get($o->values,$loop->index)) ? $x : '['.__('NEW').']' }}" readonly="true">
+						<input type="text" class="form-control @if($e=$errors->get($o->name_lc.'.'.$loop->index))is-invalid @endif mb-1 @if($o->values->search($value) === FALSE) border-focus @endif" name="{{ $o->name_lc }}[]" value="{{ $value }}" placeholder="{{ ! is_null($x=Arr::get($o->values,$loop->index)) ? $x : '['.__('NEW').']' }}" @if (! $new)readonly="true" @endif">
+
 						<div class="invalid-feedback pb-2">
 							@if($e)
 								{{ join('|',$e) }}
 							@endif
 						</div>
 					</div>
+
 				@else
-					{{ $value }}<br>
+					{{ $value }}
 				@endif
 			@endforeach
 		</div>
-	</div>
 
-	<div class="col-12 col-sm-6 col-lg-4">
+		@include('components.attribute.widget.options')
-		@if($o->is_rdn)
-			<span class="btn btn-sm btn-outline-focus mt-3 mb-3"><i class="fas fa-fw fa-exchange"></i> @lang('Rename')</span>
-		@elseif($edit && $o->can_addvalues)
-			<div class="p-0 m-0 addable d-none" id="{{ $o->name_lc }}">
-				<span class="btn btn-sm btn-outline-primary mt-3 mb-3"><i class="fas fa-fw fa-plus"></i> @lang('Add Value')</span>
-			</div>
-		@endif
 	</div>
 </div>

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

@@ -3,7 +3,7 @@
 	<div class="input-group has-validation @if($e=$errors->get($o->name_lc))is-invalid @endif">
 @endif
 
-	<table class="table table-borderless p-0 m-0">
+<table class="table table-borderless p-0 m-0">
 	<tr>
 		@foreach ($o->values as $value)
 			@switch ($x=$f->buffer($value,FILEINFO_MIME_TYPE))
@@ -20,14 +20,14 @@
 			@endswitch
 		@endforeach
 	</tr>
-	</table>
+</table>
 
-	@if($edit)
+@if($edit)
 	<div class="invalid-feedback pb-2">
 		@if($e)
 			{{ join('|',$e) }}
 		@endif
 	</div>
 
-	</div>
+</div>
-	@endif
+@endif

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

@@ -1,6 +1,7 @@
 <!-- $o=Attribute::class -->
 <div class="row">
-	<div class="col-12">
+	<div class="col-1"></div>
+	<div class="col-10 p-2">
 		<div id="{{ $o->name_lc }}">
 			@foreach (old($o->name_lc,$o->values) as $value)
 				@if ($edit && ($value === NULL || (! $o->isStructural($value))))
@@ -22,15 +23,7 @@
 				@endif
 			@endforeach
 		</div>
-	</div>
 
-	<div class="col-12 col-sm-6 col-lg-4">
+		@include('components.attribute.widget.options')
-		@if($o->is_rdn)
-			<span class="btn btn-sm btn-outline-focus mt-3 mb-3"><i class="fas fa-fw fa-exchange"></i> @lang('Rename')</span>
-		@elseif($edit && $o->can_addvalues)
-			<div class="p-0 m-0 addable d-none" id="{{ $o->name_lc }}">
-				<span class="btn btn-sm btn-outline-primary mt-3 mb-3"><i class="fas fa-fw fa-plus"></i> @lang('Add Value')</span>
-			</div>
-		@endif
 	</div>
 </div>

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

@@ -0,0 +1,34 @@
+@if($o->is_rdn)
+	<span class="btn btn-sm btn-outline-focus mt-3"><i class="fas fa-fw fa-exchange"></i> @lang('Rename')</span>
+@elseif($edit && $o->can_addvalues)
+	<div class="p-0 m-0">
+		<span class="btn btn-sm btn-outline-primary mt-3 addable @if(! $new)d-none @endif" id="{{ $o->name_lc }}"><i class="fas fa-fw fa-plus"></i> @lang('Add Value')</span>
+		@if($new)
+			<script type="text/javascript">
+				$(document).ready(function() {
+					// Create a new entry when Add Value clicked
+					$('#{{ $o->name_lc }}.addable').click(function (item) {
+						var cln = $(this).parent().parent().find('input:last').clone();
+						cln.val('').attr('placeholder', '[@lang('NEW')]');
+						cln.appendTo('#' + item.currentTarget.id)
+					});
+				});
+			</script>
+		@endif
+	</div>
+@endif
+
+@section('page-scripts')
+	@if(($edit && $o->can_addvalues))
+		<script type="text/javascript">
+			$(document).ready(function() {
+				// Create a new entry when Add Value clicked
+				$('#{{ $o->name_lc }}.addable').click(function (item) {
+					var cln = $(this).parent().parent().find('input:last').clone();
+					cln.val('').attr('placeholder', '[@lang('NEW')]');
+					cln.appendTo('#' + item.currentTarget.id)
+				});
+			});
+		</script>
+	@endif
+@append

resources/views/frames/dn.blade.php

@@ -49,6 +49,7 @@
 		</div>
 	@endif
 
+	<!-- @todo If we are redirected here, check old() and add back any attributes that were in the original submission -->
 	@if($errors->any())
 		<div class="alert alert-danger">
 			<h4 class="alert-heading"><i class="fas fa-fw fa-thumbs-down"></i> Error?</h4>
@@ -75,38 +76,48 @@
 				<div class="tab-content">
 					<!-- All Attributes -->
 					<div class="tab-pane active" id="attributes" role="tabpanel">
-						<form id="form-entry" method="POST" class="needs-validation" action="{{ url('entry/update') }}" novalidate>
+						<form id="dn-edit" method="POST" class="needs-validation" action="{{ url('entry/update/pending') }}" novalidate>
 							@csrf
 
 							<input type="hidden" name="dn" value="{{ $o->getDNSecure() }}">
 
-							<div class="row">
-								<div class="col-12 offset-lg-2 col-lg-8">
-									<table class="table">
 							@foreach ($o->getVisibleAttributes() as $ao)
-											<tr class="bg-light text-dark small">
+								<x-attribute-type :edit="true" :o="$ao"/>
-												<th class="w-25">
-													<abbr title="{{ $ao->description }}">{{ $ao->name }}</abbr>
-													<!-- Attribute Hints -->
-													<span class="float-end">
-														@foreach($ao->hints as $name => $description)
-															@if ($loop->index),@endif
-															<abbr title="{{ $description }}">{{ $name }}</abbr>
 							@endforeach
-													</span>
+
-												</th>
+							<div id="newattrs"></div>
-											</tr>
+
-											<tr>
+							<!-- Add new attributes -->
-												<td class="ps-5">
+							<div class="row">
-													<x-attribute :edit="true" :o="$ao"/>
+								<div class="col-12 col-sm-1 col-md-2"></div>
-												</td>
+								<div class="col-12 col-sm-10 col-md-8">
-											</tr>
+									<div class="d-none" id="newattr-select">
-										@endforeach
+
-									</table>
+									@if($o->getMissingAttributes()->count())
+										<div class="row">
+											<div class="col-12 bg-dark text-light p-2">
+												<i class="fas fa-plus-circle"></i> Add New Attribute
 											</div>
 										</div>
 
-							<div class="row d-none">
+										<div class="row">
+											<div class="col-12 pt-2">
+												<label for="newattr" class="form-label">Select from...</label>
+												<select class="form-select" id="newattr">
+													<option value="">&nbsp;</option>
+													@foreach ($o->getMissingAttributes() as $ao)
+														<option value="{{ $ao->name_lc }}">{{ $ao->name }}</option>
+													@endforeach
+												</select>
+											</div>
+										</div>
+									@endif
+									</div>
+								</div>
+								<div class="col-2"></div>
+							</div>
+
+							<div class="row d-none pt-3">
 								<div class="col-12 offset-sm-2 col-sm-4 col-lg-2">
 									<span id="form-reset" class="btn btn-outline-danger">@lang('Reset')</span>
 									<span id="form-submit" class="btn btn-success">@lang('Update')</span>
@@ -140,12 +151,15 @@
 					<!-- Debug -->
 					<div class="tab-pane" id="debug" role="tabpanel">
 						<div class="row">
-							<div class="col-6">
+							<div class="col-4">
 								@dump($o)
 							</div>
-							<div class="col-6">
+							<div class="col-4">
 								@dump($o->getAttributes())
 							</div>
+							<div class="col-4">
+								@dump(['available'=>$o->getAvailableAttributes()->pluck('name'),'missing'=>$o->getMissingAttributes()->pluck('name')])
+							</div>
 						</div>
 					</div>
 				</div>
@@ -167,22 +181,43 @@
 			$('.row.d-none').removeClass('d-none');
 			$('.addable.d-none').removeClass('d-none');
 			$('.deletable.d-none').removeClass('d-none');
+
+			@if($o->getMissingAttributes()->count())
+				$('#newattr-select.d-none').removeClass('d-none');
+			@endif
 		}
 
 		$(document).ready(function() {
-			$('#reset').click(function() {
+			$('#form-reset').click(function() {
-				$('#form-entry')[0].reset();
+				$('#dn-edit')[0].reset();
 			})
 
 			$('#form-submit').click(function() {
-				$('#form-entry')[0].submit();
+				$('#dn-edit')[0].submit();
 			})
 
-			// Create a new entry when Add Value clicked
+			$('#newattr').on('change',function(item) {
-			$('.addable').click(function(item) {
+				$.ajax({
-				var cln = $(this).parent().parent().find('input:last').clone();
+					type: 'GET',
-				cln.val('').attr('placeholder','[@lang('NEW')]');
+					beforeSend: function() {
-				cln.appendTo('#'+item.currentTarget.id)
+					},
+					success: function(data) {
+						$('#newattrs').append(data);
+					},
+					error: function(e) {
+						if (e.status != 412)
+							alert('That didnt work? Please try again....');
+					},
+					url: '{{ url('entry/newattr') }}/'+item.target.value,
+					cache: false
+				})
+
+				// Remove the option from the list
+				$(this).find('[value="'+item.target.value+'"]').remove()
+
+				// If there are no more options
+				if ($(this).find("option").length === 1)
+					$('#newattr-select').remove();
 			});
 
 			$('button[id=entry-edit]').on('click',function(item) {

resources/views/frames/update.blade.php

@@ -0,0 +1,111 @@
+@extends('dn')
+
+@section('page_title')
+	<table class="table table-borderless">
+		<tr>
+			<td class="{{ ($x=Arr::get($o->getAttributes(),'jpegphoto')) ? 'border' : '' }}" rowspan="2">{!! $x ? $x->render() : sprintf('<div class="page-title-icon f32"><i class="%s"></i></div>',$o->icon() ?? "fas fa-info") !!}</td>
+			<td class="text-end align-text-top p-0 {{ $x ? 'ps-5' : 'pt-2' }}"><strong>{{ $dn }}</strong></td>
+		</tr>
+		<tr>
+			<td class="line-height-1" style="font-size: 55%;vertical-align: bottom;" colspan="2">
+				<table>
+					<tr>
+						<td class="p-1 m-1">Created</td>
+						<th class="p-1 m-1">{{ ($x=Arr::get($o->getAttributes(),'createtimestamp')) ? $x->render() : __('Unknown') }} [{{ ($x=Arr::get($o->getAttributes(),'creatorsname')) ? $x->render() : __('Unknown') }}]</th>
+					</tr>
+					<tr>
+						<td class="p-1 m-1">Modified</td>
+						<th class="p-1 m-1">{{ ($x=Arr::get($o->getAttributes(),'modifytimestamp')) ? $x->render() : __('Unknown') }} [{{ ($x=Arr::get($o->getAttributes(),'modifiersname')) ? $x->render() : __('Unknown') }}]</th>
+					</tr>
+					<tr>
+						<td class="p-1 m-1">UUID</td>
+						<th class="p-1 m-1">{{ $o->entryuuid[0] ?? '' }}</th>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
+@endsection
+
+@section('main-content')
+	@if(session()->has('note'))
+		<div class="alert alert-info">
+			<h4 class="alert-heading"><i class="fas fa-fw fa-note-sticky"></i> Note:</h4>
+			<hr>
+			<p>{{ session()->pull('note') }}</p>
+		</div>
+	@endif
+
+	@if(session()->has('success'))
+		<div class="alert alert-success">
+			<h4 class="alert-heading"><i class="fas fa-fw fa-thumbs-up"></i> Success!</h4>
+			<hr>
+			<p>{{ session()->pull('success') }}</p>
+			<ul style="list-style-type: square;">
+				@foreach (session()->pull('updated') as $key => $values)
+					<li>{{ $key }}: {{ join(',',$values) }}</li>
+				@endforeach
+			</ul>
+		</div>
+	@endif
+
+	@if($errors->any())
+		<div class="alert alert-danger">
+			<h4 class="alert-heading"><i class="fas fa-fw fa-thumbs-down"></i> Error?</h4>
+			<hr>
+			<ul style="list-style-type: square;">
+				@foreach ($errors->all() as $error)
+					<li>{{ $error }}</li>
+				@endforeach
+			</ul>
+		</div>
+	@endif
+
+	<div class="main-card mb-3 card">
+		<div class="card-body">
+			<div class="row">
+				<div class="col-12 col-lg-6 col-xl-4 mx-auto pt-3">
+					<form id="dn-edit" method="POST" class="needs-validation" action="{{ url('entry/update/commit') }}" novalidate>
+						@csrf
+
+						<input type="hidden" name="dn" value="{{ $o->getDNSecure() }}">
+
+						<div class="card-title"><h3>@lang('Do you want to make the following changes?')</h3></div>
+						<table class="table table-bordered table-striped">
+							<thead>
+							<tr>
+								<th>Attribute</th>
+								<th>OLD</th>
+								<th>NEW</th>
+							</tr>
+							</thead>
+
+							<tbody>
+							@foreach ($o->getDirty() as $key => $value)
+								<tr>
+									<th rowspan="{{ $x=max(count($value),count(Arr::get($o->getOriginal(),$key,[])))}}">{{ $key }}</th>
+									@for($xx=0;$xx<$x;$xx++)
+										@if($xx)
+											</tr><tr>
+										@endif
+
+										<td>{{ Arr::get(Arr::get($o->getOriginal(),$key,['['.strtoupper(__('New Value')).']']),$xx) }}</td>
+										<td>{{ $y=Arr::get($value,$xx) }}<input type="hidden" name="{{ $key }}[]" value="{{ $y }}"></td>
+									@endfor
+								</tr>
+							@endforeach
+							</tbody>
+						</table>
+					</form>
+				</div>
+
+				<div class="row pt-3">
+					<div class="col-12 offset-sm-2 col-sm-4 col-lg-2 mx-auto">
+						<span id="form-reset" class="btn btn-outline-danger">@lang('Reset')</span>
+						<span id="form-submit" class="btn btn-success">@lang('Update')</span>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+@endsection

routes/web.php

@@ -39,4 +39,6 @@ Route::group(['prefix'=>'user'],function() {
 	Route::get('image',[HomeController::class,'user_image']);
 });
 
-Route::post('entry/update',[HomeController::class,'entry_update']);
+Route::post('entry/update/commit',[HomeController::class,'entry_update']);
+Route::post('entry/update/pending',[HomeController::class,'entry_pending_update']);
+Route::get('entry/newattr/{id}',[HomeController::class,'entry_newattr']);