From 8f39603f9f7a6e6b3a260960e81bf12f89aede81 Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Sun, 6 Apr 2025 14:59:40 +1000
Subject: [PATCH] Improved determination of attribute object being dirty,
 improved detection of blank input and processing

---
 app/Classes/LDAP/Attribute.php               | 7 +++----
 app/Http/Controllers/HomeController.php      | 4 ++--
 resources/views/components/updated.blade.php | 2 +-
 resources/views/update.blade.php             | 8 ++++++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/Classes/LDAP/Attribute.php b/app/Classes/LDAP/Attribute.php
index 810cea85..82c22ef9 100644
--- a/app/Classes/LDAP/Attribute.php
+++ b/app/Classes/LDAP/Attribute.php
@@ -253,10 +253,9 @@ class Attribute implements \Countable, \ArrayAccess
 	 */
 	public function isDirty(): bool
 	{
-		return (($a=$this->values_old->dot())->keys()->count() !== ($b=$this->values->dot())->keys()->count())
-			|| ($a->values()->count() !== $b->values()->count())
-			|| ($a->keys()->diff($b->keys())->count() !== 0)
-			|| ($a->values()->diff($b->values())->count() !== 0);
+		return (($a=$this->values_old->dot()->filter())->keys()->count() !== ($b=$this->values->dot()->filter())->keys()->count())
+			|| ($a->count() !== $b->count())
+			|| ($a->diff($b)->count() !== 0);
 	}
 
 	/**
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index a5da0265..d9b0ae16 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -349,7 +349,7 @@ class HomeController extends Controller
 
 		return Redirect::to('/')
 			->withInput()
-			->with('updated',collect($dirty)->map(fn($key,$item)=>$o->getObject($item)));
+			->with('updated',collect($dirty)->map(fn($item,$key)=>$o->getObject(collect(explode(';',$key))->first())));
 	}
 
 	/**
@@ -376,7 +376,7 @@ class HomeController extends Controller
 		// If we are rendering a DN, rebuild our object
 		$o = config('server')->fetch($key['dn']);
 
-		foreach (collect(old())->except(['key','step','_token','userpassword_hash']) as $attr => $value)
+		foreach (collect(old())->except(['key','dn','step','_token','userpassword_hash']) as $attr => $value)
 			$o->{$attr} = $value;
 
 		return match ($key['cmd']) {
diff --git a/resources/views/components/updated.blade.php b/resources/views/components/updated.blade.php
index a75784c3..86c770fa 100644
--- a/resources/views/components/updated.blade.php
+++ b/resources/views/components/updated.blade.php
@@ -5,7 +5,7 @@
 		<p>{{ __('Entry updated') }}</p>
 		<ul style="list-style-type: square;">
 			@foreach (session()->pull('updated') as $key => $o)
-				<li><abbr title="{{ $o->description }}">{{ $o->name }}</abbr>: {{ $o->values->map(fn($item,$key)=>$o->render_item_new($key))->join(',') }}</li>
+				<li><abbr title="{{ $o->description }}">{{ $o->name }}</abbr>: {{ $o->values->dot()->filter()->join(',') }}</li>
 			@endforeach
 		</ul>
 	</div>
diff --git a/resources/views/update.blade.php b/resources/views/update.blade.php
index 2c480d8e..f3761aad 100644
--- a/resources/views/update.blade.php
+++ b/resources/views/update.blade.php
@@ -50,8 +50,12 @@
 											{{ $dotkey }}
 										</th>
 
-										<td>{{ (($r=$oo->render_item_old($dotkey)) !== NULL) ? $r : '['.strtoupper(__('New Value')).']' }}</td>
-										<td>{{ (($r=$oo->render_item_new($dotkey)) !== NULL) ? $r : '['.strtoupper(__('Deleted')).']' }}<input type="hidden" name="{{ $key }}[{{ collect(explode('.',$dotkey))->first() }}][]" value="{{ Arr::get($oo,$dotkey) }}"></td>
+										@if((! Arr::get($oo->values_old->dot(),$dotkey)) && (! Arr::get($oo->values->dot(),$dotkey)))
+											<td colspan="2" class="text-center">@lang('Ignoring blank value')</td>
+										@else
+											<td>{{ (($r=$oo->render_item_old($dotkey)) !== NULL) ? $r : '['.strtoupper(__('New Value')).']' }}</td>
+											<td>{{ (($r=$oo->render_item_new($dotkey)) !== NULL) ? $r : '['.strtoupper(__('Deleted')).']' }}<input type="hidden" name="{{ $key }}[{{ collect(explode('.',$dotkey))->first() }}][]" value="{{ Arr::get($oo,$dotkey) }}"></td>
+										@endif
 									@endforeach
 								</tr>
 							@endforeach