From d64478e449e9587302525b9ec76632c6ccdd2abd Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Fri, 21 Feb 2025 12:22:45 +1100
Subject: [PATCH] Improved trapping of DNS errors when unable to contact LDAP
 server, should help #211

---
 .../architect/views/layouts/error.blade.php   |  2 +-
 resources/views/errors/597.blade.php          | 31 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/resources/themes/architect/views/layouts/error.blade.php b/resources/themes/architect/views/layouts/error.blade.php
index 5e693d1..50a20ae 100644
--- a/resources/themes/architect/views/layouts/error.blade.php
+++ b/resources/themes/architect/views/layouts/error.blade.php
@@ -31,7 +31,7 @@
 										</tr>
 										<tr>
 											<th>Host</th>
-											<td>{{ ($y=collect(config('ldap.connections.'.$x.'.hosts')))->join(',') }} (IP: <strong>{!! $y->transform(function($item) { return collect(dns_get_record($item))->transform(function($item) { return Arr::get($item,'ip',Arr::get($item,'ipv6')); })->filter()->join('</strong>,<strong>'); })->join(',') !!}</strong>)</td>
+											<td>{{ ($y=collect(config('ldap.connections.'.$x.'.hosts')))->join(',') }} (IP: <strong>{!! $y->transform(function($item) { return collect(@dns_get_record($item))->transform(function($item) { return Arr::get($item,'ip',Arr::get($item,'ipv6')); })->filter()->join('</strong>,<strong>'); })->join(',') !!}</strong>)</td>
 										</tr>
 										<tr>
 											<th>Port</th>
diff --git a/resources/views/errors/597.blade.php b/resources/views/errors/597.blade.php
index ed8d472..e36d31d 100644
--- a/resources/views/errors/597.blade.php
+++ b/resources/views/errors/597.blade.php
@@ -5,5 +5,34 @@
 @endsection
 
 @section('content')
-	{{ $exception->getMessage() }}
+	@switch($exception->getMessage())
+		@case("Can't contact LDAP server")
+			<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>
+							<li>@lang('Your LDAP server is not connectable')</li>
+							<li>@lang('Your LDAP server hostname is incorrect')</li>
+							<li>@lang('Your DNS server cannot resolve that hostname')</li>
+							<li>@lang('Your Resolver is not pointing to your DNS server')</li>
+						</ul>
+					</td>
+				</tr>
+			</table>
+			@break
+
+		@default
+			{{ $exception->getMessage() }}
+	@endswitch
 @endsection
\ No newline at end of file