From 93640959db27515f23f9aea7eaa7dfd4b98baeef Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Sun, 16 Mar 2025 09:03:02 +1100
Subject: [PATCH] Add our request()->root() to our debug page, implement
 Entry::getSortKeyAttribute()

---
 app/Ldap/Entry.php              |  3 +--
 resources/views/debug.blade.php | 10 ++++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/Ldap/Entry.php b/app/Ldap/Entry.php
index 0fc56313..e9653785 100644
--- a/app/Ldap/Entry.php
+++ b/app/Ldap/Entry.php
@@ -133,11 +133,10 @@ class Entry extends Model
 	 * Return a key to use for sorting
 	 *
 	 * @return string
-	 * @todo This should be the DN in reverse order
 	 */
 	public function getSortKeyAttribute(): string
 	{
-		return $this->getDn();
+		return collect(explode(',',$this->getDn()))->reverse()->join(',');
 	}
 
 	/* METHODS */
diff --git a/resources/views/debug.blade.php b/resources/views/debug.blade.php
index c72b0d5b..17622d02 100644
--- a/resources/views/debug.blade.php
+++ b/resources/views/debug.blade.php
@@ -24,7 +24,7 @@
 						<td>BaseDN(s)</td>
 						<td>
 							<table class="table table-sm table-borderless">
-								@foreach(\App\Classes\LDAP\Server::baseDNs()->sort(function($item) { return $item->sortKey; }) as $item)
+								@foreach($server->baseDNs()->sort(fn($item)=>$item->sort_key) as $item)
 									<tr>
 										<td class="ps-0">{{ $item->getDn() }}</td>
 									</tr>
@@ -36,7 +36,13 @@
 					<!-- Schema DN -->
 					<tr>
 						<td>Schema DN</td>
-						<td>{{ \App\Classes\LDAP\Server::schemaDN() }}</td>
+						<td>{{ $server->schemaDN() }}</td>
+					</tr>
+
+					<!-- Schema DN -->
+					<tr>
+						<td>Root URL</td>
+						<td>{{ request()->root() }}</td>
 					</tr>
 					</tbody>
 				</table>