[Dolibarr-cvs] dolibarr/htdocs adminldap.php lib/ldap.lib.php

[Regis Houssin]

CVSROOT:        /cvsroot/dolibarr
Module name:    dolibarr
Changes by:     Regis Houssin <hregis>  06/06/12 12:48:43

Modified files:
        htdocs/admin   : ldap.php 
        htdocs/lib     : ldap.lib.php 

Log message:
        début amélioration LDAP

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/dolibarr/htdocs/admin/ldap.php?cvsroot=dolibarr&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/dolibarr/htdocs/lib/ldap.lib.php?cvsroot=dolibarr&r1=1.27&r2=1.28

Patches:
Index: admin/ldap.php
===================================================================
RCS file: /cvsroot/dolibarr/dolibarr/htdocs/admin/ldap.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- admin/ldap.php      12 Jun 2006 12:34:00 -0000      1.42
+++ admin/ldap.php      12 Jun 2006 12:48:43 -0000      1.43
@@ -19,7 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id: ldap.php,v 1.42 2006/06/12 12:34:00 hregis Exp $
+ * $Id: ldap.php,v 1.43 2006/06/12 12:48:43 hregis Exp $
  * $Source: /cvsroot/dolibarr/dolibarr/htdocs/admin/ldap.php,v $
  */
  
@@ -27,7 +27,7 @@
        \file       htdocs/admin/ldap.php
                \ingroup    ldap
                \brief      Page d'administration/configuration du module Ldap
-               \version    $Revision: 1.42 $
+               \version    $Revision: 1.43 $
         \remarks    Exemple configuration :
                     LDAP_SERVER_HOST    Serveur LDAP                 
192.168.1.50
                     LDAP_SERVER_PORT    Port LDAP             389
@@ -274,7 +274,7 @@
                        print img_picto('','alerte');
                        print $langs->trans("LDAPTestKO").'<br>';
                        print "<br>";
-                       print ldap_error($ds);
+                       print $ds->err;
                        print "<br>";
                }
 
@@ -325,6 +325,6 @@
 
 $db->close();
 
-llxFooter('$Date: 2006/06/12 12:34:00 $ - $Revision: 1.42 $');
+llxFooter('$Date: 2006/06/12 12:48:43 $ - $Revision: 1.43 $');
 
 ?>

Index: lib/ldap.lib.php
===================================================================
RCS file: /cvsroot/dolibarr/dolibarr/htdocs/lib/ldap.lib.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- lib/ldap.lib.php    12 Jun 2006 12:26:39 -0000      1.27
+++ lib/ldap.lib.php    12 Jun 2006 12:48:43 -0000      1.28
@@ -19,7 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  *
- * $Id: ldap.lib.php,v 1.27 2006/06/12 12:26:39 hregis Exp $
+ * $Id: ldap.lib.php,v 1.28 2006/06/12 12:48:43 hregis Exp $
  * $Source: /cvsroot/dolibarr/dolibarr/htdocs/lib/ldap.lib.php,v $
  */
 
@@ -28,7 +28,7 @@
                \brief          Librairie contenant les fonctions pour accèder 
au serveur ldap.
                \author         Rodolphe Quiedeville.
                \author         Benoit Mortier.
-               \version        $Revision: 1.27 $
+               \version        $Revision: 1.28 $
 
                Ensemble des fonctions permettant d'accèder à un serveur LDAP.
 */
@@ -58,6 +58,10 @@
        {
                ldap_set_option($ldapconnect, LDAP_OPT_PROTOCOL_VERSION, 
$conf->global->LDAP_SERVER_PROTOCOLVERSION);
        }
+       else
+       {
+               $this->err .= ldap_error($ldapconnect);
+       }
        
        return $ldapconnect;
 }