From 7e0d1eb0e39e06a393b07052450a03f4e2fbe964 Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Sun, 16 Feb 2025 14:05:41 +1100
Subject: [PATCH] Get our server name from config

---
 app/Classes/LDAP/Server.php                      | 16 +++++++++-------
 .../views/layouts/partials/sidebarmenu.blade.php |  2 +-
 resources/views/frames/import.blade.php          |  2 +-
 resources/views/frames/import_result.blade.php   |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/Classes/LDAP/Server.php b/app/Classes/LDAP/Server.php
index 161a8b5..bda5e16 100644
--- a/app/Classes/LDAP/Server.php
+++ b/app/Classes/LDAP/Server.php
@@ -4,6 +4,7 @@ namespace App\Classes\LDAP;
 
 use Carbon\Carbon;
 use Exception;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Config;
@@ -36,7 +37,7 @@ final class Server
 	public const OC_ABSTRACT = 0x02;
 	public const OC_AUXILIARY = 0x03;
 
-	public function __construct(string $connection=NULL)
+	public function __construct(?string $connection=NULL)
 	{
 		$this->connection = $connection;
 	}
@@ -49,6 +50,8 @@ final class Server
 			'ldapsyntaxes' => $this->ldapsyntaxes,
 			'matchingrules' => $this->matchingrules,
 			'objectclasses' => $this->objectclasses,
+			'config' => config('ldap.connections.'.config('ldap.default')),
+			'name' => Arr::get($this->config,'name',__('No Server Name Yet')),
 			default => throw new Exception('Unknown key:' . $key),
 		};
 	}
@@ -66,7 +69,7 @@ final class Server
 	 * @testedin GetBaseDNTest::testBaseDNExists();
 	 * @todo Need to allow for the scenario if the baseDN is not readable by ACLs
 	 */
-	public static function baseDNs(string $connection=NULL,bool $objects=TRUE): Collection
+	public static function baseDNs(?string $connection=NULL,bool $objects=TRUE): Collection
 	{
 		$cachetime = Carbon::now()
 			->addSeconds(Config::get('ldap.cache.time'));
@@ -211,7 +214,7 @@ final class Server
 	 * @throws ObjectNotFoundException
 	 * @testedin TranslateOidTest::testRootDSE();
 	 */
-	public static function rootDSE(string $connection=NULL,Carbon $cachetime=NULL): ?Model
+	public static function rootDSE(?string $connection=NULL,Carbon $cachetime=NULL): ?Model
 	{
 		$e = new Entry;
 
@@ -231,7 +234,7 @@ final class Server
 	 * @return string
 	 * @throws ObjectNotFoundException
 	 */
-	public static function schemaDN(string $connection=NULL): string
+	public static function schemaDN(?string $connection=NULL): string
 	{
 		$cachetime = Carbon::now()->addSeconds(Config::get('ldap.cache.time'));
 
@@ -299,10 +302,9 @@ final class Server
 	 *
 	 * @param string $item Schema Item to Fetch
 	 * @param string|null $key
-	 * @return Collection|Base|NULL
-	 * @throws InvalidUsage
+	 * @return Collection|LDAPSyntax|Base|NULL
 	 */
-	public function schema(string $item,string $key=NULL): Collection|LDAPSyntax|Base|NULL
+	public function schema(string $item,?string $key=NULL): Collection|LDAPSyntax|Base|NULL
 	{
 		// Ensure our item to fetch is lower case
 		$item = strtolower($item);
diff --git a/resources/themes/architect/views/layouts/partials/sidebarmenu.blade.php b/resources/themes/architect/views/layouts/partials/sidebarmenu.blade.php
index de19aa2..10dddad 100644
--- a/resources/themes/architect/views/layouts/partials/sidebarmenu.blade.php
+++ b/resources/themes/architect/views/layouts/partials/sidebarmenu.blade.php
@@ -32,7 +32,7 @@
 	<div class="scrollbar-sidebar">
 		<div class="app-sidebar__inner">
 			<ul class="vertical-nav-menu">
-				<li class="app-sidebar__heading">{{ $server ?? __('Server Name') }}</li>
+				<li class="app-sidebar__heading">{{ config('server')->name }}</li>
 				<li>
 					<div class="font-icon-wrapper float-start me-1 server-icon">
 						<a class="p-0 m-0" href="{{ url('info') }}" onclick="return false;" style="display: contents;"><i class="fas fa-fw fa-info"></i></a>
diff --git a/resources/views/frames/import.blade.php b/resources/views/frames/import.blade.php
index 975fea4..8e36a91 100644
--- a/resources/views/frames/import.blade.php
+++ b/resources/views/frames/import.blade.php
@@ -4,7 +4,7 @@
 	<table class="table table-borderless">
 		<tr>
 			<td style="border-radius: 5px;"><div class="page-title-icon f32"><i class="fas fa-upload"></i></div></td>
-			<td class="top text-start align-text-top p-0 pt-2"><strong>@lang('LDIF Import')</strong><br><small>To Server XXX</small></td>
+			<td class="top text-start align-text-top p-0 pt-2"><strong>@lang('LDIF Import')</strong><br><small>@lang('To Server') <strong>{{ config('server')->name }}</strong></small></td>
 		</tr>
 	</table>
 @endsection
diff --git a/resources/views/frames/import_result.blade.php b/resources/views/frames/import_result.blade.php
index 5d81ca0..4835dc0 100644
--- a/resources/views/frames/import_result.blade.php
+++ b/resources/views/frames/import_result.blade.php
@@ -2,7 +2,7 @@
 	<table class="table table-borderless">
 		<tr>
 			<td style="border-radius: 5px;"><div class="page-title-icon f32"><i class="fas fa-upload"></i></div></td>
-			<td class="top text-start align-text-top p-0 pt-2"><strong>@lang('LDIF Import Result')</strong><br><small>To Server XXX</small></td>
+			<td class="top text-start align-text-top p-0 pt-2"><strong>@lang('LDIF Import Result')</strong><br><small>@lang('To Server') <strong>{{ config('server')->name }}</strong></small></td>
 		</tr>
 	</table>
 @endsection