Merge remote-tracking branch 'origin/develop'

Author: snipe

.upgrade_requirements.json

@@ -3,7 +3,7 @@
     "DOC2": "In other words, what you see locally are the requirements for your _current_ install",
     "DOC3": "Please don't rely on these versions for planning upgrades unless you've fetched the most recent version",
     "DOC4": "You should really just ignore it and run upgrade.php. Really",
-    "php_min_version": "8.1.0",
+    "php_min_version": "8.2.0",
     "php_max_major_minor": "8.4",
     "php_max_wontwork": "8.5.0",
     "current_snipeit_version": "8.0"

app/Console/Commands/LdapSync.php

@@ -125,6 +125,10 @@ public function handle()
              */
             $attributes = array_values(array_filter($ldap_map));
 
+            if (Setting::getSettings()->is_ad === 1 && is_null($ldap_map['active_flag'])) {
+                $attributes[] = 'useraccountcontrol';
+            }
+
             $results = Ldap::findLdapUsers($search_base, -1, $filter, $attributes);
 
         } catch (\Exception $e) {