Fix rendering of error message, minor changes to login as a result of ba9124c. Record in README we can now do deletes

README.md

@@ -32,7 +32,7 @@ Take a look at the [Docker Container](https://github.com/leenooks/phpLDAPadmin/w
 The update to v2 is progressing well - here is a list of work to do and done:
 
 - [X] Creating new LDAP entries
-- [ ] Delete existing LDAP entries
+- [X] Delete existing LDAP entries
 - [X] Updating existing LDAP Entries
   - [X] Password attributes
     - [X] Support different password hash options

app/Http/Middleware/SwapinAuthUser.php

@@ -25,6 +25,9 @@ class SwapinAuthUser
 	{
 		$key = config('ldap.default');
 
+		if (! array_key_exists($key,config('ldap.connections')))
+			abort(599,sprintf('LDAP default server [%s] configuration doesnt exist?',$key));
+
 		/*
 		// Rebuild our connection with the authenticated user.
 		if (Session::has('username_encrypt') && Session::has('password_encrypt')) {

config/ldap.php

@@ -15,7 +15,7 @@ return [
 	|
 	*/
 
-	'default' => env('LDAP_CONNECTION', 'openldap'),
+	'default' => env('LDAP_CONNECTION', 'ldap'),
 
 	/*
 	|--------------------------------------------------------------------------
@@ -30,7 +30,7 @@ return [
 
 	'connections' => [
 
-		'openldap' => [
+		'ldap' => [
 			'hosts' => [env('LDAP_HOST', '127.0.0.1')],
 			'username' => env('LDAP_USERNAME', 'cn=user,dc=local,dc=com'),
 			'password' => env('LDAP_PASSWORD', 'secret'),
@@ -42,7 +42,7 @@ return [
 			'name' => env('LDAP_NAME','LDAP Server'),
 		],
 
-		'openldaps' => [
+		'ldaps' => [
 			'hosts' => [env('LDAP_HOST', '127.0.0.1')],
 			'username' => env('LDAP_USERNAME', 'cn=user,dc=local,dc=com'),
 			'password' => env('LDAP_PASSWORD', 'secret'),
@@ -54,7 +54,7 @@ return [
 			'name' => env('LDAP_NAME','LDAPS Server'),
 		],
 
-		'openldaptls' => [
+		'starttls' => [
 			'hosts' => [env('LDAP_HOST', '127.0.0.1')],
 			'username' => env('LDAP_USERNAME', 'cn=user,dc=local,dc=com'),
 			'password' => env('LDAP_PASSWORD', 'secret'),
@@ -66,6 +66,7 @@ return [
 			'name' => env('LDAP_NAME','LDAP-TLS Server'),
 		],
 
+		/*
 		'opendj' => [
 			'hosts' => ['opendj'],
 			'username' => 'cn=Directory Manager',
@@ -77,6 +78,7 @@ return [
 			'use_tls' => env('LDAP_TLS', false),
 			'name' => 'OpenDJ Server',
 		],
+		*/
 
 	],
 
@@ -174,4 +176,4 @@ return [
 			]
 		],
 	],
-];
+];

resources/themes/architect/views/auth/login.blade.php

@@ -10,7 +10,7 @@
 		<div class="app-container">
 			<div class="h-100 bg-animation">
 				<div class="d-flex h-100 justify-content-center align-items-center">
-					<div class="mx-auto app-login-box col-md-8">
+					<div class="mx-auto col-12 col-sm-8">
 						<x-file-note file="login-note.html"/>
 
 						<div class="modal-dialog modal-lg">

resources/themes/architect/views/layouts/error.blade.php

@@ -11,16 +11,16 @@
 		<div class="app-container">
 			<div class="h-100 bg-animation">
 				<div class="d-flex h-100 justify-content-center align-items-center">
-					<div class="mx-auto app-login-box col-md-8">
+					<div class="mx-auto col-12 col-sm-8">
 
-						<div class="modal-dialog w-100 mx-auto">
+						<div class="modal-dialog modal-lg">
 							<div class="modal-content">
-								<div class="modal-header">
+								<div class="modal-header p-3">
 									<img class="w-25" src="{{ url('images/logo-h-lg.png') }}">
 									<span class="card-header-title text-danger ms-auto fs-4">@yield('title')</span>
 								</div>
 
-								<div class="modal-body">
+								<div class="modal-body p-3">
 									<div class="text-center">
 										<span class="badge text-danger fsize-2 mb-3">@yield('error')</span>
 									</div>