From eb6e0b8d43dfe336cc377ea27dcd41f0358fedbb Mon Sep 17 00:00:00 2001 From: Deon George Date: Fri, 14 Mar 2025 08:25:32 +1100 Subject: [PATCH] Include LDAP diagnostic error message when we have an LDAP error --- app/Http/Controllers/HomeController.php | 38 +++++++++++-------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 4bb2d7ab..e808252f 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -136,17 +136,14 @@ class HomeController extends Controller // @todo when we create an entry, and it already exists, enable a redirect to it } catch (LdapRecordException $e) { - $request->flash(); - - switch ($x=$e->getDetailedError()->getErrorCode()) { - case 8: - return Redirect::to('/') - ->withInput() - ->withErrors(sprintf('%s: %s (%s)',__('LDAP Server Error Code'),$x,__($e->getDetailedError()->getErrorMessage()))); - - default: - abort(599,$e->getDetailedError()->getErrorMessage()); - } + return Redirect::back() + ->withInput() + ->withErrors(sprintf('%s: %s - %s: %s', + __('LDAP Server Error Code'), + $e->getDetailedError()->getErrorCode(), + __($e->getDetailedError()->getErrorMessage()), + $e->getDetailedError()->getDiagnosticMessage(), + )); } return Redirect::to('/') @@ -345,17 +342,14 @@ class HomeController extends Controller } } catch (LdapRecordException $e) { - $request->flash(); - - switch ($x=$e->getDetailedError()->getErrorCode()) { - case 8: - return Redirect::to('/') - ->withInput() - ->withErrors(sprintf('%s: %s (%s)',__('LDAP Server Error Code'),$x,__($e->getDetailedError()->getErrorMessage()))); - - default: - abort(599,$e->getDetailedError()->getErrorMessage()); - } + return Redirect::to('/') + ->withInput() + ->withErrors(sprintf('%s: %s - %s: %s', + __('LDAP Server Error Code'), + $e->getDetailedError()->getErrorCode(), + __($e->getDetailedError()->getErrorMessage()), + $e->getDetailedError()->getDiagnosticMessage(), + )); } return Redirect::to('/')