deon/phpldapadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LDAP server errors were not being displayed when used with ->withErrors(), so created a new component x-failed

Browse Source
This commit is contained in:
Deon George 2025-05-03 22:18:32 +10:00
parent ffb98631a6
commit 309fe83c98
4 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/HomeController.php
View File

@ -127,7 +127,7 @@ class HomeController extends Controller
case 50: case 50:
return Redirect::to('/') return Redirect::to('/')
->withInput() ->withInput()
->withErrors(sprintf('%s: %s (%s)',__('LDAP Server Error Code'),$x,__($e->getDetailedError()->getErrorMessage()))); ->with('failed',sprintf('%s: %s (%s)',__('LDAP Server Error Code'),$x,__($e->getDetailedError()->getErrorMessage())));
default: default:
abort(599,$e->getDetailedError()->getErrorMessage()); abort(599,$e->getDetailedError()->getErrorMessage());
@ -137,7 +137,7 @@ class HomeController extends Controller
} catch (LdapRecordException $e) { } catch (LdapRecordException $e) {
return Redirect::back() return Redirect::back()
->withInput() ->withInput()
->withErrors(sprintf('%s: %s - %s: %s', ->with('failed',sprintf('%s: %s - %s: %s',
__('LDAP Server Error Code'), __('LDAP Server Error Code'),
$e->getDetailedError()->getErrorCode(), $e->getDetailedError()->getErrorCode(),
__($e->getDetailedError()->getErrorMessage()), __($e->getDetailedError()->getErrorMessage()),
@ -165,7 +165,7 @@ class HomeController extends Controller
case 50: case 50:
return Redirect::to('/') return Redirect::to('/')
->withInput() ->withInput()
->withErrors(sprintf('%s: %s (%s)',__('LDAP Server Error Code'),$x,__($e->getDetailedError()->getErrorMessage()))); ->with('failed',sprintf('%s: %s (%s)',__('LDAP Server Error Code'),$x,__($e->getDetailedError()->getErrorMessage())));
default: default:
abort(599,$e->getDetailedError()->getErrorMessage()); abort(599,$e->getDetailedError()->getErrorMessage());
@ -178,7 +178,7 @@ class HomeController extends Controller
case 8: case 8:
return Redirect::to('/') return Redirect::to('/')
->withInput() ->withInput()
->withErrors(sprintf('%s: %s (%s)',__('LDAP Server Error Code'),$x,__($e->getDetailedError()->getErrorMessage()))); ->with('failed',sprintf('%s: %s (%s)',__('LDAP Server Error Code'),$x,__($e->getDetailedError()->getErrorMessage())));
default: default:
abort(599,$e->getDetailedError()->getErrorMessage()); abort(599,$e->getDetailedError()->getErrorMessage());
@ -335,7 +335,7 @@ class HomeController extends Controller
case 50: case 50:
return Redirect::to('/') return Redirect::to('/')
->withInput() ->withInput()
->withErrors(sprintf('%s: %s (%s)',__('LDAP Server Error Code'),$x,__($e->getDetailedError()->getErrorMessage()))); ->with('failed',sprintf('%s: %s (%s)',__('LDAP Server Error Code'),$x,__($e->getDetailedError()->getErrorMessage())));
default: default:
abort(599,$e->getDetailedError()->getErrorMessage()); abort(599,$e->getDetailedError()->getErrorMessage());
@ -344,7 +344,7 @@ class HomeController extends Controller
} catch (LdapRecordException $e) { } catch (LdapRecordException $e) {
return Redirect::to('/') return Redirect::to('/')
->withInput() ->withInput()
->withErrors(sprintf('%s: %s - %s: %s', ->with('failed',sprintf('%s: %s - %s: %s',
__('LDAP Server Error Code'), __('LDAP Server Error Code'),
$e->getDetailedError()->getErrorCode(), $e->getDetailedError()->getErrorCode(),
__($e->getDetailedError()->getErrorMessage()), __($e->getDetailedError()->getErrorMessage()),

5
resources/views/components/failed.blade.php Normal file
View File

@ -0,0 +1,5 @@
@if(session()->has('failed'))
<div class="alert alert-danger p-2">
<p class="m-0"><i class="fas fa-fw fa-thumbs-down"></i> {{ session()->pull('failed') }}</p>
</div>
@endif

1
resources/views/frames/create.blade.php
View File

@ -11,6 +11,7 @@
@section('page_status') @section('page_status')
<x-error/> <x-error/>
<x-failed/>
@endsection @endsection
@section('main-content') @section('main-content')

1
resources/views/frames/dn.blade.php
View File

@ -67,6 +67,7 @@
<x-note/> <x-note/>
<x-error/> <x-error/>
<x-updated/> <x-updated/>
<x-failed/>
@endsection @endsection
@section('main-content') @section('main-content')