From 9d40ae1aa7ebec15ef4c17c37cd9a995b8701ada Mon Sep 17 00:00:00 2001
From: Andrew Ruthven <andrew@etc.gen.nz>
Date: Sat, 3 Feb 2024 20:37:16 +1300
Subject: [PATCH] Simplify the code by assigning the array after we've cleaned
 it up.

This allows shorter lines which means easier to understand code.
---
 inc/drivers_ldap.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/inc/drivers_ldap.php b/inc/drivers_ldap.php
index e269b1f5..3ecc8309 100644
--- a/inc/drivers_ldap.php
+++ b/inc/drivers_ldap.php
@@ -524,17 +524,16 @@ function sync_LDAP_groups(){
 
   foreach ($ldap_groups_tmp as $key => $ldap_group) {
     $group_name = $ldap_group[$mapping['name']];
-    $ldap_groups_info[$group_mapping] = $ldap_group;
 
-    if ( isset($ldap_groups_info[$group_mapping][$member_field]) ) {
-      if ( is_array($ldap_groups_info[$group_mapping][$member_field]) ) {
-        unset( $ldap_groups_info[$group_mapping][$member_field]['count'] );
-      }
-      else {
-        $ldap_groups_info[$group_mapping][$member_field]
-            = array($ldap_groups_info[$group_mapping][$member_field]);
+    if ( isset($ldap_group[$member_field]) ) {
+      if ( is_array($ldap_group[$member_field]) ) {
+        unset( $ldap_group[$member_field]['count'] );
+      } else {
+        $ldap_group[$member_field] = array($ldap_group[$member_field]);
       }
     }
+
+    $ldap_groups_info[$group_name] = $ldap_group;
     unset($ldap_groups_tmp[$key]);
   }