From d4f4c5e387e7138cebce22a8fa5f11dbe64cf2c0 Mon Sep 17 00:00:00 2001
From: Benjamin Renard <brenard@easter-eggs.com>
Date: Fri, 18 Jul 2008 15:20:52 +0000
Subject: [PATCH] =?UTF-8?q?-=20LSsession=20:=20Trie=20aplhab=C3=A9tique=20?=
 =?UTF-8?q?lors=20de=20la=20s=C3=A9lection=20du=20subDn=20-=20LSldapObject?=
 =?UTF-8?q?=20:=20m=C3=A9thode=20getValue()=20=20=20->=20Ajout=20des=20pos?=
 =?UTF-8?q?sibilit=C3=A9=20de=20retour=20:=20=20=20=20=20-=20'subDn'=20=3D?=
 =?UTF-8?q?>=20le=20DN=20du=20subDn=20=20=20=20=20-=20'subDnName'=20=3D>?=
 =?UTF-8?q?=20le=20nom=20du=20subDn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 trunk/includes/class/class.LSldapObject.php | 6 ++++++
 trunk/includes/class/class.LSsession.php    | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/trunk/includes/class/class.LSldapObject.php b/trunk/includes/class/class.LSldapObject.php
index f9f7f25b..6534a8c2 100644
--- a/trunk/includes/class/class.LSldapObject.php
+++ b/trunk/includes/class/class.LSldapObject.php
@@ -819,6 +819,12 @@ class LSldapObject {
     else if(($val=='rdn')||($val=='%{rdn}')) {
       return $this -> attrs[ $this -> config['rdn'] ] -> getValue();
     }
+    else if(($val=='subDn')||($val=='%{subDn}')) {
+      return $this -> getSubDnValue();
+    }
+    else if(($val=='subDnName')||($val=='%{subDnName}')) {
+      return $this -> getSubDnName();
+    }
     else if(isset($this ->  attrs[$val])){
       if (method_exists($this ->  attrs[$val],'getValue'))
         return $this -> attrs[$val] -> getValue();
diff --git a/trunk/includes/class/class.LSsession.php b/trunk/includes/class/class.LSsession.php
index acafb871..824dbeda 100644
--- a/trunk/includes/class/class.LSsession.php
+++ b/trunk/includes/class/class.LSsession.php
@@ -616,6 +616,7 @@ class LSsession {
   */
   function getSubDnLdapServerOptions($selected=NULL) {
     $list = $this -> getSubDnLdapServer();
+    asort($list);
     if ($list) {
       $display='';
       foreach($list as $dn => $txt) {
@@ -860,6 +861,7 @@ class LSsession {
     
     // Niveau
     $listTopDn = $this -> getSubDnLdapServer();
+    asort($listTopDn);
     if (is_array($listTopDn)) {
       $GLOBALS['Smarty'] -> assign('label_level',$this -> getLevelLabel());
       $GLOBALS['Smarty'] -> assign('_refresh',_('Rafraîchir'));