From c3c2177901494c858abb1ae0a8f9da3de71c9823 Mon Sep 17 00:00:00 2001
From: Benjamin Renard <brenard@easter-eggs.com>
Date: Sat, 3 Jan 2009 22:00:32 +0000
Subject: [PATCH] =?UTF-8?q?-=20LSsession=20:=20Modification=20de=20la=20m?=
 =?UTF-8?q?=C3=A9thode=20loadLSaccess()=20pour=20prendre=20en=20compte=20?=
 =?UTF-8?q?=09la=20possibilit=C3=A9=20de=20laisser=20=C3=A0=20l'utilisateu?=
 =?UTF-8?q?r=20le=20choix=20du=20format=20de=20nom=20des=20subDn.=20=09De?=
 =?UTF-8?q?=20plus,=20le=20param=C3=A8tre=20du=20basedn=20de=20recherche?=
 =?UTF-8?q?=20des=20LSobjets=20est=20renom=C3=A9=20:=20=09->=20topDn=20=3D?=
 =?UTF-8?q?>=20basedn=20-=20config.inc.php=20:=20Param=C3=A8tre=20inutile?=
 =?UTF-8?q?=20supprim=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 trunk/conf/config.inc.php                |  1 -
 trunk/includes/class/class.LSsession.php | 14 ++++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/trunk/conf/config.inc.php b/trunk/conf/config.inc.php
index a93dceb2..00cf7373 100644
--- a/trunk/conf/config.inc.php
+++ b/trunk/conf/config.inc.php
@@ -141,7 +141,6 @@ $GLOBALS['LSconfig'] = array(
       'authObjectTypeAttrPwd' => 'userPassword',
       'recoverPassword' => array(
         'mailAttr' => 'mail',
-        'passwordAttr' => 'userPassword',
         'recoveryHashAttr' => 'lsRecoveryHash',
         'recoveryEmailSender' => 'noreply-recover@lsexample.net',
         'recoveryHashMail' => array(
diff --git a/trunk/includes/class/class.LSsession.php b/trunk/includes/class/class.LSsession.php
index a5031f47..0d181181 100644
--- a/trunk/includes/class/class.LSsession.php
+++ b/trunk/includes/class/class.LSsession.php
@@ -599,15 +599,21 @@ class LSsession {
       if ($subDn_name == 'LSobject') {
         if (is_array($subDn_config)) {
           foreach($subDn_config as $LSobject_name => $LSoject_config) {
-            if ($LSoject_config['topDn']) {
-              $topDn = $LSoject_config['topDn'];
+            if ($LSoject_config['basedn']) {
+              $basedn = $LSoject_config['basedn'];
             }
             else {
-              $topDn = NULL;
+              $basedn = NULL;
+            }
+            if ($LSoject_config['displayValue']) {
+              $displayValue = $LSoject_config['displayValue'];
+            }
+            else {
+              $displayValue = NULL;
             }
             if( $this -> loadLSobject($LSobject_name) ) {
               if ($subdnobject = new $LSobject_name()) {
-                $tbl_return = $subdnobject -> getSelectArray(NULL,$topDn);
+                $tbl_return = $subdnobject -> getSelectArray(NULL,$basedn,$displayValue);
                 if (is_array($tbl_return)) {
                   $return=array_merge($return,$tbl_return);
                 }