[svn r14970] Added ldap_set_version() calls

main/admin/ldap_import_students.php

@@ -93,14 +93,14 @@ elseif ($annee <> "" && $composante == "" && $etape == "") // form 2 annee != 0;
 		//$sr = @ ldap_search($ds, "o=groups,$ldap_basedn", "(&(description=etape*)(cn=*$annee))", array ('cn'));
 		//$sr = @ ldap_search($ds, "ou=$annee, ou=diploma, o=paris1, $ldap_basedn", "ou=02*", array ('description'));
 		//$sr = @ ldap_search($ds, "ou=structures, o=paris1, $ldap_basedn", "businessCategory=pedagogy", array ('ou','description'));
-		$sr = @ ldap_search($ds, "$ldap_basedn", "", array ('ou','description'));
+		$sr = ldap_search($ds, "ou=test-ou, o=test-o, $ldap_basedn", "businessCategory=education", array ('ou','description'));
 		// "ou=2006,ou=diploma,o=Paris1,dc=univ-paris1,dc=fr
 
 		$info = ldap_get_entries($ds, $sr);
 		$composante = array();
 		for($i = 0; $i < $info['count']; $i ++)
 		{
-			//on suppose que le serveur LDAP est en UTF-8
+			//presupose LDAP server is UTF-8
 			$composante[$info[$i]['ou'][0]] = iconv('utf-8', api_get_setting('platform_charset'), $info[$i]['description'][0]);
 		}
 		$oucompotab3=$composante;

main/admin/ldap_import_students_to_session.php

@@ -105,6 +105,7 @@ if (isset($id_session) && $id_session!="")
 		elseif ($annee <> "" && $composante == "" && $etape == "") {
 
 			$ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
+			ldap_set_version($ds);
 
 			if ($ds) {
 				$r = false;
@@ -158,6 +159,7 @@ if (isset($id_session) && $id_session!="")
 			echo '<div style="align:center;">';
 			echo '<h3><img src="../img/group.gif" alt="'.get_lang('SearchResults').'" />'.get_lang('SearchResults').'</h3>';
 			$ds = ldap_connect($ldap_host, $ldap_port);
+			ldap_set_version($ds);
 
 			if ($ds) {
 
@@ -237,6 +239,8 @@ if (isset($id_session) && $id_session!="")
 		// Ajout de l'etape
 		if ($annee <> "" && $composante <> "" && $etape <> "") {
 			$ds = ldap_connect($ldap_host, $ldap_port);
+			ldap_set_version($ds);
+
 			if ($ds) {
 				$r = false;
 				$res = ldap_handle_bind($ds, $r);
@@ -364,6 +368,7 @@ if (isset($id_session) && $id_session!="")
 				ORDER BY code_ufr, code_etape";
 			$result = api_sql_query($sql);
 			$ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
+			ldap_set_version($ds);
 			// Import des utilisateurs des etapes dans la session
 			if ($ds)
 				$r = false;

main/admin/ldap_synchro.php

@@ -79,6 +79,7 @@ foreach($Sessions as $session){
 		ORDER BY code_ufr, code_etape";
 	$result = api_sql_query($sql);
 	$ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
+	ldap_set_version($ds);
 	// Import des utilisateurs des etapes dans la session
 	if ($ds)
 	{

main/admin/ldap_users_list.php

@@ -79,6 +79,7 @@ function get_ldap_users()
 	}
 
 	$ds = ldap_connect($ldap_host, $ldap_port);
+	ldap_set_version($ds);
 	if ($ds && sizeof($ldap_querry)>0) {
 		$r = false;
 		$res = ldap_handle_bind($ds, $r);
@@ -160,6 +161,7 @@ function addLdapUser($login){
 	global $ldap_basedn, $ldap_host, $ldap_port, $ldap_rdn, $ldap_pass;
 	
 	$ds = ldap_connect($ldap_host, $ldap_port);
+	ldap_set_version($ds);
 	if ($ds) {
 		$str_querry="(uid=".$login.")";
 		$r = false;