Added Ldap Company as option and FMCS Notification

app/Console/Commands/LdapSync.php

@@ -63,6 +63,7 @@ public function handle()
         $ldap_result_jobtitle = Setting::getSettings()->ldap_jobtitle;
         $ldap_result_country = Setting::getSettings()->ldap_country;
         $ldap_result_location = Setting::getSettings()->ldap_location;
+        $ldap_result_company = Setting::getSettings()->ldap_company;
         $ldap_result_dept = Setting::getSettings()->ldap_dept;
         $ldap_result_manager = Setting::getSettings()->ldap_manager;
         $ldap_default_group = Setting::getSettings()->ldap_default_group;
@@ -230,13 +231,19 @@ public function handle()
                 $item['department'] = $results[$i][$ldap_result_dept][0] ?? '';
                 $item['manager'] = $results[$i][$ldap_result_manager][0] ?? '';
                 $item['location'] = $results[$i][$ldap_result_location][0] ?? '';
+                $item['company'] = $results[$i][$ldap_result_company][0] ?? '';
 
                 // ONLY if you are using the "ldap_location" option *AND* you have an actual result
                 if ($ldap_result_location && $item['location']) {
                         $location = Location::firstOrCreate([
                                 'name' => $item['location'],
                         ]);
                 }
+                if ($ldap_result_company && $item['company']) {
+                    $company = Company::firstOrCreate([
+                        'name' => $item['company'],
+                    ]);
+                }
                 $department = Department::firstOrCreate([
                     'name' => $item['department'],
                 ]);
@@ -284,6 +291,9 @@ public function handle()
             if($ldap_result_location != null){
                 $user->location_id = $location ? $location->id : null;
             }
+            if($ldap_result_company != null){
+                $user->company_id = $company ? $company->id : null;
+            }
 
             if($ldap_result_manager != null){
                 if($item['manager'] != null) {

app/Http/Controllers/SettingsController.php

@@ -973,6 +973,7 @@ public function postLdapSettings(Request $request)
             $setting->ldap_jobtitle = $request->input('ldap_jobtitle');
             $setting->ldap_country = $request->input('ldap_country');
             $setting->ldap_location = $request->input('ldap_location');
+            $setting->ldap_company = $request->input('ldap_company');
             $setting->ldap_dept = $request->input('ldap_dept');
             $setting->ldap_client_tls_cert   = $request->input('ldap_client_tls_cert');
             $setting->ldap_client_tls_key    = $request->input('ldap_client_tls_key');

app/Models/Setting.php

@@ -356,6 +356,7 @@ public static function getLdapSettings(): Collection
             'ldap_phone_field',
             'ldap_jobtitle',
             'ldap_manager',
+            'ldap_company',
             'ldap_country',
             'ldap_location',
             ])->first()->getAttributes();

database/migrations/2024_04_25_174702_add_ldap_company_to_settings_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddLdapCompanyToSettingsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->string('ldap_company')->after('ldap_jobtitle')->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->dropColumn('ldap_company');
+
+        });
+    }
+}

resources/lang/en-US/admin/settings/general.php

@@ -104,6 +104,7 @@
     'ldap_phone'                => 'LDAP Telephone Number',
     'ldap_jobtitle'             => 'LDAP Job Title',
     'ldap_country'              => 'LDAP Country',
+    'ldap_company'              => 'LDAP Company',
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',

resources/views/settings/ldap.blade.php

@@ -500,6 +500,19 @@
                                 @endif
                             </div>
                         </div>
+                        <!-- LDAP Company -->
+                        <div class="form-group {{ $errors->has('ldap_company') ? 'error' : '' }}">
+                            <div class="col-md-3">
+                                {{ Form::label('ldap_company', trans('admin/settings/general.ldap_company')) }}
+                            </div>
+                            <div class="col-md-8">
+                                {{ Form::text('ldap_company', Request::old('ldap_company', $setting->ldap_company), ['class' => 'form-control','placeholder' => trans('general.example') .'company', $setting->demoMode]) }}
+                                {!! $errors->first('ldap_company', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                @if (config('app.lock_passwords')===true)
+                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                @endif
+                            </div>
+                        </div>
                         <!-- LDAP Location -->
                         <div class="form-group {{ $errors->has('ldap_location') ? 'error' : '' }}">
                             <div class="col-md-3">