Framework and javascript dependancies update

Closes #345

.env.example

@@ -14,3 +14,4 @@ LDAP_HOST=
 LDAP_USERNAME=
 LDAP_PASSWORD=
 LDAP_CACHE=false
+LDAP_ALERT_ROOTDN=true

.gitea/workflows/build_docker.yaml

@@ -3,7 +3,7 @@ run-name: ${{ gitea.actor }} Building Docker Image 🐳
 on: [push]
 env:
   DOCKER_HOST: tcp://127.0.0.1:2375
-  ASSETS: 3fcb8707
+  ASSETS: 2d732e5
 
 jobs:
   test:

README.md

@@ -27,38 +27,29 @@ Take a look at the [Docker Container](https://github.com/leenooks/phpLDAPadmin/w
 >
 > Open an issue (details below) with enough information for me to be able to recreate the problem. An `LDIF` will be invaluable if it is not handling data correctly.
 
-## Version 2 Progress
+## Templates
+Starting with v2.2, PLA reintroduces the template engine. Each point release going forward will improve the template 
+functionality. Check [releases](releases) for details.
 
-The update to v2 is progressing well - here is a list of work to do and done:
+Templates in v2 are in JSON format (in v1 they were XML format). If you want to create your own templates you can use 
+the [example.json](blob/master/templates/example.json) template as a guide. Place your custom templates in a subdirectory
+under `templates`, eg: `templates/custom`, and they wont be overwritten by an update.
 
-- [X] Creating new LDAP entries
+## Outstanding items
-- [X] Delete existing LDAP entries
+Compare to v1.x, there are a couple of outstanding items to address
-- [X] Updating existing LDAP Entries
+
-  - [X] Password attributes
+Entry Editing:
-    - [X] Support different password hash options
-    - [X] Validate password is correct
   - [ ] JpegPhoto Create/Delete
   - [ ] Binary attribute upload
-  - [X] JpegPhoto Display
+  - [ ] If removing an objectClass, remove all attributes that only that objectclass provided
-  - [X] ObjectClass Add/Remove
-    - [X] Add additional required attributes (for ObjectClass Addition)
-    - [ ] Remove existing required attributes (for ObjectClass Removal)
-  - [X] Add additional values to Attributes that support multiple values
-  - [X] Delete extra values for Attributes that support multiple values
-  - [ ] Delete Attributes
-- [ ] Templates to enable entries to conform to a custom standard
-  - [ ] Autopopulate attribute values
-- [X] Login to LDAP server
-  - [X] Configure login by a specific attribute
-- [X] Logout LDAP server
-- [X] Export entries as an LDAP
-- [X] Import LDIF
-- [X] Schema Browser
-- [X] Searching
-- [ ] Enforcing attribute uniqueness
-- [ ] Is there something missing?
 
-Support is known for these LDAP servers:
+Templates Engine
+  - [ ] Present SELECT lists when an attribute is marked as `type=select`
+  - [ ] Enforcing attribute uniqueness
+
+Raise a [feature request](issues/new) if there is a capability that you would like to see added to PLA.
+
+## Support is known for these LDAP servers:
 - [X] OpenLDAP
 - [X] OpenDJ
 - [ ] Microsoft Active Directory

app/Classes/LDAP/Attribute.php

@@ -7,6 +7,7 @@ use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 
 use App\Classes\LDAP\Schema\AttributeType;
+use App\Classes\Template;
 use App\Exceptions\InvalidUsage;
 use App\Ldap\Entry;
 
@@ -326,10 +327,10 @@ class Attribute implements \Countable, \ArrayAccess
 	 * @param bool $old Use old value
 	 * @param bool $new Enable adding values
 	 * @param bool $updated Has the entry been updated (uses rendering highlights))
-	 * @param string|null $template
+	 * @param Template|null $template
 	 * @return View
 	 */
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE,?string $template=NULL): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE,?Template $template=NULL): View
 	{
 		if ($this->is_internal)
 			// @note Internal attributes cannot be edited

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

@@ -5,7 +5,7 @@ namespace App\Classes\LDAP\Attribute\Binary;
 use Illuminate\Contracts\View\View;
 
 use App\Classes\LDAP\Attribute\Binary;
-use App\Ldap\Entry;
+use App\Classes\Template;
 use App\Traits\MD5Updates;
 
 /**
@@ -15,7 +15,7 @@ final class JpegPhoto extends Binary
 {
 	use MD5Updates;
 
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE,?string $template=NULL): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE,?Template $template=NULL): View
 	{
 		return view('components.attribute.binary.jpegphoto')
 			->with('o',$this)

app/Classes/LDAP/Attribute/CertificateList.php

@@ -2,9 +2,6 @@
 
 namespace App\Classes\LDAP\Attribute;
 
-use Carbon\Carbon;
-use Illuminate\Support\Arr;
-
 use App\Classes\LDAP\Attribute;
 use App\Traits\MD5Updates;
 

app/Classes/LDAP/Attribute/Factory.php

@@ -3,7 +3,6 @@
 namespace App\Classes\LDAP\Attribute;
 
 use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\Log;
 
 use App\Classes\LDAP\Attribute;
 

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

@@ -5,14 +5,14 @@ namespace App\Classes\LDAP\Attribute\Internal;
 use Illuminate\Contracts\View\View;
 
 use App\Classes\LDAP\Attribute\Internal;
-use App\Ldap\Entry;
+use App\Classes\Template;
 
 /**
  * Represents an attribute whose values are timestamps
  */
 final class Timestamp extends Internal
 {
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE,?string $template=NULL): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE,?Template $template=NULL): View
 	{
 		// @note Internal attributes cannot be edited
 		return view('components.attribute.internal.timestamp')

app/Classes/LDAP/Attribute/KrbPrincipalKey.php

@@ -5,7 +5,7 @@ namespace App\Classes\LDAP\Attribute;
 use Illuminate\Contracts\View\View;
 
 use App\Classes\LDAP\Attribute;
-use App\Ldap\Entry;
+use App\Classes\Template;
 use App\Traits\MD5Updates;
 
 /**
@@ -17,7 +17,7 @@ final class KrbPrincipalKey extends Attribute
 
 	protected(set) bool $no_attr_tags = TRUE;
 
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE,?string $template=NULL): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE,?Template $template=NULL): View
 	{
 		return view('components.attribute.krbprincipalkey')
 			->with('o',$this)

app/Classes/LDAP/Attribute/KrbTicketFlags.php

@@ -6,7 +6,7 @@ use Illuminate\Contracts\View\View;
 use Illuminate\Support\Collection;
 
 use App\Classes\LDAP\Attribute;
-use App\Ldap\Entry;
+use App\Classes\Template;
 
 /**
  * Represents an attribute whose value is a Kerberos Ticket Flag
@@ -50,7 +50,7 @@ final class KrbTicketFlags extends Attribute
 		return $helpers;
 	}
 
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE,?string $template=NULL): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE,?Template $template=NULL): View
 	{
 		return view('components.attribute.krbticketflags')
 			->with('o',$this)

app/Classes/LDAP/Attribute/ObjectClass.php

@@ -6,7 +6,7 @@ use Illuminate\Contracts\View\View;
 use Illuminate\Support\Collection;
 
 use App\Classes\LDAP\Attribute;
-use App\Ldap\Entry;
+use App\Classes\Template;
 
 /**
  * Represents an ObjectClass Attribute
@@ -70,7 +70,7 @@ final class ObjectClass extends Attribute
 			->contains($value);
 	}
 
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE,?string $template=NULL): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE,?Template $template=NULL): View
 	{
 		return view('components.attribute.objectclass')
 			->with('o',$this)

app/Classes/LDAP/Attribute/Password.php

@@ -7,7 +7,7 @@ use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 
 use App\Classes\LDAP\Attribute;
-use App\Ldap\Entry;
+use App\Classes\Template;
 use App\Traits\MD5Updates;
 
 /**
@@ -80,7 +80,7 @@ final class Password extends Attribute
 		return ($helpers=static::helpers())->has($id) ? new ($helpers->get($id)) : NULL;
 	}
 
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE,?string $template=NULL): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE,?Template $template=NULL): View
 	{
 		return view('components.attribute.password')
 			->with('o',$this)

app/Classes/LDAP/Attribute/RDN.php

@@ -6,7 +6,7 @@ use Illuminate\Contracts\View\View;
 use Illuminate\Support\Collection;
 
 use App\Classes\LDAP\Attribute;
-use App\Ldap\Entry;
+use App\Classes\Template;
 
 /**
  * Represents the RDN for an Entry
@@ -35,7 +35,7 @@ final class RDN extends Attribute
 		]);
 	}
 
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE,?string $template=NULL): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE,?Template $template=NULL): View
 	{
 		return view('components.attribute.rdn')
 			->with('o',$this);

app/Classes/LDAP/Attribute/Schema.php

@@ -2,12 +2,10 @@
 
 namespace App\Classes\LDAP\Attribute;
 
-use Illuminate\Contracts\View\View;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Cache;
 
 use App\Classes\LDAP\Attribute;
-use App\Ldap\Entry;
 
 /**
  * Represents an attribute whose values are schema related

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

@@ -5,14 +5,14 @@ namespace App\Classes\LDAP\Attribute\Schema;
 use Illuminate\Contracts\View\View;
 
 use App\Classes\LDAP\Attribute\Schema;
-use App\Ldap\Entry;
+use App\Classes\Template;
 
 /**
  * Represents a Generic Schema Attribute
  */
 class Generic extends Schema
 {
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE,?string $template=NULL): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE,?Template $template=NULL): View
 	{
 		// @note Schema attributes cannot be edited
 		return view('components.attribute.schema.generic')

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

@@ -5,7 +5,7 @@ namespace App\Classes\LDAP\Attribute\Schema;
 use Illuminate\Contracts\View\View;
 
 use App\Classes\LDAP\Attribute\Schema;
-use App\Ldap\Entry;
+use App\Classes\Template;
 
 /**
  * Represents a Mechanisms Attribute
@@ -34,7 +34,7 @@ final class Mechanisms extends Schema
 		return parent::_get(config_path('ldap_supported_saslmechanisms.txt'),$string,$key);
 	}
 
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE,?string $template=NULL): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE,?Template $template=NULL): View
 	{
 		// @note Schema attributes cannot be edited
 		return view('components.attribute.schema.mechanisms')

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

@@ -5,7 +5,7 @@ namespace App\Classes\LDAP\Attribute\Schema;
 use Illuminate\Contracts\View\View;
 
 use App\Classes\LDAP\Attribute\Schema;
-use App\Ldap\Entry;
+use App\Classes\Template;
 
 /**
  * Represents an OID Attribute
@@ -35,7 +35,7 @@ final class OID extends Schema
 		return parent::_get(config_path('ldap_supported_oids.txt'),$string,$key);
 	}
 
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE,?string $template=NULL): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE,?Template $template=NULL): View
 	{
 		// @note Schema attributes cannot be edited
 		return view('components.attribute.schema.oid')

app/Classes/Template.php

@@ -3,12 +3,16 @@
 namespace App\Classes;
 
 use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 
 class Template
 {
-	private string $file;
+	private const LOGKEY = 'T--';
+
+	private(set) string $file;
 	private array $template;
 	private(set) bool $invalid = FALSE;
 	private(set) string $reason = '';
@@ -20,6 +24,8 @@ class Template
 		$this->file = $file;
 
 		try {
+			// @todo Load in the proper attribute objects and objectclass objects
+			// @todo Make sure we have a structural objectclass, or make the template invalid
 			$this->template = json_decode($td->get($file),null,512,JSON_OBJECT_AS_ARRAY|JSON_THROW_ON_ERROR);
 
 		} catch (\JsonException $e) {
@@ -47,8 +53,136 @@ class Template
 		return array_key_exists($key,$this->template);
 	}
 
-	public function __toString(): string
+	/**
+	 * Return the onchange JavaScript for attribute
+	 *
+	 * @param string $attribute
+	 * @return Collection
+	 */
+	public function onChange(string $attribute): Collection
 	{
-		return $this->invalid ? '' : Arr::get($this->template,'title','No Template Name');
+		$attr = collect($this->template['attributes'])
+			->filter(fn($item,$key)=>! strcasecmp($key,$attribute))
+			->pop();
+
+		if (! $attr)
+			return collect();
+
+		$result = collect();
+
+		foreach (Arr::get($attr,'onchange',[]) as $item) {
+			list($command,$args) = preg_split('/^=([a-zA-Z]+)\((.+)\)$/',$item,-1,PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
+
+			switch ($command) {
+				case 'autoFill':
+					$result->push($this->autofill($args));
+					break;
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * autoFill - javascript to have one attribute fill the value of another
+	 *
+	 * args: is a literal string, with two parts, delimited by a semi-colon ;
+	 *	+ The first part is the attribute that will be populated
+	 *	+ The second part may contain many fields like %attr|start-end/flags|additionalcontrolchar%
+	 *	  to substitute values read from other fields.
+	 *	  + |start-end is optional, but must be present if the k flag is used
+	 *	  + /flags is optional
+	 *	  + |additionalcontrolchar is optional, and specific to a flag being used
+	 *
+	 *	+ flags may be:
+	 *		T:(?)	Read display text from selection item (drop-down list), otherwise, read the value of the field
+	 *			For fields that aren't selection items, /T shouldn't be used, and the field value will always be read
+	 *		k:(?)	Tokenize:
+	 *			If the "k" flag is not given:
+	 *			+ A |start-end instruction will perform a sub-string operation upon the value of the attr, passing
+	 *				character positions start-end through
+	 *				+ start can be 0 for first character, or any other integer
+	 *				+ end can be 0 for last character, or any other integer for a specific position
+	 *			If the "k" flag is given:
+	 *				+ The string read will be split into fields, using : as a delimiter
+	 *				+ start indicates which field number to pass through
+	 *
+	 *		    If additionalcontrolchar is given, it will be used as delimiter (e.g. this allows for splitting
+	 *			e-mail addresses into domain and domain-local part)
+	 *		l:	Make the result lower case
+	 *		U:	Make the result upper case
+	 *		A:(?)	Remap special characters to their corresponding ASCII value
+	 *
+	 * @note Attributes rendered on the page are lowercase, eg: <attribute id="gidnumber"> for gidNumber
+	 * @note JavaScript generated here depends on js/template.js
+	 * (?) = to test
+	 */
+	private function autofill(string $arg): string
+	{
+		if (! preg_match('/;/',$arg)) {
+			Log::alert(sprintf('%s:Invalid argument given to autofill [%s]',self::LOGKEY,$arg));
+			return '';
+		}
+
+		$result = '';
+
+		// $attr has our attribute to update, $string is the format to use when updating it
+		list($attr,$string) = preg_split('(([^,]+);(.*))',$arg,-1,PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+		$output = $string;
+		//$result .= sprintf("\n// %s\n",$arg);
+
+		$m = [];
+		// MATCH : 0 = highlevel match, 1 = attr, 2 = subst, 3 = mod, 4 = delimiter
+		preg_match_all('/%(\w+)(?:\|([0-9]*-[0-9])+)?(?:\/([klTUA]+))?(?:\|(.)?)?%/U',$string,$m);
+
+		foreach ($m[0] as $index => $null) {
+			$match_attr = strtolower($m[1][$index]);
+			$match_subst = $m[2][$index];
+			$match_mod = $m[3][$index];
+			$match_delim = $m[4][$index];
+
+			$substrarray = [];
+
+			$result .= sprintf("var %s;\n",$match_attr);
+
+			if (str_contains($match_mod,'k')) {
+				preg_match_all('/([0-9]+)/',trim($match_subst),$substrarray);
+
+				$delimiter = ($match_delim === '') ? ' ' : preg_quote($match_delim);
+				$result .= sprintf("   %s = %s.split('%s')[%s];\n",$match_attr,$match_attr,$delimiter,$substrarray[1][0] ?? '0');
+
+			} else {
+				// Work out the start and end chars needed from this value if we have a range specifier
+				preg_match_all('/([0-9]*)-([0-9]+)/',$match_subst,$substrarray);
+				if ((isset($substrarray[1][0]) && $substrarray[1][0]) || (isset($substrarray[2][0]) && $substrarray[2][0])) {
+					$result .= sprintf("%s = get_attribute('%s',%d,%s);\n",
+						$match_attr,$match_attr,
+						$substrarray[1][0] ?? '0',
+						$substrarray[2][0] ?: sprintf('%s.length',$match_attr));
+				} else {
+					$result .= sprintf("%s = get_attribute('%s');\n",$match_attr,$match_attr);
+				}
+			}
+
+			if (str_contains($match_mod,'l'))
+				$result .= sprintf("%s = %s.toLowerCase();\n",$match_attr,$match_attr);
+
+			if (str_contains($match_mod,'U'))
+				$result .= sprintf("%s = %s.toUpperCase();\n",$match_attr,$match_attr);
+
+			if (str_contains($match_mod,'A'))
+				$result .= sprintf("%s = toAscii(%s);\n",$match_attr,$match_attr);
+
+			// For debugging
+			//$result .= sprintf("console.log('%s will return:'+%s);\n",$match_attr,$match_attr);
+
+			// Reformat out output into JS variables
+			$output = preg_replace('/'.preg_quote($m[0][$index],'/').'/','\'+'.$match_attr.'+\'',$output);
+		}
+
+		$result .= sprintf("put_attribute('%s','%s');\n",strtolower($attr),$output);
+		$result .= "\n";
+
+		return $result;
 	}
 }

app/Http/Controllers/AjaxController.php

@@ -29,7 +29,7 @@ class AjaxController extends Controller
 				'lazy'=>TRUE,
 				'icon'=>'fa-fw fas fa-sitemap',
 				'tooltip'=>$item->getDn(),
-			]);
+			])->values();
 	}
 
 	/**
@@ -38,7 +38,7 @@ class AjaxController extends Controller
 	 */
 	public function children(Request $request): Collection
 	{
-		$dn = Crypt::decryptString($request->query('key'));
+		$dn = Crypt::decryptString($request->query('_key'));
 
 		// Sometimes our key has a command, so we'll ignore it
 		if (str_starts_with($dn,'*') && ($x=strpos($dn,'|')))

app/Http/Controllers/Auth/LoginController.php

@@ -8,7 +8,9 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
 
+use App\Exceptions\InvalidUsage;
 use App\Http\Controllers\Controller;
+use App\Ldap\Entry;
 
 class LoginController extends Controller
 {
@@ -51,6 +53,30 @@ class LoginController extends Controller
 		];
 	}
 
+	/**
+	 * When attempt to login
+	 *
+	 * @param Request $request
+	 * @return void
+	 * @throws InvalidUsage
+	 */
+	public function attemptLogin(Request $request)
+	{
+		$attempt = $this->guard()->attempt(
+			$this->credentials($request), $request->boolean('remember')
+		);
+
+		// If the login failed, and PLA is set to use DN login, check if the entry exists.
+		// If the entry doesnt exist, it might be the root DN, which cannot be used to login
+		if ((! $attempt) && $request->dn && config('pla.login.alert_rootdn',TRUE)) {
+			$dn = config('server')->fetch($request->dn);
+			$o = new Entry;
+
+			if (! $dn && $o->getConnection()->getLdapConnection()->errNo() === 32)
+				abort(501,'Authentication set to DN, but the DN doesnt exist');
+		}
+	}
+
 	/**
 	 * We need to delete our encrypted username/password cookies
 	 *

app/Http/Controllers/HomeController.php

@@ -28,6 +28,8 @@ class HomeController extends Controller
 {
 	private const LOGKEY = 'CHc';
 
+	private const INTERNAL_POST = ['_key','_rdn','_rdn_value','_step','_template','_token','_userpassword_hash'];
+
 	/**
 	 * Create a new object in the LDAP server
 	 *
@@ -37,7 +39,7 @@ class HomeController extends Controller
 	 */
 	public function entry_add(EntryAddRequest $request): \Illuminate\View\View
 	{
-		if (! old('step',$request->validated('step')))
+		if (! old('_step',$request->validated('_step')))
 			abort(404);
 
 		$key = $this->request_key($request,collect(old()));
@@ -46,18 +48,12 @@ class HomeController extends Controller
 		$o = new Entry;
 		$o->setRDNBase($key['dn']);
 
-		foreach (collect(old())->except(['_token','key','step','rdn','rdn_value','userpassword_hash']) as $old => $value)
+		foreach (collect(old())->except(self::INTERNAL_POST) as $old => $value)
 			$o->{$old} = array_filter($value);
 
-		if (count($x=collect(old('objectclass',$request->validated('objectclass')))->dot()->filter())) {
+		if (old('_template',$request->validated('template'))) {
-			$o->objectclass = Arr::undot($x);
+			$template = $o->template(old('_template',$request->validated('template')));
 
-			// Also add in our required attributes
-			foreach ($o->getAvailableAttributes()->filter(fn($item)=>$item->is_must) as $ao)
-				$o->{$ao->name} = [Entry::TAG_NOTAG=>''];
-
-		} elseif ($request->validated('template')) {
-			$template = $o->template($request->validated('template'));
 			$o->objectclass = [Entry::TAG_NOTAG=>$template->objectclasses->toArray()];
 
 			foreach ($o->getAvailableAttributes()
@@ -66,9 +62,16 @@ class HomeController extends Controller
 			{
 				$o->{$ao->name} = [Entry::TAG_NOTAG=>''];
 			}
+
+		} elseif (count($x=collect(old('objectclass',$request->validated('objectclass')))->dot()->filter())) {
+			$o->objectclass = Arr::undot($x);
+
+			// Also add in our required attributes
+			foreach ($o->getAvailableAttributes()->filter(fn($item)=>$item->is_must) as $ao)
+				$o->{$ao->name} = [Entry::TAG_NOTAG=>''];
 		}
 
-		$step = $request->step ? $request->step+1 : old('step');
+		$step = $request->get('_step') ? $request->get('_step')+1 : old('_step');
 
 		return view('frame')
 			->with('subframe','create')
@@ -104,6 +107,7 @@ class HomeController extends Controller
 		return $view
 			->with('o',$o)
 			->with('langtag',Entry::TAG_NOTAG)
+			->with('template',NULL)
 			->with('updated',FALSE);
 	}
 
@@ -111,12 +115,12 @@ class HomeController extends Controller
 	{
 		$key = $this->request_key($request,collect(old()));
 
-		$dn = sprintf('%s=%s,%s',$request->rdn,$request->rdn_value,$key['dn']);
+		$dn = sprintf('%s=%s,%s',$request->get('_rdn'),$request->get('_rdn_value'),$key['dn']);
 
 		$o = new Entry;
 		$o->setDn($dn);
 
-		foreach ($request->except(['_token','key','step','rdn','rdn_value','userpassword_hash']) as $key => $value)
+		foreach ($request->except(self::INTERNAL_POST) as $key => $value)
 			$o->{$key} = array_filter($value);
 
 		try {
@@ -212,7 +216,7 @@ class HomeController extends Controller
 	 */
 	public function entry_objectclass_add(Request $request): Collection
 	{
-		$dn = $request->key ? Crypt::decryptString($request->dn) : '';
+		$dn = $request->get('_key') ? Crypt::decryptString($request->dn) : '';
 		$oc = Factory::create($dn,'objectclass',$request->oc);
 
 		$ocs = $oc
@@ -267,7 +271,7 @@ class HomeController extends Controller
 
 		$o = config('server')->fetch($dn);
 
-		foreach ($request->except(['_token','dn','userpassword_hash','userpassword']) as $key => $value)
+		foreach ($request->except(['_token','dn','_userpassword_hash','userpassword']) as $key => $value)
 			$o->{$key} = array_filter($value,fn($item)=>! is_null($item));
 
 		// @todo Need to handle incoming attributes that were modified by MD5Updates Trait (eg: jpegphoto)
@@ -284,7 +288,7 @@ class HomeController extends Controller
 				}
 
 				if ($value) {
-					$type = Arr::get($request->userpassword_hash,$dotkey);
+					$type = Arr::get($request->get('_userpassword_hash'),$dotkey);
 					$passwords[$dotkey] = Password::hash_id($type)
 						->encode($value);
 				}
@@ -368,6 +372,7 @@ class HomeController extends Controller
 	 * @param Request $request
 	 * @param Collection|null $old
 	 * @return \Illuminate\View\View
+	 * @throws InvalidUsage
 	 */
 	public function frame(Request $request,?Collection $old=NULL): \Illuminate\View\View
 	{
@@ -390,7 +395,7 @@ class HomeController extends Controller
 			// @todo Need to handle if DN is null, for example if the user's session expired and the ACLs dont let them retrieve $key['dn']
 			$o = config('server')->fetch($key['dn']);
 
-			foreach (collect(old())->except(['key','dn','step','_token','userpassword_hash','rdn','rdn_value']) as $attr => $value)
+			foreach (collect(old())->except(array_merge(self::INTERNAL_POST,['dn'])) as $attr => $value)
 				$o->{$attr} = $value;
 		}
 
@@ -478,8 +483,8 @@ class HomeController extends Controller
 		// Setup
 		$cmd = NULL;
 		$dn = NULL;
-		$key = $request->get('key',old('key'))
+		$key = $request->get('_key',old('_key'))
-			? Crypt::decryptString($request->get('key',old('key')))
+			? Crypt::decryptString($request->get('_key',old('_key')))
 			: NULL;
 
 		// Determine if our key has a command
@@ -491,9 +496,9 @@ class HomeController extends Controller
 				$dn = ($m[2] !== '_NOP') ? $m[2] : NULL;
 			}
 
-		} elseif (old('dn',$request->get('key'))) {
+		} elseif (old('dn',$request->get('_key'))) {
 			$cmd = 'dn';
-			$dn = Crypt::decryptString(old('dn',$request->get('key')));
+			$dn = Crypt::decryptString(old('dn',$request->get('_key')));
 		}
 
 		return ['cmd'=>$cmd,'dn'=>$dn];
@@ -510,12 +515,12 @@ class HomeController extends Controller
 	public function schema_frame(Request $request): \Illuminate\View\View
 	{
 		// If an invalid key, we'll 404
-		if ($request->type && $request->key && (! config('server')->schema($request->type)->has($request->key)))
+		if ($request->type && $request->get('_key') && (! config('server')->schema($request->type)->has($request->get('_key'))))
 			abort(404);
 
 		return view('frames.schema')
 			->with('type',$request->type)
-			->with('key',$request->key);
+			->with('key',$request->get('_key'));
 	}
 
 	/**

app/Http/Requests/EntryAddRequest.php

@@ -17,8 +17,8 @@ class EntryAddRequest extends FormRequest
 	public function messages(): array
 	{
 		return [
-			'rdn' => __('RDN is required.'),
+			'_rdn' => __('RDN is required.'),
-			'rdn_value' => __('RDN value is required.'),
+			'_rdn_value' => __('RDN value is required.'),
 		];
 	}
 
@@ -51,7 +51,7 @@ class EntryAddRequest extends FormRequest
 			->filter()
 			->flatMap(fn($item)=>$item)
 			->merge([
-				'key' => [
+				'_key' => [
 					'required',
 					new DNExists,
 					function (string $attribute,mixed $value,\Closure $fail) {
@@ -66,9 +66,9 @@ class EntryAddRequest extends FormRequest
 						}
 					},
 				],
-				'rdn' => 'required_if:step,2|string|min:1',
+				'_rdn' => 'required_if:_step,2|string|min:1',
-				'rdn_value' => 'required_if:step,2|string|min:1',
+				'_rdn_value' => 'required_if:_step,2|string|min:1',
-				'step' => 'int|min:1|max:2',
+				'_step' => 'int|min:1|max:2',
 				'objectclass'=>[
 					'required',
 					'array',
@@ -81,7 +81,7 @@ class EntryAddRequest extends FormRequest
 
 						// If this is step 1 and there is no objectclass, and no template, then fail
 						if ((! $oc->count())
-							&& (request()->post('step') == 1)
+							&& (request()->post('_step') == 1)
 							&& (! request()->post('template')))
 						{
 							$fail(__('Select an objectclass or a template'));
@@ -101,7 +101,7 @@ class EntryAddRequest extends FormRequest
 
 						// If this is step 1 and there is no objectclass, and no template, then fail
 						if ((! collect($value)->filter()->count())
-							&& (request()->post('step') == 1)
+							&& (request()->post('_step') == 1)
 							&& (! $oc->count()))
 						{
 							$fail(__('Select an objectclass or a template'));

app/Ldap/Entry.php

@@ -53,7 +53,10 @@ class Entry extends Model
 			$template_dir = Storage::disk(config('pla.template.dir'));
 			$templates = collect();
 
-			foreach (array_filter($template_dir->files(),fn($item)=>Str::endsWith($item,'.json')) as $file) {
+			foreach (array_filter($template_dir->files('.',TRUE),fn($item)=>Str::endsWith($item,'.json')) as $file) {
+				if (config('pla.template.exclude_system',FALSE) && Str::doesntContain($file,'/'))
+					continue;
+
 				$to = new Template($file);
 
 				if ($to->invalid) {

app/View/Components/Attribute.php

@@ -6,6 +6,7 @@ use Illuminate\Contracts\View\View;
 use Illuminate\View\Component;
 
 use App\Classes\LDAP\Attribute as LDAPAttribute;
+use App\Classes\Template;
 
 class Attribute extends Component
 {
@@ -14,12 +15,12 @@ class Attribute extends Component
 	public bool $new;
 	public bool $old;
 	public bool $updated;
-	public bool $template;
+	public ?Template $template;
 
 	/**
 	 * Create a new component instance.
 	 */
-	public function __construct(?LDAPAttribute $o,bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE,string $template=NULL)
+	public function __construct(?LDAPAttribute $o,bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE,?Template $template=NULL)
 	{
 		$this->o = $o;
 		$this->edit = $edit;
@@ -38,7 +39,12 @@ class Attribute extends Component
 	{
 		return $this->o
 			? $this->o
-				->render(edit: $this->edit,old: $this->old,new: $this->new,template: $this->template,updated: $this->updated)
+				->render(
+					edit: $this->edit,
+					old: $this->old,
+					new: $this->new,
+					updated: $this->updated,
+					template: $this->template)
 			: __('Unknown');
 	}
 }

composer.lock

@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "brick/math",
-            "version": "0.12.3",
+            "version": "0.13.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/brick/math.git",
-                "reference": "866551da34e9a618e64a819ee1e01c20d8a588ba"
+                "reference": "fc7ed316430118cc7836bf45faff18d5dfc8de04"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/brick/math/zipball/866551da34e9a618e64a819ee1e01c20d8a588ba",
+                "url": "https://api.github.com/repos/brick/math/zipball/fc7ed316430118cc7836bf45faff18d5dfc8de04",
-                "reference": "866551da34e9a618e64a819ee1e01c20d8a588ba",
+                "reference": "fc7ed316430118cc7836bf45faff18d5dfc8de04",
                 "shasum": ""
             },
             "require": {
@@ -56,7 +56,7 @@
             ],
             "support": {
                 "issues": "https://github.com/brick/math/issues",
-                "source": "https://github.com/brick/math/tree/0.12.3"
+                "source": "https://github.com/brick/math/tree/0.13.1"
             },
             "funding": [
                 {
@@ -64,7 +64,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-02-28T13:11:00+00:00"
+            "time": "2025-03-29T13:50:30+00:00"
         },
         {
             "name": "carbonphp/carbon-doctrine-types",
@@ -288,16 +288,16 @@
         },
         {
             "name": "directorytree/ldaprecord-laravel",
-            "version": "v3.4.1",
+            "version": "v3.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/DirectoryTree/LdapRecord-Laravel.git",
-                "reference": "15f56e01319852d41023633d3688ac4aa139aa6e"
+                "reference": "28c5a7aa42aa3fa631f9c0f0c8236fd19bc7b00c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/DirectoryTree/LdapRecord-Laravel/zipball/15f56e01319852d41023633d3688ac4aa139aa6e",
+                "url": "https://api.github.com/repos/DirectoryTree/LdapRecord-Laravel/zipball/28c5a7aa42aa3fa631f9c0f0c8236fd19bc7b00c",
-                "reference": "15f56e01319852d41023633d3688ac4aa139aa6e",
+                "reference": "28c5a7aa42aa3fa631f9c0f0c8236fd19bc7b00c",
                 "shasum": ""
             },
             "require": {
@@ -343,7 +343,7 @@
             ],
             "support": {
                 "issues": "https://github.com/DirectoryTree/LdapRecord-Laravel/issues",
-                "source": "https://github.com/DirectoryTree/LdapRecord-Laravel/tree/v3.4.1"
+                "source": "https://github.com/DirectoryTree/LdapRecord-Laravel/tree/v3.4.2"
             },
             "funding": [
                 {
@@ -351,7 +351,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-03-21T19:16:44+00:00"
+            "time": "2025-06-13T15:46:25+00:00"
         },
         {
             "name": "doctrine/inflector",
@@ -1199,20 +1199,20 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v12.16.0",
+            "version": "v12.19.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "293bb1c70224faebfd3d4328e201c37115da055f"
+                "reference": "4e6ec689ef704bb4bd282f29d9dd658dfb4fb262"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/293bb1c70224faebfd3d4328e201c37115da055f",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/4e6ec689ef704bb4bd282f29d9dd658dfb4fb262",
-                "reference": "293bb1c70224faebfd3d4328e201c37115da055f",
+                "reference": "4e6ec689ef704bb4bd282f29d9dd658dfb4fb262",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.11|^0.12",
+                "brick/math": "^0.11|^0.12|^0.13",
                 "composer-runtime-api": "^2.2",
                 "doctrine/inflector": "^2.0.5",
                 "dragonmantank/cron-expression": "^3.4",
@@ -1410,7 +1410,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-05-27T15:49:44+00:00"
+            "time": "2025-06-18T12:56:23+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -2315,16 +2315,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "3.9.1",
+            "version": "3.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/CarbonPHP/carbon.git",
-                "reference": "ced71f79398ece168e24f7f7710462f462310d4d"
+                "reference": "c1397390dd0a7e0f11660f0ae20f753d88c1f3d9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/ced71f79398ece168e24f7f7710462f462310d4d",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/c1397390dd0a7e0f11660f0ae20f753d88c1f3d9",
-                "reference": "ced71f79398ece168e24f7f7710462f462310d4d",
+                "reference": "c1397390dd0a7e0f11660f0ae20f753d88c1f3d9",
                 "shasum": ""
             },
             "require": {
@@ -2332,9 +2332,9 @@
                 "ext-json": "*",
                 "php": "^8.1",
                 "psr/clock": "^1.0",
-                "symfony/clock": "^6.3 || ^7.0",
+                "symfony/clock": "^6.3.12 || ^7.0",
                 "symfony/polyfill-mbstring": "^1.0",
-                "symfony/translation": "^4.4.18 || ^5.2.1|| ^6.0 || ^7.0"
+                "symfony/translation": "^4.4.18 || ^5.2.1 || ^6.0 || ^7.0"
             },
             "provide": {
                 "psr/clock-implementation": "1.0"
@@ -2342,14 +2342,13 @@
             "require-dev": {
                 "doctrine/dbal": "^3.6.3 || ^4.0",
                 "doctrine/orm": "^2.15.2 || ^3.0",
-                "friendsofphp/php-cs-fixer": "^3.57.2",
+                "friendsofphp/php-cs-fixer": "^3.75.0",
                 "kylekatarnls/multi-tester": "^2.5.3",
-                "ondrejmirtes/better-reflection": "^6.25.0.4",
                 "phpmd/phpmd": "^2.15.0",
-                "phpstan/extension-installer": "^1.3.1",
+                "phpstan/extension-installer": "^1.4.3",
-                "phpstan/phpstan": "^1.11.2",
+                "phpstan/phpstan": "^2.1.17",
-                "phpunit/phpunit": "^10.5.20",
+                "phpunit/phpunit": "^10.5.46",
-                "squizlabs/php_codesniffer": "^3.9.0"
+                "squizlabs/php_codesniffer": "^3.13.0"
             },
             "bin": [
                 "bin/carbon"
@@ -2417,7 +2416,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-01T19:51:51+00:00"
+            "time": "2025-06-12T10:24:28+00:00"
         },
         {
             "name": "nette/schema",
@@ -2483,16 +2482,16 @@
         },
         {
             "name": "nette/utils",
-            "version": "v4.0.6",
+            "version": "v4.0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/utils.git",
-                "reference": "ce708655043c7050eb050df361c5e313cf708309"
+                "reference": "e67c4061eb40b9c113b218214e42cb5a0dda28f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/utils/zipball/ce708655043c7050eb050df361c5e313cf708309",
+                "url": "https://api.github.com/repos/nette/utils/zipball/e67c4061eb40b9c113b218214e42cb5a0dda28f2",
-                "reference": "ce708655043c7050eb050df361c5e313cf708309",
+                "reference": "e67c4061eb40b9c113b218214e42cb5a0dda28f2",
                 "shasum": ""
             },
             "require": {
@@ -2563,9 +2562,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/utils/issues",
-                "source": "https://github.com/nette/utils/tree/v4.0.6"
+                "source": "https://github.com/nette/utils/tree/v4.0.7"
             },
-            "time": "2025-03-30T21:06:30+00:00"
+            "time": "2025-06-03T04:55:08+00:00"
         },
         {
             "name": "nunomaduro/termwind",
@@ -3263,16 +3262,16 @@
         },
         {
             "name": "ramsey/uuid",
-            "version": "4.8.0",
+            "version": "4.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
-                "reference": "6700833915c00f890615fbcb653faed513836836"
+                "reference": "fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/6700833915c00f890615fbcb653faed513836836",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28",
-                "reference": "6700833915c00f890615fbcb653faed513836836",
+                "reference": "fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28",
                 "shasum": ""
             },
             "require": {
@@ -3336,9 +3335,9 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/uuid/issues",
-                "source": "https://github.com/ramsey/uuid/tree/4.8.0"
+                "source": "https://github.com/ramsey/uuid/tree/4.8.1"
             },
-            "time": "2025-06-01T02:32:15+00:00"
+            "time": "2025-06-01T06:28:46+00:00"
         },
         {
             "name": "symfony/clock",
@@ -6076,16 +6075,16 @@
         },
         {
             "name": "filp/whoops",
-            "version": "2.18.0",
+            "version": "2.18.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filp/whoops.git",
-                "reference": "a7de6c3c6c3c022f5cfc337f8ede6a14460cf77e"
+                "reference": "59a123a3d459c5a23055802237cb317f609867e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/a7de6c3c6c3c022f5cfc337f8ede6a14460cf77e",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/59a123a3d459c5a23055802237cb317f609867e5",
-                "reference": "a7de6c3c6c3c022f5cfc337f8ede6a14460cf77e",
+                "reference": "59a123a3d459c5a23055802237cb317f609867e5",
                 "shasum": ""
             },
             "require": {
@@ -6135,7 +6134,7 @@
             ],
             "support": {
                 "issues": "https://github.com/filp/whoops/issues",
-                "source": "https://github.com/filp/whoops/tree/2.18.0"
+                "source": "https://github.com/filp/whoops/tree/2.18.3"
             },
             "funding": [
                 {
@@ -6143,7 +6142,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-03-15T12:00:00+00:00"
+            "time": "2025-06-16T00:02:10+00:00"
         },
         {
             "name": "hamcrest/hamcrest-php",
@@ -6399,23 +6398,23 @@
         },
         {
             "name": "nunomaduro/collision",
-            "version": "v8.8.0",
+            "version": "v8.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/collision.git",
-                "reference": "4cf9f3b47afff38b139fb79ce54fc71799022ce8"
+                "reference": "44ccb82e3e21efb5446748d2a3c81a030ac22bd5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/4cf9f3b47afff38b139fb79ce54fc71799022ce8",
+                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/44ccb82e3e21efb5446748d2a3c81a030ac22bd5",
-                "reference": "4cf9f3b47afff38b139fb79ce54fc71799022ce8",
+                "reference": "44ccb82e3e21efb5446748d2a3c81a030ac22bd5",
                 "shasum": ""
             },
             "require": {
-                "filp/whoops": "^2.18.0",
+                "filp/whoops": "^2.18.1",
-                "nunomaduro/termwind": "^2.3.0",
+                "nunomaduro/termwind": "^2.3.1",
                 "php": "^8.2.0",
-                "symfony/console": "^7.2.5"
+                "symfony/console": "^7.3.0"
             },
             "conflict": {
                 "laravel/framework": "<11.44.2 || >=13.0.0",
@@ -6423,15 +6422,15 @@
             },
             "require-dev": {
                 "brianium/paratest": "^7.8.3",
-                "larastan/larastan": "^3.2",
+                "larastan/larastan": "^3.4.2",
-                "laravel/framework": "^11.44.2 || ^12.6",
+                "laravel/framework": "^11.44.2 || ^12.18",
-                "laravel/pint": "^1.21.2",
+                "laravel/pint": "^1.22.1",
-                "laravel/sail": "^1.41.0",
+                "laravel/sail": "^1.43.1",
-                "laravel/sanctum": "^4.0.8",
+                "laravel/sanctum": "^4.1.1",
                 "laravel/tinker": "^2.10.1",
-                "orchestra/testbench-core": "^9.12.0 || ^10.1",
+                "orchestra/testbench-core": "^9.12.0 || ^10.4",
-                "pestphp/pest": "^3.8.0",
+                "pestphp/pest": "^3.8.2",
-                "sebastian/environment": "^7.2.0 || ^8.0"
+                "sebastian/environment": "^7.2.1 || ^8.0"
             },
             "type": "library",
             "extra": {
@@ -6494,7 +6493,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2025-04-03T14:33:09+00:00"
+            "time": "2025-06-11T01:04:21+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -6686,16 +6685,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "11.0.9",
+            "version": "11.0.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "14d63fbcca18457e49c6f8bebaa91a87e8e188d7"
+                "reference": "1a800a7446add2d79cc6b3c01c45381810367d76"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/14d63fbcca18457e49c6f8bebaa91a87e8e188d7",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/1a800a7446add2d79cc6b3c01c45381810367d76",
-                "reference": "14d63fbcca18457e49c6f8bebaa91a87e8e188d7",
+                "reference": "1a800a7446add2d79cc6b3c01c45381810367d76",
                 "shasum": ""
             },
             "require": {
@@ -6752,15 +6751,27 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.9"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/show"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpunit/php-code-coverage",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2025-02-25T13:26:39+00:00"
+            "time": "2025-06-18T08:56:18+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -7009,16 +7020,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "11.5.21",
+            "version": "11.5.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "d565e2cdc21a7db9dc6c399c1fc2083b8010f289"
+                "reference": "6b07ab1047155cf38f82dd691787a277782271dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d565e2cdc21a7db9dc6c399c1fc2083b8010f289",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6b07ab1047155cf38f82dd691787a277782271dd",
-                "reference": "d565e2cdc21a7db9dc6c399c1fc2083b8010f289",
+                "reference": "6b07ab1047155cf38f82dd691787a277782271dd",
                 "shasum": ""
             },
             "require": {
@@ -7032,7 +7043,7 @@
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
                 "php": ">=8.2",
-                "phpunit/php-code-coverage": "^11.0.9",
+                "phpunit/php-code-coverage": "^11.0.10",
                 "phpunit/php-file-iterator": "^5.1.0",
                 "phpunit/php-invoker": "^5.0.1",
                 "phpunit/php-text-template": "^4.0.1",
@@ -7090,7 +7101,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.21"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.24"
             },
             "funding": [
                 {
@@ -7114,7 +7125,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-21T12:35:00+00:00"
+            "time": "2025-06-20T11:31:02+00:00"
         },
         {
             "name": "sebastian/cli-parser",

config/pla.php

@@ -84,11 +84,16 @@ return [
 	 * setup.
 	 */
 	'login' => [
-		'attr' => [env('LDAP_LOGIN_ATTR','uid') => env('LDAP_LOGIN_ATTR_DESC','User ID')],	// Attribute used to find user for login
+		// Attribute used to find user for login
-		'objectclass' => explode(',',env('LDAP_LOGIN_OBJECTCLASS', 'posixAccount')),		// Objectclass that users must contain to login
+		'attr' => [strtolower(env('LDAP_LOGIN_ATTR','uid')) => env('LDAP_LOGIN_ATTR_DESC','User ID')],
+		// Objectclass that users must contain to login
+		'objectclass' => explode(',',env('LDAP_LOGIN_OBJECTCLASS', 'posixAccount')),
+		// Alert if DN is being used, and the login fails, and the the DN doesnt exist
+		'alert_rootdn' => env('LDAP_ALERT_ROOTDN',TRUE) && strtolower(env('LDAP_LOGIN_ATTR','uid')) === 'dn',
 	],
 
 	'template' => [
 		'dir' => env('LDAP_TEMPLATE_DRIVER','templates'),
+		'exclude_system' => env('LDAP_TEMPLATE_EXCLUDE_SYSTEM',FALSE),
 	],
 ];

package-lock.json

@@ -53,9 +53,9 @@
             }
         },
         "node_modules/@babel/compat-data": {
-            "version": "7.27.3",
+            "version": "7.27.5",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.27.3.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.27.5.tgz",
-            "integrity": "sha512-V42wFfx1ymFte+ecf6iXghnnP8kWTO+ZLXIyZq+1LAXHHvTZdVxicn4yiVYdYMGaCO3tmqub11AorKkv+iodqw==",
+            "integrity": "sha512-KiRAp/VoJaWkkte84TvUd9qjdbZAdiqyvMxrGl1N6vzFogKmaLgoM3L1kgtLicp2HP5fBJS8JrZKLVIZGVJAVg==",
             "license": "MIT",
             "engines": {
                 "node": ">=6.9.0"
@@ -101,12 +101,12 @@
             }
         },
         "node_modules/@babel/generator": {
-            "version": "7.27.3",
+            "version": "7.27.5",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.3.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.5.tgz",
-            "integrity": "sha512-xnlJYj5zepml8NXtjkG0WquFUv8RskFqyFcVgTBp5k+NaA/8uw/K+OSVf8AMGw5e9HKP2ETd5xpK5MLZQD6b4Q==",
+            "integrity": "sha512-ZGhA37l0e/g2s1Cnzdix0O3aLYm66eF8aufiVteOgnwxgnRP8GoyMj7VWsgWnQbVKXyge7hqrFh2K2TQM6t1Hw==",
             "license": "MIT",
             "dependencies": {
-                "@babel/parser": "^7.27.3",
+                "@babel/parser": "^7.27.5",
                 "@babel/types": "^7.27.3",
                 "@jridgewell/gen-mapping": "^0.3.5",
                 "@jridgewell/trace-mapping": "^0.3.25",
@@ -378,22 +378,22 @@
             }
         },
         "node_modules/@babel/helpers": {
-            "version": "7.27.4",
+            "version": "7.27.6",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.4.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.6.tgz",
-            "integrity": "sha512-Y+bO6U+I7ZKaM5G5rDUZiYfUvQPUibYmAFe7EnKdnKBbVXDZxvp+MWOH5gYciY0EPk4EScsuFMQBbEfpdRKSCQ==",
+            "integrity": "sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug==",
             "license": "MIT",
             "dependencies": {
                 "@babel/template": "^7.27.2",
-                "@babel/types": "^7.27.3"
+                "@babel/types": "^7.27.6"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.27.4",
+            "version": "7.27.5",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.4.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.5.tgz",
-            "integrity": "sha512-BRmLHGwpUqLFR2jzx9orBuX/ABDkj2jLKOXrHDTN2aOKL+jFDDKaRNo9nyYsIl9h/UE/7lMKdDjKQQyxKKDZ7g==",
+            "integrity": "sha512-OsQd175SxWkGlzbny8J3K8TnnDD0N3lrIUtB92xwyRpzaenGZhxDvxN/JgU00U3CDZNj9tPuDJ5H0WS4Nt3vKg==",
             "license": "MIT",
             "dependencies": {
                 "@babel/types": "^7.27.3"
@@ -651,9 +651,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-block-scoping": {
-            "version": "7.27.3",
+            "version": "7.27.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.27.3.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.27.5.tgz",
-            "integrity": "sha512-+F8CnfhuLhwUACIJMLWnjz6zvzYM2r0yeIHKlbgfw7ml8rOMJsXNXV/hyRcb3nb493gRs4WvYpQAndWj/qQmkQ==",
+            "integrity": "sha512-JF6uE2s67f0y2RZcm2kpAUEbD50vH62TyWVebxwHAlbSdM49VqPz8t4a1uIjp4NIOIZ4xzLfjY5emt/RCyC7TQ==",
             "license": "MIT",
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.27.1"
@@ -1189,9 +1189,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-regenerator": {
-            "version": "7.27.4",
+            "version": "7.27.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.27.4.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.27.5.tgz",
-            "integrity": "sha512-Glp/0n8xuj+E1588otw5rjJkTXfzW7FjH3IIUrfqiZOPQCd2vbg8e+DQE8jK9g4V5/zrxFW+D9WM9gboRPELpQ==",
+            "integrity": "sha512-uhB8yHerfe3MWnuLAhEbeQ4afVoqv8BQsPqrTv7e/jZ9y00kJL6l9a/f4OWaKxotmjzewfEyXE1vgDJenkQ2/Q==",
             "license": "MIT",
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.27.1"
@@ -1509,9 +1509,9 @@
             }
         },
         "node_modules/@babel/runtime": {
-            "version": "7.27.4",
+            "version": "7.27.6",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.4.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.6.tgz",
-            "integrity": "sha512-t3yaEOuGu9NlIZ+hIeGbBjFtZT7j2cb2tg0fuaJKeGotchRjjLfrBA9Kwf8quhpP1EUuxModQg04q/mBwyg8uA==",
+            "integrity": "sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==",
             "license": "MIT",
             "engines": {
                 "node": ">=6.9.0"
@@ -1550,9 +1550,9 @@
             }
         },
         "node_modules/@babel/types": {
-            "version": "7.27.3",
+            "version": "7.27.6",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.3.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.6.tgz",
-            "integrity": "sha512-Y1GkI4ktrtvmawoSq+4FCVHNryea6uR+qUQy0AGxLSsjCX0nVmkYQMBLHDkXZuo5hGx7eYdnIaslsdBFm7zbUw==",
+            "integrity": "sha512-ETyHEk2VHHvl9b9jZP5IHPavHYk57EhanlRRuae9XCpb/j5bDCbPPMOBfCWhnl/7EDJz0jEMCi/RhccCE8r1+Q==",
             "license": "MIT",
             "dependencies": {
                 "@babel/helper-string-parser": "^7.27.1",
@@ -2046,9 +2046,9 @@
             }
         },
         "node_modules/@types/body-parser": {
-            "version": "1.19.5",
+            "version": "1.19.6",
-            "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
+            "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz",
-            "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==",
+            "integrity": "sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==",
             "license": "MIT",
             "dependencies": {
                 "@types/connect": "*",
@@ -2114,15 +2114,15 @@
             }
         },
         "node_modules/@types/estree": {
-            "version": "1.0.7",
+            "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
+            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
-            "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
+            "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
             "license": "MIT"
         },
         "node_modules/@types/express": {
-            "version": "4.17.22",
+            "version": "4.17.23",
-            "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.22.tgz",
+            "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.23.tgz",
-            "integrity": "sha512-eZUmSnhRX9YRSkplpz0N+k6NljUUn5l3EWZIKZvYzhvMphEuNiyyy1viH/ejgt66JWgALwC/gtSUAeQKtSwW/w==",
+            "integrity": "sha512-Crp6WY9aTYP3qPi2wGDo9iUe/rceX01UMhnF1jmwDcKCFM6cx7YhGP/Mpr3y9AASpfHixIG0E6azCcL5OcDHsQ==",
             "license": "MIT",
             "dependencies": {
                 "@types/body-parser": "*",
@@ -2166,9 +2166,9 @@
             }
         },
         "node_modules/@types/http-errors": {
-            "version": "2.0.4",
+            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
+            "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.5.tgz",
-            "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==",
+            "integrity": "sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==",
             "license": "MIT"
         },
         "node_modules/@types/http-proxy": {
@@ -2245,12 +2245,12 @@
             "license": "MIT"
         },
         "node_modules/@types/node": {
-            "version": "22.15.29",
+            "version": "24.0.3",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.29.tgz",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.3.tgz",
-            "integrity": "sha512-LNdjOkUDlU1RZb8e1kOIUpN1qQUlzGkEtbVNo53vbrwDg5om6oduhm4SiUaPW5ASTXhAiP0jInWG8Qx9fVlOeQ==",
+            "integrity": "sha512-R4I/kzCYAdRLzfiCabn9hxWfbuHS573x+r0dJMkkzThEa7pbrcDWK+9zu3e7aBOouf+rQAciqPFMnxwr0aWgKg==",
             "license": "MIT",
             "dependencies": {
-                "undici-types": "~6.21.0"
+                "undici-types": "~7.8.0"
             }
         },
         "node_modules/@types/node-forge": {
@@ -2287,9 +2287,9 @@
             "license": "MIT"
         },
         "node_modules/@types/send": {
-            "version": "0.17.4",
+            "version": "0.17.5",
-            "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
+            "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.5.tgz",
-            "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
+            "integrity": "sha512-z6F2D3cOStZvuk2SaP6YrwkNO65iTZcwA2ZkSABegdkAh/lf+Aa/YQndZVfmEXT5vgAp6zv06VQ3ejSVjAny4w==",
             "license": "MIT",
             "dependencies": {
                 "@types/mime": "^1",
@@ -2306,9 +2306,9 @@
             }
         },
         "node_modules/@types/serve-static": {
-            "version": "1.15.7",
+            "version": "1.15.8",
-            "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",
+            "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.8.tgz",
-            "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==",
+            "integrity": "sha512-roei0UY3LhpOJvjbIP6ZZFngyLKl5dskOtDhxY5THRSpO+ZI+nzJ+m5yUMzGrp89YRa7lvknKkMYjqQFGwA7Sg==",
             "license": "MIT",
             "dependencies": {
                 "@types/http-errors": "*",
@@ -2557,9 +2557,9 @@
             }
         },
         "node_modules/acorn": {
-            "version": "8.14.1",
+            "version": "8.15.0",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
-            "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+            "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
             "license": "MIT",
             "bin": {
                 "acorn": "bin/acorn"
@@ -2800,10 +2800,25 @@
                 "postcss": "^8.1.0"
             }
         },
+        "node_modules/available-typed-arrays": {
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+            "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
+            "license": "MIT",
+            "dependencies": {
+                "possible-typed-array-names": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/axios": {
-            "version": "1.9.0",
+            "version": "1.10.0",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.9.0.tgz",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.10.0.tgz",
-            "integrity": "sha512-re4CqKTJaURpzbLHtIi6XpDv20/CnpXOtjRY5/CU32L8gU8ek9UIivcfvSWvmKEngmVbrUtPpdDwWDWL7DNHvg==",
+            "integrity": "sha512-/1xYAC4MP/HEG+3duIhFr4ZQXR4sQXOIe+o6sdqzeykGLx6Upp/1p8MHqhINOvGeP7xyNHe7tsiJByc4SSVUxw==",
             "license": "MIT",
             "dependencies": {
                 "follow-redirects": "^1.15.6",
@@ -3020,9 +3035,9 @@
             "license": "ISC"
         },
         "node_modules/bootstrap": {
-            "version": "5.3.6",
+            "version": "5.3.7",
-            "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.6.tgz",
+            "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.7.tgz",
-            "integrity": "sha512-jX0GAcRzvdwISuvArXn3m7KZscWWFAf1MKBcnzaN02qWMb3jpMoUX4/qgeiGzqyIb4ojulRzs89UCUmGcFSzTA==",
+            "integrity": "sha512-7KgiD8UHjfcPBHEpDNg+zGz8L3LqR3GVwqZiBRFX04a1BCArZOz1r2kjly2HQ0WokqTO0v1nF+QAt8dsW4lKlw==",
             "funding": [
                 {
                     "type": "github",
@@ -3055,9 +3070,9 @@
             "license": "MIT"
         },
         "node_modules/brace-expansion": {
-            "version": "1.1.11",
+            "version": "1.1.12",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
             "license": "MIT",
             "dependencies": {
                 "balanced-match": "^1.0.0",
@@ -3312,9 +3327,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001720",
+            "version": "1.0.30001724",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001720.tgz",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001724.tgz",
-            "integrity": "sha512-Ec/2yV2nNPwb4DnTANEV99ZWwm3ZWfdlfkQbWSDDt+PsXEVYwlhPH8tdMaPunYTKKmz7AnHi2oNEi1GcmKCD8g==",
+            "integrity": "sha512-WqJo7p0TbHDOythNTqYujmaJTvtYRZrjpP8TCvH6Vb9CYJerJNKamKzIWOM4BkQatWj9H2lYulpdAQNBe7QhNA==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -3674,12 +3689,12 @@
             }
         },
         "node_modules/core-js-compat": {
-            "version": "3.42.0",
+            "version": "3.43.0",
-            "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.42.0.tgz",
+            "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.43.0.tgz",
-            "integrity": "sha512-bQasjMfyDGyaeWKBIu33lHh9qlSR0MFE/Nmc6nMjf/iU9b3rSMdAYz1Baxrv4lPdGUsTqZudHA4jIGSJy0SWZQ==",
+            "integrity": "sha512-2GML2ZsCc5LR7hZYz4AXmjQw8zuy2T//2QntwdnpuYI7jteT6GVYJL7F6C2C57R7gSYrcqVW3lAALefdbhBLDA==",
             "license": "MIT",
             "dependencies": {
-                "browserslist": "^4.24.4"
+                "browserslist": "^4.25.0"
             },
             "funding": {
                 "type": "opencollective",
@@ -4325,9 +4340,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.161",
+            "version": "1.5.171",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.161.tgz",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.171.tgz",
-            "integrity": "sha512-hwtetwfKNZo/UlwHIVBlKZVdy7o8bIZxxKs0Mv/ROPiQQQmDgdm5a+KvKtBsxM8ZjFzTaCeLoodZ8jiBE3o9rA==",
+            "integrity": "sha512-scWpzXEJEMrGJa4Y6m/tVotb0WuvNmasv3wWVzUAeCgKU0ToFOhUW6Z+xWnRQANMYGxN4ngJXIThgBJOqzVPCQ==",
             "license": "ISC"
         },
         "node_modules/elliptic": {
@@ -4908,15 +4923,31 @@
                 }
             }
         },
+        "node_modules/for-each": {
+            "version": "0.3.5",
+            "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
+            "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
+            "license": "MIT",
+            "dependencies": {
+                "is-callable": "^1.2.7"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/form-data": {
-            "version": "4.0.2",
+            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
+            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.3.tgz",
-            "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
+            "integrity": "sha512-qsITQPfmvMOSAdeyZ+12I1c+CKSstAFAwu+97zrnWAbIr5u8wfsExUzCesVLC8NgHuRUqNN4Zy6UPWUTRGslcA==",
             "license": "MIT",
             "dependencies": {
                 "asynckit": "^0.4.0",
                 "combined-stream": "^1.0.8",
                 "es-set-tostringtag": "^2.1.0",
+                "hasown": "^2.0.2",
                 "mime-types": "^2.1.12"
             },
             "engines": {
@@ -5631,9 +5662,9 @@
             }
         },
         "node_modules/immutable": {
-            "version": "5.1.2",
+            "version": "5.1.3",
-            "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.2.tgz",
+            "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.3.tgz",
-            "integrity": "sha512-qHKXW1q6liAk1Oys6umoaZbDRqjcjgSrbnrifHsfsttza7zcvRAsL7mMV6xWcyhwQy7Xj5v4hhbr6b+iDYwlmQ==",
+            "integrity": "sha512-+chQdDfvscSF1SJqv2gn4SRO2ZyS3xL3r7IW/wWEEzrzLisnOlKiQu5ytC/BVNcS15C39WT2Hg/bjKjDMcu+zg==",
             "license": "MIT"
         },
         "node_modules/import-fresh": {
@@ -5730,6 +5761,18 @@
             "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
             "license": "MIT"
         },
+        "node_modules/is-callable": {
+            "version": "1.2.7",
+            "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+            "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/is-core-module": {
             "version": "2.16.1",
             "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
@@ -5835,6 +5878,21 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/is-typed-array": {
+            "version": "1.1.15",
+            "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
+            "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
+            "license": "MIT",
+            "dependencies": {
+                "which-typed-array": "^1.1.16"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/is-what": {
             "version": "3.14.1",
             "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
@@ -7050,21 +7108,53 @@
             }
         },
         "node_modules/pbkdf2": {
-            "version": "3.1.2",
+            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+            "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.3.tgz",
-            "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+            "integrity": "sha512-wfRLBZ0feWRhCIkoMB6ete7czJcnNnqRpcoWQBLqatqXXmelSRqfdDK4F3u9T2s2cXas/hQJcryI/4lAL+XTlA==",
             "license": "MIT",
             "dependencies": {
-                "create-hash": "^1.1.2",
+                "create-hash": "~1.1.3",
-                "create-hmac": "^1.1.4",
+                "create-hmac": "^1.1.7",
-                "ripemd160": "^2.0.1",
+                "ripemd160": "=2.0.1",
-                "safe-buffer": "^5.0.1",
+                "safe-buffer": "^5.2.1",
-                "sha.js": "^2.4.8"
+                "sha.js": "^2.4.11",
+                "to-buffer": "^1.2.0"
             },
             "engines": {
                 "node": ">=0.12"
             }
         },
+        "node_modules/pbkdf2/node_modules/create-hash": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz",
+            "integrity": "sha512-snRpch/kwQhcdlnZKYanNF1m0RDlrCdSKQaH87w1FCFPVPNCQ/Il9QJKAX2jVBZddRdaHBMC+zXa9Gw9tmkNUA==",
+            "license": "MIT",
+            "dependencies": {
+                "cipher-base": "^1.0.1",
+                "inherits": "^2.0.1",
+                "ripemd160": "^2.0.0",
+                "sha.js": "^2.4.0"
+            }
+        },
+        "node_modules/pbkdf2/node_modules/hash-base": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz",
+            "integrity": "sha512-0TROgQ1/SxE6KmxWSvXHvRj90/Xo1JvZShofnYF+f6ZsGtR4eES7WfrQzPalmyagfKZCXpVnitiRebZulWsbiw==",
+            "license": "MIT",
+            "dependencies": {
+                "inherits": "^2.0.1"
+            }
+        },
+        "node_modules/pbkdf2/node_modules/ripemd160": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz",
+            "integrity": "sha512-J7f4wutN8mdbV08MJnXibYpCOPHR+yzy+iQ/AsjMv2j8cLavQ8VGagDFUwwTAdF8FmRKVeNpbTTEwNHCW1g94w==",
+            "license": "MIT",
+            "dependencies": {
+                "hash-base": "^2.0.0",
+                "inherits": "^2.0.1"
+            }
+        },
         "node_modules/pe7-icon": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/pe7-icon/-/pe7-icon-1.0.4.tgz",
@@ -7116,10 +7206,19 @@
                 "node": ">=8"
             }
         },
+        "node_modules/possible-typed-array-names": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
+            "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
         "node_modules/postcss": {
-            "version": "8.5.4",
+            "version": "8.5.6",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.4.tgz",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
-            "integrity": "sha512-QSa9EBe+uwlGTFmHsPKokv3B/oEMQZxfqW0QqNCyhpa6mB1afzulwn8hihglqAb2pOw+BJgNlmXQ8la2VeHB7w==",
+            "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -8222,9 +8321,9 @@
             "license": "MIT"
         },
         "node_modules/sass": {
-            "version": "1.89.1",
+            "version": "1.89.2",
-            "resolved": "https://registry.npmjs.org/sass/-/sass-1.89.1.tgz",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.89.2.tgz",
-            "integrity": "sha512-eMLLkl+qz7tx/0cJ9wI+w09GQ2zodTkcE/aVfywwdlRcI3EO19xGnbmJwg/JMIm+5MxVJ6outddLZ4Von4E++Q==",
+            "integrity": "sha512-xCmtksBKd/jdJ9Bt9p7nPKiuqrlBMBuuGkQlkhZjjQk3Ty48lv93k5Dq6OPkKt4XwxDJ7tvlfrTa1MPA9bf+QA==",
             "license": "MIT",
             "dependencies": {
                 "chokidar": "^4.0.0",
@@ -8604,9 +8703,9 @@
             }
         },
         "node_modules/shell-quote": {
-            "version": "1.8.2",
+            "version": "1.8.3",
-            "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.2.tgz",
+            "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.3.tgz",
-            "integrity": "sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==",
+            "integrity": "sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==",
             "license": "MIT",
             "engines": {
                 "node": ">= 0.4"
@@ -8995,9 +9094,9 @@
             }
         },
         "node_modules/terser": {
-            "version": "5.40.0",
+            "version": "5.43.1",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.40.0.tgz",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.43.1.tgz",
-            "integrity": "sha512-cfeKl/jjwSR5ar7d0FGmave9hFGJT8obyo0z+CrQOylLDbk7X81nPU6vq9VORa5jU30SkDnT2FXjLbR8HLP+xA==",
+            "integrity": "sha512-+6erLbBm0+LROX2sPXlUYx/ux5PyE9K/a92Wrt6oA+WDAoFTdpHE5tCYCI5PNzq2y8df4rA+QgHLJuR4jNymsg==",
             "license": "BSD-2-Clause",
             "dependencies": {
                 "@jridgewell/source-map": "^0.3.3",
@@ -9129,6 +9228,26 @@
             "integrity": "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==",
             "license": "MIT"
         },
+        "node_modules/to-buffer": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.2.1.tgz",
+            "integrity": "sha512-tB82LpAIWjhLYbqjx3X4zEeHN6M8CiuOEy2JY8SEQVdYRe3CCHOFaqrBW1doLDrfpWhplcW7BL+bO3/6S3pcDQ==",
+            "license": "MIT",
+            "dependencies": {
+                "isarray": "^2.0.5",
+                "safe-buffer": "^5.2.1",
+                "typed-array-buffer": "^1.0.3"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/to-buffer/node_modules/isarray": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+            "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+            "license": "MIT"
+        },
         "node_modules/to-regex-range": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -9175,10 +9294,24 @@
                 "node": ">= 0.6"
             }
         },
+        "node_modules/typed-array-buffer": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
+            "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
+            "license": "MIT",
+            "dependencies": {
+                "call-bound": "^1.0.3",
+                "es-errors": "^1.3.0",
+                "is-typed-array": "^1.1.14"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
         "node_modules/undici-types": {
-            "version": "6.21.0",
+            "version": "7.8.0",
-            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz",
-            "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+            "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==",
             "license": "MIT"
         },
         "node_modules/unicode-canonical-property-names-ecmascript": {
@@ -9790,9 +9923,9 @@
             }
         },
         "node_modules/webpack/node_modules/webpack-sources": {
-            "version": "3.3.0",
+            "version": "3.3.3",
-            "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.3.0.tgz",
+            "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.3.3.tgz",
-            "integrity": "sha512-77R0RDmJfj9dyv5p3bM5pOHa+X8/ZkO9c7kpDstigkC4nIDobadsfSGCwB4bKhMVxqAok8tajaoR8rirM7+VFQ==",
+            "integrity": "sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg==",
             "license": "MIT",
             "engines": {
                 "node": ">=10.13.0"
@@ -9854,6 +9987,27 @@
                 "node": ">= 8"
             }
         },
+        "node_modules/which-typed-array": {
+            "version": "1.1.19",
+            "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz",
+            "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==",
+            "license": "MIT",
+            "dependencies": {
+                "available-typed-arrays": "^1.0.7",
+                "call-bind": "^1.0.8",
+                "call-bound": "^1.0.4",
+                "for-each": "^0.3.5",
+                "get-proto": "^1.0.1",
+                "gopd": "^1.2.0",
+                "has-tostringtag": "^1.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/wildcard": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",

public/js/custom.js

@@ -15,7 +15,7 @@ function getNode(item) {
 	$.ajax({
 		url: '/frame',
 		method: 'POST',
-		data: { key: item },
+		data: { _key: item },
 		dataType: 'html',
 		beforeSend: function() {
 			content = $('.main-content')
@@ -37,10 +37,10 @@ function getNode(item) {
 				$('.main-content').empty().append(e.responseText);
 				break;
 			case 409:	// Not in root
-				location.replace('/#'+item);
-				break;
 			case 419:	// Session Expired
 				location.replace('/#'+item);
+				// When the session expires, and we are in the tree, we need to force a reload
+				if (location.pathname === '/')
 					location.reload();
 				break;
 			case 500:
@@ -96,7 +96,7 @@ $(document).ready(function() {
 		lazyLoad: function(event,data) {
 			data.result = {
 				url: '/ajax/children',
-				data: {key: data.node.data.item,depth: 1}
+				data: {_key: data.node.data.item,depth: 1}
 			};
 
 			expandChildren(data.tree.rootNode);

public/js/template.js

@@ -0,0 +1,23 @@
+/* JavaScript template engine abstraction layer */
+/* Currently implemented for jquery */
+
+// Get a value from an attribute
+function get_attribute(attribute,start,end) {
+	var val = $('#'+attribute).find('input').val();
+
+	return ((start !== undefined) && (end !== undefined))
+		? val.substring(start,end)
+		: val;
+}
+
+// Put a value to an attribute
+function put_attribute(attribute,result) {
+	// Get the value, if the value hasnt changed, then we dont need to do anything
+	if (get_attribute(attribute) === result)
+		return;
+
+	$('#'+attribute)
+		.find('input')
+		.val(result)
+		.trigger('change');
+}

public/js/toAscii.js

@@ -0,0 +1,81 @@
+//
+// Purpose of this file is to remap characters as ASCII characters
+//
+//
+
+var to_ascii_array = new Array();
+to_ascii_array['à'] = 'a';
+to_ascii_array['á'] = 'a';
+to_ascii_array['â'] = 'a';
+to_ascii_array['À'] = 'a';
+to_ascii_array['ã'] = 'a';
+to_ascii_array['Ã¥'] = 'a';
+to_ascii_array['À'] = 'A';
+to_ascii_array['Á'] = 'A';
+to_ascii_array['Ä'] = 'A';
+to_ascii_array['Â'] = 'A';
+to_ascii_array['Ã'] = 'A';
+to_ascii_array['Å'] = 'A';
+to_ascii_array['é'] = 'e';
+to_ascii_array['Ú'] = 'e';
+to_ascii_array['ë'] = 'e';
+to_ascii_array['ê'] = 'e';
+to_ascii_array['€'] = 'E';
+to_ascii_array['ï'] = 'i';
+to_ascii_array['î'] = 'i';
+to_ascii_array['ì'] = 'i';
+to_ascii_array['í'] = 'i';
+to_ascii_array['Ï'] = 'I';
+to_ascii_array['Î'] = 'I';
+to_ascii_array['Ì'] = 'I';
+to_ascii_array['Í'] = 'I';
+to_ascii_array['ò'] = 'o';
+to_ascii_array['ó'] = 'o';
+to_ascii_array['ÃŽ'] = 'o';
+to_ascii_array['õ'] = 'o';
+to_ascii_array['ö'] = 'o';
+to_ascii_array['Þ'] = 'o';
+to_ascii_array['Ò'] = 'O';
+to_ascii_array['Ó'] = 'O';
+to_ascii_array['Ô'] = 'O';
+to_ascii_array['Õ'] = 'O';
+to_ascii_array['Ö'] = 'O';
+to_ascii_array['Ø'] = 'O';
+to_ascii_array['ù'] = 'u';
+to_ascii_array['ú'] = 'u';
+to_ascii_array['Ì'] = 'u';
+to_ascii_array['û'] = 'u';
+to_ascii_array['Ù'] = 'U';
+to_ascii_array['Ú'] = 'U';
+to_ascii_array['Ü'] = 'U';
+to_ascii_array['Û'] = 'U';
+to_ascii_array['Ê'] = 'ae';
+to_ascii_array['Æ'] = 'AE';
+to_ascii_array['Ü'] = 'y';
+to_ascii_array['ÿ'] = 'y';
+to_ascii_array['ß'] = 'SS';
+to_ascii_array['Ç'] = 'C';
+to_ascii_array['ç'] = 'c';
+to_ascii_array['Ñ'] = 'N';
+to_ascii_array['ñ'] = 'n';
+to_ascii_array['¢'] = 'c';
+to_ascii_array['©'] = '(C)';
+to_ascii_array['®'] = '(R)';
+to_ascii_array['«'] = '<<';
+to_ascii_array['»'] = '>>';
+
+function toAscii(text) {
+    //var text = field.value;
+    var output = '';
+
+    for (position=0; position < text.length; position++) {
+        var tmp = text.substring(position,position+1);
+
+        if (to_ascii_array[tmp] !== undefined)
+            tmp = to_ascii_array[tmp];
+
+        output += tmp;
+    }
+
+    return output;
+}

resources/themes/architect/views/layouts/partials/scripts.blade.php

@@ -18,3 +18,8 @@
 	<!-- Any Custom JS -->
 	<script src="{{ asset('js/custom.js') }}"></script>
 @endif
+
+@if(file_exists('js/template.js'))
+	<!-- Template Engine JS -->
+	<script src="{{ asset('js/template.js') }}"></script>
+@endif

resources/themes/architect/views/layouts/partials/topmenu.blade.php

@@ -169,6 +169,9 @@
 			$('button[id^="link-"]').on('click',function(item) {
 				var content;
 
+				// Remove our fancy-tree highlight, since we are rendering the frame
+				$('.fancytree-node.fancytree-active').removeClass('fancytree-active');
+
 				$.ajax({
 					url: $(this).data('link'),
 					method: 'GET',

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

@@ -7,6 +7,10 @@
 				<span class="d-flex justify-content-between">
 					<span style="width: 20em;">
 						<strong class="align-middle"><abbr title="{{ $o->description }}">{{ $o->name }}</abbr></strong>
+						@if($new && $template?->onChange($o->name)->count())
+							<sup data-bs-toggle="tooltip" title="@lang('Value calculated by template')"><i class="fas fa-wand-magic-sparkles"></i></sup>
+						@endif
+
 						@if($o->hints->count())
 							<sup>
 								[

resources/views/components/attribute.blade.php

@@ -34,3 +34,15 @@
 		</div>
 	</div>
 </x-attribute.layout>
+
+@if($new && ($x=$template?->onChange($o->name))?->count())
+	@section('page-scripts')
+		<!-- START: ONCHANGE PROCESSING {{ $o->name }} -->
+		<script type="text/javascript">
+			$('#{{ $o->name_lc }}').on('change',function() {
+				{!! $x->join('') !!}
+			});
+		</script>
+		<!-- END: ONCHANGE PROCESSING {{ $o->name }} -->
+	@append
+@endif

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

@@ -4,7 +4,7 @@
 		@foreach(($o->tagValues($langtag)->count() ? $o->tagValues($langtag) : [$langtag => NULL]) as $key => $value)
 			@if($edit)
 				<div class="input-group has-validation">
-					<x-form.select id="userpassword_hash_{{$loop->index}}{{$template ?? ''}}" name="userpassword_hash[{{ $langtag }}][]" :value="$o->hash($new ? '' : ($value ?? ''))->id()" :options="$helpers" allowclear="false" :disabled="! $new"/>
+					<x-form.select id="userpassword_hash_{{$loop->index}}{{$template?->name ?? ''}}" name="_userpassword_hash[{{ $langtag }}][]" :value="$o->hash($new ? '' : ($value ?? ''))->id()" :options="$helpers" allowclear="false" :disabled="! $new"/>
 					<input type="password" @class(['form-control','is-invalid'=>($e=$errors->get($o->name_lc.'.'.$langtag.'.'.$loop->index)),'mb-1','border-focus'=>! $o->tagValuesOld($langtag)->contains($value),'bg-success-subtle'=>$updated]) name="{{ $o->name_lc }}[{{ $langtag }}][]" value="{{ Arr::get(old($o->name_lc),$langtag.'.'.$loop->index,$value ? md5($value) : '') }}" @readonly(! $new)>
 
 					<div class="invalid-feedback pb-2">

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

@@ -3,24 +3,24 @@
 	@foreach(($o->values->count() ? $o->values : [NULL]) as $value)
 		@if($edit)
 			<div class="input-group has-validation mb-3">
-				<select class="form-select @error('rdn')is-invalid @enderror" id="rdn" name="rdn">
+				<select @class(['form-select','is-invalid'=>$errors->get('_rdn')]) id="rdn" name="_rdn">
 					<option value=""></option>
 
 					@foreach($o->attrs->map(fn($item)=>['id'=>$item,'value'=>$item]) as $option)
 						@continue(! Arr::get($option,'value'))
-						<option value="{{ strtolower(Arr::get($option,'id')) }}" @selected(Arr::get($option,'id') == old('rdn',$value ?? ''))>{{ Arr::get($option,'value') }}</option>
+						<option value="{{ strtolower(Arr::get($option,'id')) }}" @selected(Arr::get($option,'id') == old('_rdn',$value ?? ''))>{{ Arr::get($option,'value') }}</option>
 					@endforeach
 				</select>
 
 				<span class="input-group-text">=</span>
-				<input type="text" @class(['form-control','is-invalid'=>$errors->get('rdn_value')]) id="rdn_value" name="rdn_value" value="{{ old('rdn_value') }}" placeholder="rdn">
+				<input type="text" @class(['form-control','is-invalid'=>$errors->get('_rdn_value')]) id="rdn_value" name="_rdn_value" value="{{ old('_rdn_value') }}" placeholder="rdn">
 				<label class="input-group-text" for="inputGroupSelect02">,{{ $o->base }}</label>
 
 				<div class="invalid-feedback pb-2">
-					@error('rdn')
+					@error('_rdn')
 						{{ $message }}
 					@enderror
-					@error('rdn_value')
+					@error('_rdn_value')
 						{{ $message }}
 					@enderror
 				</div>

resources/views/errors/501.blade.php

@@ -0,0 +1,33 @@
+@extends('architect::layouts.error')
+
+@section('error')
+	501: @lang('LDAP Authentication Error')
+@endsection
+
+@section('content')
+	<table class="table table-sm table-borderless table-condensed">
+		<tr>
+			<th>@lang('Error')</th>
+		</tr>
+
+		<tr>
+			<td colspan="2">{{ $exception->getMessage() }}</td>
+		</tr>
+
+		<tr>
+			<th>@lang('Possible Causes')</th>
+		</tr>
+		<tr>
+			<td>
+				<ul class="ps-3">
+					<li>The DN you used to login actually doesnt exist in the server (DN's must exist in order to login)</li>
+					<li>You are attempting to use the <strong>rootdn</strong> to login (not supported)</li>
+				</ul>
+			</td>
+		</tr>
+	</table>
+
+	<p>To suppress this message, set <strong>LDAP_ALERT_ROOTDN</strong> to <strong>FALSE</strong> before starting PLA.</p>
+	<p>Back to <a href="{{ url('login') }}">login</a>?</p>
+
+@endsection

resources/views/fragment/template/dn.blade.php

@@ -9,7 +9,7 @@
 			@php($up=(session()->pull('updated') ?: collect()))
 
 			@foreach($o->getVisibleAttributes()->filter(fn($item)=>$template->attributes->map('strtolower')->contains($item->name_lc)) as $ao)
-				<x-attribute-type :o="$ao" :edit="TRUE" :new="FALSE" :template="$template->name" :updated="$up->contains($ao->name_lc)"/>
+				<x-attribute-type :o="$ao" :edit="TRUE" :new="FALSE" :template="$template" :updated="$up->contains($ao->name_lc)"/>
 			@endforeach
 		</div>
 	</div>

resources/views/frames/create.blade.php

@@ -24,8 +24,8 @@
 					<form id="dn-create" method="POST" class="needs-validation" action="{{ url((int)$step === 2 ? 'entry/create' : 'entry/add') }}" enctype="multipart/form-data" novalidate>
 						@csrf
 
-						<input type="hidden" name="key" value="{{ Crypt::encryptString('*create|'.$container) }}">
+						<input type="hidden" name="_key" value="{{ Crypt::encryptString('*create|'.$container) }}">
-						<input type="hidden" name="step" value="{{ $step }}">
+						<input type="hidden" name="_step" value="{{ $step }}">
 
 						@switch($step)
 							@case(1)
@@ -63,10 +63,11 @@
 								@break
 
 							@case(2)
-								<x-attribute-type :o="$o->getObject('rdn')" :edit="TRUE" :new="FALSE" :updated="FALSE"/>
+								<input type="hidden" name="_template" value="{{ $template?->file }}">
+								<x-attribute-type :o="$o->getObject('rdn')" :edit="TRUE" :new="TRUE" :template="$template" :updated="FALSE"/>
 
 								@foreach($o->getVisibleAttributes() as $ao)
-									<x-attribute-type :o="$ao" :edit="TRUE" :new="FALSE" :updated="FALSE"/>
+									<x-attribute-type :o="$ao" :edit="TRUE" :new="TRUE" :template="$template" :updated="FALSE"/>
 								@endforeach
 
 								@if(! $template)

resources/views/frames/dn.blade.php

@@ -75,8 +75,8 @@
 								<div class="d-flex justify-content-center">
 									<div role="group" class="btn-group btn-group-sm nav pb-3">
 										<!-- If we have templates that cover this entry -->
-										@foreach($o->templates as $template => $name)
+										@foreach($o->templates as $template)
-											<span data-bs-toggle="tab" href="#template-{{$template}}" @class(['btn','btn-outline-focus','active'=>$loop->index === 0])><i class="fa fa-fw pe-2 {{ $o->template($template)->icon }}"></i> {{ $name }}</span>
+											<span data-bs-toggle="tab" href="#template-{{ $template->name }}" @class(['btn','btn-outline-focus','active'=>$loop->index === 0])><i class="fa fa-fw pe-2 {{ $template->icon }}"></i> {{ $template->title }}</span>
 										@endforeach
 										@if($o->templates->count())
 											<span data-bs-toggle="tab" href="#template-default" @class(['btn','btn-outline-focus','p-1','active'=>(! $o->templates->count())])>{{ __('LDAP Entry') }}</span>
@@ -85,9 +85,9 @@
 								</div>
 
 								<div class="tab-content">
-									@foreach($o->templates as $template => $name)
+									@foreach($o->templates as $template)
-										<div @class(['tab-pane','active'=>$loop->index === 0]) id="template-{{$template}}" role="tabpanel">
+										<div @class(['tab-pane','active'=>$loop->index === 0]) id="template-{{ $template->name }}" role="tabpanel">
-											@include('fragment.template.dn',['template'=>$o->template($template)])
+											@include('fragment.template.dn',['template'=>$template])
 										</div>
 									@endforeach
 
@@ -101,7 +101,7 @@
 												<div class="tab-content">
 													@php($up=(session()->pull('updated') ?: collect()))
 													@foreach($o->getVisibleAttributes() as $ao)
-														<x-attribute-type :o="$ao" :edit="TRUE" :new="FALSE" :updated="$up->contains($ao->name_lc)"/>
+														<x-attribute-type :o="$ao" :edit="TRUE" :new="FALSE" :template="$template ?? NULL" :updated="$up->contains($ao->name_lc)"/>
 													@endforeach
 
 													@include('fragment.dn.add_attr')
@@ -124,7 +124,7 @@
 					<!-- Internal Attributes -->
 					<div class="tab-pane mt-3" id="internal" role="tabpanel">
 						@foreach($o->getInternalAttributes() as $ao)
-							<x-attribute-type :o="$ao" :edit="FALSE" :new="FALSE" :updated="FALSE"/>
+							<x-attribute-type :o="$ao" :edit="FALSE" :new="FALSE" :template="$template ?? NULL" :updated="FALSE"/>
 						@endforeach
 					</div>
 				</div>

resources/views/frames/import.blade.php

@@ -15,7 +15,7 @@
 			<div class="main-card mb-3 card">
 				<form id="import-form" action="{{ url('import/process/ldif') }}" method="POST" enctype="multipart/form-data">
 					@csrf
-					<input type="hidden" name="key" value="{{ Crypt::encryptString('*import|_NOP') }}">
+					<input type="hidden" name="_key" value="{{ Crypt::encryptString('*import|_NOP') }}">
 
 					<div class="card-header">
 						@lang('LDIF Import')

resources/views/home.blade.php

@@ -44,6 +44,12 @@
 						<li class="ps-0 p-1">
 							<i class="fas fa-fw fa-sitemap me-2"></i> Hierarchical Tree View
 						</li>
+						<li class="ps-0 p-1">
+							<i class="fas fa-fw fa-clone me-2"></i> Creation and Modification Templates
+						</li>
+						<li class="ps-0 p-1">
+							<i class="fas fa-fw fa-magnifying-glass-chart me-2"></i> Data Rich Attribute Values
+						</li>
 						<li class="ps-0 p-1">
 							<i class="fas fa-fw fa-language me-2"></i> Multi-language Support
 						</li>

templates/user_account.json

@@ -15,7 +15,7 @@
 		"givenName": {
 			"display": "First Name",
 			"onchange": [
-				"=autoFill(cn;%givenName% %sn%)",
+				"=autoFill(cn;%givenName% %sn/U%)",
 				"=autoFill(uid;%givenName|0-1/l%%sn/l%)"
 			],
 			"order": 1
@@ -23,7 +23,7 @@
 		"sn": {
 			"display": "Last Name",
 			"onchange": [
-				"=autoFill(cn;%givenName% %sn%)",
+				"=autoFill(cn;%givenName% %sn/U%)",
 				"=autoFill(uid;%givenName|0-1/l%%sn/l%)"
 			],
 			"order": 2

tests/Feature/ImportTest.php

@@ -34,7 +34,7 @@ class ImportTest extends TestCase
 			->from('/import')
 			->post('/import/process/ldif',[
 				'_token' => csrf_token(),
-				'key'=>Crypt::encryptString('*import|_NOP'),
+				'_key'=>Crypt::encryptString('*import|_NOP'),
 				'file' => $file,
 			]);