From 69f0b35ca6977948b11910d5cf880b9184775894 Mon Sep 17 00:00:00 2001
From: Benjamin Renard <brenard@easter-eggs.com>
Date: Thu, 5 Jun 2008 13:53:37 +0000
Subject: [PATCH]

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

diff --git a/trunk/conf/config.inc.php b/trunk/conf/config.inc.php
index db231479..9dc795e3 100644
--- a/trunk/conf/config.inc.php
+++ b/trunk/conf/config.inc.php
@@ -57,7 +57,6 @@ $GLOBALS['LSconfig'] = array(
       'authobject_pwdattr' => '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 adfcc3ed..726d112f 100644
--- a/trunk/includes/class/class.LSsession.php
+++ b/trunk/includes/class/class.LSsession.php
@@ -400,7 +400,7 @@ class LSsession {
                       }
                       // 2nd étape : génération du mot de passe + envoie par mail
                       else {
-                        $attr=$user -> attrs[$this -> ldapServer['recoverPassword']['passwordAttr']];
+                        $attr=$user -> attrs[$this -> ldapServer['authobject_pwdattr']];
                         if ($attr instanceof LSattribute) {
                           $mdp = generatePassword($attr -> config['html_options']['chars'],$attr -> config['html_options']['lenght']);
                           debug('Nvx mpd : '.$mdp);
@@ -408,7 +408,7 @@ class LSsession {
                           $lostPasswdForm -> setPostData(
                             array(
                               $this -> ldapServer['recoverPassword']['recoveryHashAttr'] => array(''),
-                              $this -> ldapServer['recoverPassword']['passwordAttr'] => array($mdp)
+                              $this -> ldapServer['authobject_pwdattr'] => array($mdp)
                             )
                             ,true
                           );