From 4f957bcf7191ce17bbc33b958a5b60968fb3264f Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 9 Oct 2024 18:34:53 +0100
Subject: [PATCH] Required flag

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Requests/StoreLdapSettings.php | 11 ++++++-----
 resources/lang/en-US/validation.php     |  6 ++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

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' => '<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.',
+            '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' => '<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.',
+
         ],
     /*
     |--------------------------------------------------------------------------