From 8e5a5cb6f0cc6d48605cbe11af71d9467b1429ce Mon Sep 17 00:00:00 2001
From: Benjamin Renard <brenard@easter-eggs.com>
Date: Fri, 10 Apr 2009 17:36:09 +0000
Subject: [PATCH] =?UTF-8?q?-=20Bug=20dans=20le=20pr=C3=A9c=C3=A9dent=20com?=
 =?UTF-8?q?mit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 trunk/select.php | 41 +++++++++++++++++++++++------------------
 trunk/view.php   | 15 ++++++++++-----
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/trunk/select.php b/trunk/select.php
index 311ac7ec..f6c0ab77 100644
--- a/trunk/select.php
+++ b/trunk/select.php
@@ -87,27 +87,32 @@ if(LSsession :: startLSsession()) {
         
         if (isset($_REQUEST['LSview_recur'])) {
           $recur = true;
-          $params['scope'] = 'sub';
-          if (LSsession :: validSubDnLdapServer($_REQUEST['LSselect_topDn'])) {
-            $topDn = $_REQUEST['LSselect_topDn'];
-            $selectedTopDn = $topDn;
-          }
-          else {
-            $topDn = LSsession :: getTopDn();
-            $selectedTopDn = $topDn;
-          }
         }
         else {
           $recur = false;
-          $params['scope'] = 'one';
-          if (LSsession :: validSubDnLdapServer($_REQUEST['LSselect_topDn'])) {
-            $topDn = $object -> config['container_dn'].','.$_REQUEST['LSselect_topDn'];
-            $selectedTopDn = $_REQUEST['LSselect_topDn'];
-          }
-          else {
-            $topDn = $object -> config['container_dn'].','.LSsession :: getTopDn();
-            $selectedTopDn = LSsession :: getTopDn();
-          }
+        }
+      }
+      
+      if ($recur) {
+        $params['scope'] = 'sub';
+        if (LSsession :: validSubDnLdapServer($_REQUEST['LSselect_topDn'])) {
+          $topDn = $_REQUEST['LSselect_topDn'];
+          $selectedTopDn = $topDn;
+        }
+        else {
+          $topDn = LSsession :: getTopDn();
+          $selectedTopDn = $topDn;
+        }
+      }
+      else {
+        $params['scope'] = 'one';
+        if (LSsession :: validSubDnLdapServer($_REQUEST['LSselect_topDn'])) {
+          $topDn = $object -> config['container_dn'].','.$_REQUEST['LSselect_topDn'];
+          $selectedTopDn = $_REQUEST['LSselect_topDn'];
+        }
+        else {
+          $topDn = $object -> config['container_dn'].','.LSsession :: getTopDn();
+          $selectedTopDn = LSsession :: getTopDn();
         }
       }
       
diff --git a/trunk/view.php b/trunk/view.php
index 29d92fe7..cc9a5ce1 100644
--- a/trunk/view.php
+++ b/trunk/view.php
@@ -141,16 +141,21 @@ if(LSsession :: startLSsession()) {
             
             if (isset($_REQUEST['LSview_recur'])) {
               $recur = true;
-              $params['scope'] = 'sub';
-              $topDn = LSsession :: getTopDn();
             }
             else {
               $recur = false;
-              $params['scope'] = 'one';
-              $topDn = $object -> config['container_dn'].','.LSsession :: getTopDn();
             }
           }
           
+          if ($recur) {
+            $params['scope'] = 'sub';
+            $topDn = LSsession :: getTopDn();
+          }
+          else {
+            $params['scope'] = 'one';
+            $topDn = $object -> config['container_dn'].','.LSsession :: getTopDn();
+          }
+          
           $sort=false;
           if ((isset($_REQUEST['orderby']))) {
             $possible_values= array('displayName','subDn');
@@ -180,7 +185,7 @@ if(LSsession :: startLSsession()) {
             'ordersense' => $ordersense,
             'doSubDn' => $doSubDn
           );
-
+          
           $GLOBALS['Smarty']->assign('LSview_search_pattern',$pattern);
 
           if ($recur) {