From 565f4eb6a179059881ad8f6d5883e180776a880f Mon Sep 17 00:00:00 2001
From: Maciej Domanski <ahpaleus@gmail.com>
Date: Mon, 21 Mar 2022 10:36:15 +0100
Subject: [PATCH] LdapSync

---
 app/Console/Commands/LdapSync.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 app/Console/Commands/LdapSync.php

diff --git a/app/Console/Commands/LdapSync.php b/app/Console/Commands/LdapSync.php
old mode 100644
new mode 100755
index 19694569f9..533dd6bd98
--- a/app/Console/Commands/LdapSync.php
+++ b/app/Console/Commands/LdapSync.php
@@ -49,7 +49,7 @@ class LdapSync extends Command
         $ldap_result_last_name = Setting::getSettings()->ldap_lname_field;
         $ldap_result_first_name = Setting::getSettings()->ldap_fname_field;
 
-        $ldap_result_active_flag = Setting::getSettings()->ldap_active_flag_field;
+        $ldap_result_active_flag = Setting::getSettings()->ldap_active_flag;
         $ldap_result_emp_num = Setting::getSettings()->ldap_emp_num;
         $ldap_result_email = Setting::getSettings()->ldap_email;
         $ldap_result_phone = Setting::getSettings()->ldap_phone_field;
@@ -253,8 +253,8 @@ class LdapSync extends Command
 
                 if ($item['ldap_location_override'] == true) {
                     $user->location_id = $item['location_id'];
-                } elseif ((isset($location)) && (! empty($location))) {
-                    if ((is_array($location)) && (array_key_exists('id', $location))) {
+                } elseif ((isset($location))) {
+                    if ((array_key_exists('id', $location))) {
                         $user->location_id = $location['id'];
                     } elseif (is_object($location)) {
                         $user->location_id = $location->id;
@@ -276,7 +276,7 @@ class LdapSync extends Command
                     $item['status'] = 'error';
                 }
 
-                array_push($summary, $item);
+                $summary[] = $item;
             }
         }