From 47d9b907af27830197096c4a50598e253afbe1b1 Mon Sep 17 00:00:00 2001
From: Benjamin Renard <brenard@easter-eggs.com>
Date: Mon, 25 May 2020 11:10:16 +0200
Subject: [PATCH] LSaccessRigthsMatrixView fix handling subDn LDAP servers
 configuration

---
 .../LSaddons.LSaccessRightsMatrixView.php     | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/includes/addons/LSaddons.LSaccessRightsMatrixView.php b/src/includes/addons/LSaddons.LSaccessRightsMatrixView.php
index 4510c5de..cc0815b2 100644
--- a/src/includes/addons/LSaddons.LSaccessRightsMatrixView.php
+++ b/src/includes/addons/LSaddons.LSaccessRightsMatrixView.php
@@ -72,8 +72,35 @@ function LSaccessRightsMatrixView() {
 		foreach(LSsession :: $ldapServer["LSprofiles"] as $LSprofile => $LSprofile_conf)
 			$LSprofiles[$LSprofile] = (isset($LSprofile_conf['label'])?__($LSprofile_conf['label']):$LSprofile);
 
+  // List object types
+  $objectTypes = array();
+
+  // Handle LSaccess parameter
+  if (isset(LSsession :: $ldapServer["LSaccess"]) && is_array(LSsession :: $ldapServer["LSaccess"]))
+    foreach (LSsession :: $ldapServer["LSaccess"] as $LSobject)
+      if (!in_array($LSobject, $objectTypes))
+        $objectTypes[] = $LSobject;
+
+  // Handle subDn access
+  if (isset(LSsession :: $ldapServer["subDn"]) && is_array(LSsession :: $ldapServer["subDn"])) {
+    // SubDn object types
+    foreach (LSsession :: $ldapServer["subDn"] as $subDn_name => $subDn_conf) {
+      if (isset($subDn_conf['LSobjects']) && is_array($subDn_conf['LSobjects']))
+        foreach ($subDn_conf['LSobjects'] as $LSobject)
+          if (!in_array($LSobject, $objectTypes))
+            $objectTypes[] = $LSobject;
+      // SubDn by list of objects
+      if (isset($subDn_conf['LSobject']) && is_array($subDn_conf['LSobject']))
+        foreach ($subDn_conf['LSobject'] as $objType => $objTypeConf)
+          if (isset($objTypeConf['LSobjects']) && is_array($objTypeConf['LSobjects']))
+            foreach ($objTypeConf['LSobjects'] as $LSobject)
+            if (!in_array($LSobject, $objectTypes))
+              $objectTypes[] = $LSobject;
+    }
+  }
+
 	$LSobjects = array();
-	foreach (LSsession :: $ldapServer["LSaccess"] as $LSobject) {
+	foreach ($objectTypes as $LSobject) {
 		if (!LSsession :: loadLSobject($LSobject))
 			continue;