From 22693f4affe42783eeeb7a5b45be00247be0eb0d Mon Sep 17 00:00:00 2001
From: martinlanghoff <martinlanghoff>
Date: Tue, 17 May 2005 03:50:20 +0000
Subject: [PATCH] Auth/LDAP -- a proper dropdown for search subcontexts option

---
 auth/ldap/config.html | 7 ++++++-
 lang/en/auth.php      | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/auth/ldap/config.html b/auth/ldap/config.html
index 579dbf257c4..aa25b5a18f0 100644
--- a/auth/ldap/config.html
+++ b/auth/ldap/config.html
@@ -157,7 +157,12 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
 <tr valign="top" class="required">
     <td align="right">ldap_search_sub:</td>
     <td>
-    <input name="ldap_search_sub" type="text" size="1" value="<?php echo $config->ldap_search_sub?>">
+<?php
+    $choices = array();;
+    $choices["0"] = get_string("no");
+    $choices["1"] = get_string("yes");
+    choose_from_menu ($choices, "ldap_search_sub", $form->ldap_search_sub, "");
+?>
     <?php  if (isset($err["ldap_search_sub"])) formerr($err["ldap_search_sub"]); ?>
     </td>
     <td>
diff --git a/lang/en/auth.php b/lang/en/auth.php
index c8451c1b789..ecc20735030 100644
--- a/lang/en/auth.php
+++ b/lang/en/auth.php
@@ -64,7 +64,7 @@ $string['auth_ldap_memberattribute'] = 'Optional: Overrides user member attribut
 $string['auth_ldap_objectclass'] = 'Optional: Overrides objectClass used to name/search users on ldap_user_type. Usually you dont need to chage this.';
 $string['auth_ldap_opt_deref'] = 'Determines how aliases are handled during search. Select one of the following values: \"No\" (LDAP_DEREF_NEVER) or \"Yes\" (LDAP_DEREF_ALWAYS) ';
 $string['auth_ldap_passwdexpire_settings'] = 'LDAP password expiration settings.';
-$string['auth_ldap_search_sub'] = 'Put value <> 0 if  you like to search users from subcontexts.';
+$string['auth_ldap_search_sub'] = 'Search users from subcontexts.';
 $string['auth_ldap_server_settings'] = 'LDAP server settings';
 $string['auth_ldap_update_userinfo'] = 'Update user information (firstname, lastname, address..) from LDAP to Moodle.  Specify \"Data mapping\" settings as you need.';
 $string['auth_ldap_user_attribute'] = 'Optional: Overrides the attribute used to name/search users. Usually \'cn\'.';