DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 06:17:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Required flag

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2024-10-09 18:34:53 +01:00
parent 5cda7cce48
commit 4f957bcf71
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Http/Requests/StoreLdapSettings.php
View file

@ -23,18 +23,19 @@ class StoreLdapSettings extends FormRequest
public function rules(): array public function rules(): array
{ {
return [ 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_auth_filter_query' => 'not_in:uid=samaccountname|required_if:ldap_enabled,1',
'ldap_filter' => 'nullable|regex:"^[^(]"|required_if:ldap_enabled,1', 'ldap_filter' => 'nullable|regex:"^[^(]"|required_if:ldap_enabled,1',
]; ];
} }
public function messages() : array public function messages(): array
{ {
return [ return [
'ldap_username_field.not_in' => '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead. ', 'ldap_username_field' => trans('validation.custom.ldap_username_field.not_in'),
'ldap_auth_filter_query.not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> ', 'ldap_auth_filter_query' => trans('validation.custom.ldap_auth_filter_query.not_in'),
'ldap_filter.regex' => 'This value should probably not be wrapped in parentheses.', 'ldap_filter' => trans('validation.custom.ldap_filter.regex'),
]; ];
} }
} }

6
resources/lang/en-US/validation.php
View file

@ -173,6 +173,7 @@ return [
'ulid' => 'The :attribute field must be a valid ULID.', 'ulid' => 'The :attribute field must be a valid ULID.',
'uuid' => 'The :attribute field must be a valid UUID.', 'uuid' => 'The :attribute field must be a valid UUID.',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Custom Validation Language Lines | Custom Validation Language Lines
@ -206,6 +207,11 @@ return [
'checkboxes' => ':attribute contains invalid options.', 'checkboxes' => ':attribute contains invalid options.',
'radio_buttons' => ':attribute is invalid.', 'radio_buttons' => ':attribute is invalid.',
'invalid_value_in_field' => 'Invalid value included in this field', 'invalid_value_in_field' => 'Invalid value included in this field',
'ldap_username_field.not_in' => '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead. ',
'ldap_auth_filter_query.not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> ',
'ldap_filter.regex' => 'This value should probably not be wrapped in parentheses.',
], ],
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------