From 2199fddb62b73a5f6bbb868861f431bd7a3b6de2 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Wed, 11 Jun 2003 20:18:55 +0000
Subject: [PATCH] fixed suffix box

---
 lam/templates/lists/listgroups.php |  8 ++++++--
 lam/templates/lists/listhosts.php  | 10 +++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/lam/templates/lists/listgroups.php b/lam/templates/lists/listgroups.php
index 030f1474..aff7e016 100644
--- a/lam/templates/lists/listgroups.php
+++ b/lam/templates/lists/listgroups.php
@@ -230,6 +230,10 @@ if ($sr) {
 	$units = ldap_get_entries($_SESSION["ldap"]->server, $sr);
 	// delete first array entry which is "count"
 	array_shift($units);
+	// remove sub arrays
+	for ($i = 0; $i < sizeof($units); $i++) $units[$i] = $units[$i]['dn'];
+	// add root suffix from config
+	if (!in_array($_SESSION["config"]->get_GroupSuffix(), $units)) array_push($units, $_SESSION["config"]->get_GroupSuffix());
 }
 
 echo ("<p align=\"left\">\n");
@@ -240,8 +244,8 @@ if (sizeof($units) > 1) {
 echo ("&nbsp;&nbsp;&nbsp;&nbsp;<b>" . _("Suffix") . ": </b>");
 echo ("<select size=1 name=\"grp_suffix\">\n");
 for ($i = 0; $i < sizeof($units); $i++) {
-	if ($grp_suffix == $units[$i]['dn']) echo ("<option selected>" . $units[$i]['dn'] . "</option>\n");
-	else echo("<option>" . $units[$i]['dn'] . "</option>\n");
+	if ($grp_suffix == $units[$i]) echo ("<option selected>" . $units[$i] . "</option>\n");
+	else echo("<option>" . $units[$i] . "</option>\n");
 }
 echo ("</select>\n");
 echo ("<input type=\"submit\" name=\"refresh\" value=\"" . _("Change Suffix") . "\">");
diff --git a/lam/templates/lists/listhosts.php b/lam/templates/lists/listhosts.php
index a9438c1a..d6012e94 100644
--- a/lam/templates/lists/listhosts.php
+++ b/lam/templates/lists/listhosts.php
@@ -219,6 +219,10 @@ if ($sr) {
 	$units = ldap_get_entries($_SESSION["ldap"]->server, $sr);
 	// delete first array entry which is "count"
 	array_shift($units);
+	// remove sub arrays
+	for ($i = 0; $i < sizeof($units); $i++) $units[$i] = $units[$i]['dn'];
+	// add root suffix from config
+	if (!in_array($_SESSION["config"]->get_HostSuffix(), $units)) array_push($units, $_SESSION["config"]->get_HostSuffix());
 }
 
 echo ("<p align=\"left\">\n");
@@ -227,10 +231,10 @@ if (sizeof($info) > 0) echo ("<input type=\"submit\" name=\"del_host\" value=\""
 // print combobox with possible sub-DNs
 if (sizeof($units) > 1) {
 echo ("&nbsp;&nbsp;&nbsp;&nbsp;<b>" . _("Suffix") . ": </b>");
-echo ("<select size=1 name=\"grp_suffix\">\n");
+echo ("<select size=1 name=\"hst_suffix\">\n");
 for ($i = 0; $i < sizeof($units); $i++) {
-	if ($hst_suffix == $units[$i]['dn']) echo ("<option selected>" . $units[$i]['dn'] . "</option>\n");
-	else echo("<option>" . $units[$i]['dn'] . "</option>\n");
+	if ($hst_suffix == $units[$i]) echo ("<option selected>" . $units[$i] . "</option>\n");
+	else echo("<option>" . $units[$i] . "</option>\n");
 }
 echo ("</select>\n");
 echo ("<input type=\"submit\" name=\"refresh\" value=\"" . _("Change Suffix") . "\">");