Release v2.2.1

README.md

@@ -48,13 +48,17 @@ Entry Editing:
   - [ ] JpegPhoto Create/Delete
   - [ ] Binary attribute upload
   - [ ] If removing an objectClass, remove all attributes that only that objectclass provided
+  - [ ] Move an entry
+  - [ ] Group membership selection
+  - [ ] Attribute tag creation
 
 Templates Engine
-  - [ ] Present SELECT lists when an attribute is marked as `type=select`
   - [ ] Enforcing attribute uniqueness
 
 Raise a [feature request](https://github.com/leenooks/phpLDAPadmin/issues/new) if there is a capability that you would like to see added to PLA.
 
+Other items [under consideration](https://github.com/leenooks/phpLDAPadmin/issues?q=state%3Aopen%20label%3Aenhancement)
+
 ## Support is known for these LDAP servers:
 - [X] OpenLDAP
 - [X] OpenDJ

app/Classes/LDAP/Attribute.php

@@ -172,6 +172,8 @@ class Attribute implements \Countable, \ArrayAccess
 			'required_by' => $this->schema?->required_by_object_classes ?: collect(),
 			// Used in Object Classes
 			'used_in' => $this->schema?->used_in_object_classes ?: collect(),
+			// For single value attributes
+			'value' => $this->schema?->is_single_value ? $this->values->first() : NULL,
 			// The current attribute values
 			'values' => ($this->no_attr_tags || $this->is_internal) ? $this->tagValues() : $this->_values,
 			// The original attribute values

app/Http/Controllers/AjaxController.php

@@ -38,7 +38,7 @@ class AjaxController extends Controller
 	 */
 	public function children(Request $request): Collection
 	{
-		$dn = Crypt::decryptString($request->query('_key'));
+		$dn = Crypt::decryptString($request->post('_key'));
 
 		// Sometimes our key has a command, so we'll ignore it
 		if (str_starts_with($dn,'*') && ($x=strpos($dn,'|')))
@@ -57,13 +57,18 @@ class AjaxController extends Controller
 					'tooltip'=>$item->getDn(),
 				])
 			->prepend(
-				[
-					'title'=>sprintf('[%s]',__('Create Entry')),
-					'item'=>Crypt::encryptString(sprintf('*%s|%s','create',$dn)),
-					'lazy'=>FALSE,
-					'icon'=>'fas fa-fw fa-square-plus text-warning',
-					'tooltip'=>__('Create new LDAP item here'),
-				]);
+				$request->create
+					? [
+						'title'=>sprintf('[%s]',__('Create Entry')),
+						'item'=>Crypt::encryptString(sprintf('*%s|%s','create',$dn)),
+						'lazy'=>FALSE,
+						'icon'=>'fas fa-fw fa-square-plus text-warning',
+						'tooltip'=>__('Create new LDAP item here'),
+					]
+					: []
+			)
+			->filter()
+			->values();
 	}
 
 	public function schema_view(Request $request)

app/Http/Controllers/HomeController.php

@@ -29,7 +29,7 @@ class HomeController extends Controller
 {
 	private const LOGKEY = 'CHc';
 
-	private const INTERNAL_POST = ['_auto_value','_key','_rdn','_rdn_value','_step','_template','_token','_userpassword_hash'];
+	private const INTERNAL_POST = ['_auto_value','_key','_rdn','_rdn_new','_rdn_value','_step','_template','_token','_userpassword_hash'];
 
 	/**
 	 * Create a new object in the LDAP server
@@ -206,7 +206,7 @@ class HomeController extends Controller
 		}
 
 		return Redirect::to('/')
-			->with('success',[sprintf('%s: %s',__('Deleted'),$dn)]);
+			->with('success',sprintf('%s: %s',__('Deleted'),$dn));
 	}
 
 	public function entry_export(Request $request,string $id): \Illuminate\View\View
@@ -298,7 +298,7 @@ class HomeController extends Controller
 				$request->get('_userpassword_hash'));
 
 		if (! $o->getDirty())
-			return back()
+			return Redirect::back()
 				->withInput()
 				->with('note',__('No attributes changed'));
 
@@ -307,6 +307,31 @@ class HomeController extends Controller
 			->with('o',$o);
 	}
 
+	public function entry_rename(Request $request): \Illuminate\Http\RedirectResponse|\Illuminate\View\View
+	{
+		$from_dn = Crypt::decryptString($request->post('dn'));
+		Log::info(sprintf('%s:Renaming [%s] to [%s]',self::LOGKEY,$from_dn,$request->post('_rdn_new')));
+
+		$o = config('server')->fetch($from_dn);
+
+		if (! $o)
+			return Redirect::back()
+				->withInput()
+				->with('note',__('DN doesnt exist'));
+
+		try {
+			$o->rename($request->post('_rdn_new'));
+
+		} catch (\Exception $e) {
+			return Redirect::to('/')
+				->with('failed',$e->getMessage());
+		}
+
+		return Redirect::to('/')
+			->withInput(['_key'=>Crypt::encryptString('*dn|'.$o->getDN())])
+			->with('success',sprintf('%s: %s',__('Entry renamed'),$from_dn));
+	}
+
 	/**
 	 * Update a DN entry
 	 *
@@ -326,7 +351,7 @@ class HomeController extends Controller
 			$o->{$key} = array_filter($value);
 
 		if (! $dirty=$o->getDirty())
-			return back()
+			return Redirect::back()
 				->withInput()
 				->with('note',__('No attributes changed'));
 
@@ -412,7 +437,7 @@ class HomeController extends Controller
 				->with('page_actions',collect([
 					'copy'=>FALSE,
 					'create'=>($x=($o->getObjects()->except('entryuuid')->count() > 0)),
-					'delete'=>$x,
+					'delete'=>(! is_null($xx=$o->getObject('hassubordinates')->value)) && ($xx === 'FALSE'),
 					'edit'=>$x,
 					'export'=>$x,
 				])),
@@ -505,8 +530,8 @@ class HomeController extends Controller
 		// Setup
 		$cmd = NULL;
 		$dn = NULL;
-		$key = $request->get('_key',old('_key'))
-			? Crypt::decryptString($request->get('_key',old('_key')))
+		$key = ($x=$request->get('_key',old('_key')))
+			? Crypt::decryptString($x)
 			: NULL;
 
 		// Determine if our key has a command
@@ -518,9 +543,9 @@ class HomeController extends Controller
 				$dn = ($m[2] !== '_NOP') ? $m[2] : NULL;
 			}
 
-		} elseif (old('dn',$request->get('_key'))) {
+		} elseif ($x=old('dn',$request->get('_key'))) {
 			$cmd = 'dn';
-			$dn = Crypt::decryptString(old('dn',$request->get('_key')));
+			$dn = Crypt::decryptString($x);
 		}
 
 		return ['cmd'=>$cmd,'dn'=>$dn];

public/VERSION

@@ -1 +1 @@
-v2.2.0-dev
+v2.2.1-rel

public/js/custom.js

@@ -59,7 +59,7 @@ $(document).ready(function() {
 	if (typeof basedn !== 'undefined') {
 		sources = basedn;
 	} else {
-		sources = { url: '/ajax/bases' };
+		sources = { method: 'POST', url: '/ajax/bases' };
 	}
 
 	// Attach the fancytree widget to an existing <div id="tree"> element
@@ -95,8 +95,9 @@ $(document).ready(function() {
 		source: sources,
 		lazyLoad: function(event,data) {
 			data.result = {
+				method: 'POST',
 				url: '/ajax/children',
-				data: {_key: data.node.data.item,depth: 1}
+				data: {_key: data.node.data.item,create: true}
 			};
 
 			expandChildren(data.tree.rootNode);

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

@@ -46,7 +46,7 @@
 							</span>
 						@endif
 
-						@if((! $o->no_attr_tags) && (! $o->is_rdn))
+						@if((! $o->no_attr_tags) && (! $o->is_rdn) && (! $template))
 							<span data-bs-toggle="tab" href="#langtag-{{ $o->name_lc }}-+" class="bg-primary-subtle btn btn-outline-primary border-primary addable d-none">
 								<i class="fas fa-fw fa-plus text-dark" data-bs-toggle="tooltip" data-bs-custom-class="custom-tooltip" aria-label="Add Lang Tag" data-bs-original-title="Add Lang Tag"></i>
 							</span>

resources/views/components/attribute.blade.php

@@ -1,5 +1,5 @@
 <!-- $o=Attribute::class -->
-<x-attribute.layout :edit="$edit=($edit ?? FALSE)" :new="$new=($new ?? FALSE)" :o="$o">
+<x-attribute.layout :edit="$edit=($edit ?? FALSE)" :new="$new=($new ?? FALSE)" :o="$o" :template="$template">
 	<div class="col-12">
 		<div class="tab-content">
 			@foreach($o->langtags as $langtag)
@@ -22,7 +22,7 @@
 								name="{{ $o->name_lc }}[{{ $langtag }}][]"
 								value="{{ $value ?: ($av ?? '') }}"
 								placeholder="{{ ! is_null($x=$tv->get($loop->index)) ? $x : '['.__('NEW').']' }}"
-								readonly
+								@readonly(! $edit)
 								@disabled($o->isDynamic())>
 
 							<div class="invalid-feedback pb-2">

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

@@ -4,7 +4,7 @@
 			{{ $slot }}
 		</attribute>
 
-		<x-attribute.widget.options :o="$o" :edit="$edit" :new="$new"/>
+		<x-attribute.widget.options :o="$o" :edit="$edit" :new="$new" :template="$template ?? FALSE"/>
 	</div>
 </div>
 

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

@@ -6,7 +6,7 @@
 @php($clone=FALSE)
 <span class="p-0 m-0">
 	@if($o->is_rdn)
-		<button class="btn btn-sm btn-outline-focus mt-3" disabled><i class="fas fa-fw fa-exchange"></i> @lang('Rename')</button>
+		<span id="entry-rename" class="btn btn-sm btn-outline-focus mt-3" data-bs-toggle="modal" data-bs-target="#page-modal"><i class="fas fa-fw fa-exchange"></i> @lang('Rename')</span>
 	@elseif($edit && $o->can_addvalues)
 		@switch(get_class($o))
 			@case(Certificate::class)
@@ -26,7 +26,7 @@
 				@break
 
 			@case(ObjectClass::class)
-				<span type="button" @class(['btn','btn-sm','btn-outline-primary','mt-3','addable','d-none'=>(! $new)]) data-bs-toggle="modal" data-bs-target="#new_objectclass-modal"><i class="fas fa-fw fa-plus"></i> @lang('Add Objectclass')</span>
+				<span @class(['btn','btn-sm','btn-outline-primary','mt-3','addable','d-none'=>(! $new)]) data-bs-toggle="modal" data-bs-target="#new_objectclass-modal"><i class="fas fa-fw fa-plus"></i> @lang('Add Objectclass')</span>
 
 				<!-- NEW OBJECT CLASS -->
 				<div class="modal fade" id="new_objectclass-modal" tabindex="-1" aria-labelledby="new_objectclass-label" aria-hidden="true" data-bs-backdrop="static">
@@ -255,18 +255,18 @@
 			@default
 				@if($o->isDynamic()) @break @endif
 				@php($clone=TRUE)
-				@if($o->values_old->count())
-					<span @class(['btn','btn-sm','btn-outline-primary','mt-3','addable','d-none'=>(! $new)]) data-attribute="{{ $o->name }}" id="{{ $o->name_lc }}-addnew"><i class="fas fa-fw fa-plus"></i> @lang('Add Value')</span>
+				@if($o->values_old->count() && (! $template))
+					<span @class(['btn','btn-sm','btn-outline-primary','mt-3','addable','d-none'=>(! $new)]) data-attribute="{{ $o->name_lc }}" id="{{ $o->name_lc }}-addnew"><i class="fas fa-fw fa-plus"></i> @lang('Add Value')</span>
 				@endif
 
 				@section('page-scripts')
-					@if($clone && $edit && $o->can_addvalues)
+					@if((! $template) && $clone && $edit && $o->can_addvalues)
 						<script type="text/javascript">
 							$(document).ready(function() {
 								// Create a new entry when Add Value clicked
-								$('#{{ $o->name_lc }}-addnew.addable').click(function(item) {
+								$('form#dn-edit #{{ $o->name_lc }}-addnew.addable').click(function(item) {
 									var attribute = $(this).data('attribute');
-									var active = $('attribute[id='+attribute+']').find('.tab-pane.active');
+									var active = $('#template-default attribute[id='+attribute+']');
 
 									active.find('input:last')
 										.clone()

resources/views/components/success.blade.php

@@ -1,11 +1,5 @@
 @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>
-		<ul class="square">
-			@foreach(session()->get('success') as $item)
-				<li>{{ $item }}</li>
-			@endforeach
-		</ul>
+	<div class="alert alert-success p-2">
+		<p class="m-0"><i class="fas fa-fw fa-thumbs-up"></i> {{ session()->pull('success') }}</p>
 	</div>
 @endif

resources/views/frames/dn.blade.php

@@ -9,30 +9,29 @@
 		<div class="col">
 			<div class="action-buttons float-end">
 				<ul class="nav">
-					@if(isset($page_actions) && $page_actions->get('create'))
+					@if($page_actions->get('create'))
 						<li>
 							<button class="btn btn-outline-dark p-1 m-1" id="entry-create" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@lang('Create Child Entry')"><i class="fas fa-fw fa-diagram-project fs-5"></i></button>
 						</li>
 					@endif
-					@if(isset($page_actions) && $page_actions->get('export'))
+					@if($page_actions->get('export'))
 						<li>
 							<span id="entry-export" data-bs-toggle="modal" data-bs-target="#page-modal">
 								<button class="btn btn-outline-dark p-1 m-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@lang('Export')"><i class="fas fa-fw fa-download fs-5"></i></button>
 							</span>
 						</li>
 					@endif
-					@if(isset($page_actions) && $page_actions->get('copy'))
+					@if($page_actions->get('copy'))
 						<li>
 							<button class="btn btn-outline-dark p-1 m-1" id="entry-copy-move" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@lang('Copy/Move')" disabled><i class="fas fa-fw fa-copy fs-5"></i></button>
 						</li>
 					@endif
-					@if(isset($page_actions) && $page_actions->get('edit'))
+					@if($page_actions->get('edit'))
 						<li>
 							<button class="btn btn-outline-dark p-1 m-1" id="entry-edit" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@lang('Edit Entry')"><i class="fas fa-fw fa-edit fs-5"></i></button>
 						</li>
 					@endif
-					<!-- @todo Dont offer the delete button for an entry with children -->
-					@if(isset($page_actions) && $page_actions->get('delete'))
+					@if($page_actions->get('delete'))
 						<li>
 							<span id="entry-delete" data-bs-toggle="modal" data-bs-target="#page-modal">
 								<button class="btn btn-outline-danger p-1 m-1" data-bs-custom-class="custom-tooltip-danger" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@lang('Delete Entry')"><i class="fas fa-fw fa-trash-can fs-5"></i></button>
@@ -52,9 +51,10 @@
 		</div>
 	@endif
 
+	<x-success/>
+	<x-updated/>
 	<x-note/>
 	<x-error/>
-	<x-updated/>
 	<x-failed/>
 @endsection
 
@@ -282,6 +282,25 @@
 						})
 						break;
 
+					case 'entry-rename':
+						$.ajax({
+							method: 'GET',
+							url: '{{ url('modal/rename') }}/'+dn,
+							dataType: 'html',
+							cache: false,
+							beforeSend: function() {
+								that.empty().append('<span class="p-3"><i class="fas fa-3x fa-spinner fa-pulse"></i></span>');
+							},
+							success: function(data) {
+								that.empty().html(data);
+							},
+							error: function(e) {
+								if (e.status !== 412)
+									alert('That didnt work? Please try again....');
+							},
+						});
+						break;
+
 					default:
 						switch ($(item.relatedTarget).attr('name')) {
 							case 'entry-userpassword-check':

resources/views/home.blade.php

@@ -2,6 +2,7 @@
 
 @section('main-content')
 	<x-success/>
+	<x-failed/>
 
 	<div class="card card-solid mb-3">
 		<div class="card-body">

resources/views/modals/entry-rename.blade.php

@@ -0,0 +1,40 @@
+<div class="modal-header bg-dark text-white">
+	<h1 class="modal-title fs-5">
+		<strong>@lang('Rename') <strong>{{ $x=Crypt::decryptString($dn) }}</strong>
+	</h1>
+</div>
+
+<form id="entry-rename-form" method="POST" action="{{ url('entry/rename') }}">
+	<div class="modal-body">
+		@csrf
+		<input type="hidden" name="dn" value="{{ $dn }}">
+
+		<div class="row">
+			<div class="col-12">
+				<label for="rdn" class="form-label">@lang('New RDN')</label>
+				<div class="input-group mb-3">
+					<input type="text" id="rdn" name="_rdn_new" class="form-control w-25" placeholder="{{ $rdn=collect(explode(',',$x))->first() }}" value="{{ $rdn }}">
+					<span class="input-group-text" id="label">{{ collect(explode(',',$x))->skip(1)->join(',') }}</span>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<div class="modal-footer">
+		<x-modal.close/>
+		<button id="entry-rename" type="submit" class="btn btn-sm btn-primary" disabled>@lang('Rename')</button>
+	</div>
+</form>
+
+<script type="text/javascript">
+	$(document).ready(function() {
+		var rdn = '{{ $rdn }}';
+
+		// Complete the RDN
+		$('#rdn').on('input',function(item) {
+			rdn = $(this).val();
+
+			$('button[id=entry-rename]').attr('disabled',! rdn.includes('='));
+		})
+	});
+</script>

routes/web.php

@@ -49,6 +49,7 @@ Route::controller(HomeController::class)->group(function() {
 		Route::post('entry/password/check/','entry_password_check');
 		Route::post('entry/attr/add/{id}','entry_attr_add');
 		Route::post('entry/objectclass/add','entry_objectclass_add');
+		Route::post('entry/rename','entry_rename');
 		Route::post('entry/update/commit','entry_update');
 		Route::post('entry/update/pending','entry_pending_update');
 
@@ -56,6 +57,7 @@ Route::controller(HomeController::class)->group(function() {
 
 		Route::view('modal/delete/{dn}','modals.entry-delete');
 		Route::view('modal/export/{dn}','modals.entry-export');
+		Route::view('modal/rename/{dn}','modals.entry-rename');
 		Route::view('modal/userpassword-check/{dn}','modals.entry-userpassword-check');
 	});
 });
@@ -63,8 +65,8 @@ Route::controller(HomeController::class)->group(function() {
 Route::controller(AjaxController::class)
 	->prefix('ajax')
 	->group(function() {
-		Route::get('bases','bases');
-		Route::get('children','children');
+		Route::post('bases','bases');
+		Route::post('children','children');
 		Route::post('schema/view','schema_view');
 		Route::post('schema/objectclass/attrs/{id}','schema_objectclass_attrs');
 	});

tests/server/openldap/data/06-simpsons.ldif

@@ -99,10 +99,7 @@ jpegphoto:: /9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkS
  Q05bKyt9PtEtrWPZEuSBkkkk5JJPJJJJJPJJoopOc5xu43SZGyMWYLDuXRRRRTU9f//Z
 l: Springfield
 mail: bart.simpson@simpsons.example.com
-mailHost: simpsons.host
-mailRoutingAddress: bsimpson@simpsons.example.com
 o: The Simpsons
-objectclass: inetLocalMailRecipient
 objectclass: inetOrgPerson
 objectclass: posixAccount
 objectclass: top