diff --git a/app/Http/Requests/StoreLdapSettings.php b/app/Http/Requests/StoreLdapSettings.php
index 50a066f134..48979b01a5 100644
--- a/app/Http/Requests/StoreLdapSettings.php
+++ b/app/Http/Requests/StoreLdapSettings.php
@@ -23,18 +23,19 @@ class StoreLdapSettings extends FormRequest
public function rules(): array
{
return [
- 'ldap_username_field' => 'not_in:sAMAccountName',
+ 'ldap_username_field' => 'not_in:sAMAccountName|required_if:ldap_enabled,1',
'ldap_auth_filter_query' => 'not_in:uid=samaccountname|required_if:ldap_enabled,1',
'ldap_filter' => 'nullable|regex:"^[^(]"|required_if:ldap_enabled,1',
];
}
- public function messages() : array
+ public function messages(): array
{
return [
- 'ldap_username_field.not_in' => 'sAMAccountName (mixed case) will likely not work. You should use samaccountname (lowercase) instead. ',
- 'ldap_auth_filter_query.not_in' => 'uid=samaccountname is probably not a valid auth filter. You probably want uid= ',
- 'ldap_filter.regex' => 'This value should probably not be wrapped in parentheses.',
+ 'ldap_username_field' => trans('validation.custom.ldap_username_field.not_in'),
+ 'ldap_auth_filter_query' => trans('validation.custom.ldap_auth_filter_query.not_in'),
+ 'ldap_filter' => trans('validation.custom.ldap_filter.regex'),
];
}
+
}
diff --git a/resources/lang/en-US/validation.php b/resources/lang/en-US/validation.php
index 6341707914..2b025d5db2 100644
--- a/resources/lang/en-US/validation.php
+++ b/resources/lang/en-US/validation.php
@@ -173,6 +173,7 @@ return [
'ulid' => 'The :attribute field must be a valid ULID.',
'uuid' => 'The :attribute field must be a valid UUID.',
+
/*
|--------------------------------------------------------------------------
| Custom Validation Language Lines
@@ -206,6 +207,11 @@ return [
'checkboxes' => ':attribute contains invalid options.',
'radio_buttons' => ':attribute is invalid.',
'invalid_value_in_field' => 'Invalid value included in this field',
+
+ 'ldap_username_field.not_in' => 'sAMAccountName (mixed case) will likely not work. You should use samaccountname (lowercase) instead. ',
+ 'ldap_auth_filter_query.not_in' => 'uid=samaccountname is probably not a valid auth filter. You probably want uid= ',
+ 'ldap_filter.regex' => 'This value should probably not be wrapped in parentheses.',
+
],
/*
|--------------------------------------------------------------------------