From c1e7664313fa12f3176a30e400ac33e3d52dc087 Mon Sep 17 00:00:00 2001
From: Benjamin Renard <brenard@easter-eggs.com>
Date: Fri, 10 Apr 2009 17:13:38 +0000
Subject: [PATCH] =?UTF-8?q?-=20LSsearch=20:=20=09->=20Affichage=20du=20nom?=
 =?UTF-8?q?bre=20de=20r=C3=A9sultat=20des=20recherches=20=09->=20Possibili?=
 =?UTF-8?q?t=C3=A9=20d'activer=20par=20d=C3=A9faut=20le=20mode=20r=C3=A9cu?=
 =?UTF-8?q?rsif=20d'une=20recherche.=20-=20Documentation=20:=20Mise=20?=
 =?UTF-8?q?=C3=A0=20jour=20en=20cons=C3=A9quence?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/conf/LSobject.docbook                            |  5 +++++
 doc/conf/LSobject/LSsearch.docbook                   | 10 +++++++++-
 trunk/conf/LSobjects/config.LSobjects.LSeepeople.php |  3 ++-
 trunk/css/black/base.css                             |  8 ++++++++
 trunk/css/default/base.css                           |  8 ++++++++
 trunk/select.php                                     |  2 +-
 trunk/templates/default/viewList.tpl                 |  1 +
 trunk/view.php                                       |  2 +-
 8 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/doc/conf/LSobject.docbook b/doc/conf/LSobject.docbook
index eb5ed4fe..60496e7d 100644
--- a/doc/conf/LSobject.docbook
+++ b/doc/conf/LSobject.docbook
@@ -52,6 +52,11 @@
     // Configuration des formulaires de l'objet
   ), // fin LSform
   
+  // LSsearch
+  'LSsearch' => array (
+    // Configuration des recherches de l'objet
+  ), // fin LSsearch
+  
   // Attributs
   'attrs' => array (
     // Configuration des attributs du type d'LSobjet
diff --git a/doc/conf/LSobject/LSsearch.docbook b/doc/conf/LSobject/LSsearch.docbook
index 700bfc35..3a2eb17a 100644
--- a/doc/conf/LSobject/LSsearch.docbook
+++ b/doc/conf/LSobject/LSsearch.docbook
@@ -14,7 +14,7 @@ configuration des &LSobjects;, dans la variable <varname>LSsearch</varname>
     'attr2',
     ...
   ),
-  ...
+  'recursive' => [booléen]
 );]]>
 </programlisting>
 
@@ -41,6 +41,14 @@ configuration des &LSobjects;, dans la variable <varname>LSsearch</varname>
   </listitem>
 </varlistentry>
 
+<varlistentry>
+  <term>recursive</term>
+  <listitem>
+    <para>Booléen déterminant si la recherche récursive est activée ou non par
+    défaut pour ce type d'LSobject.</para>
+  </listitem>
+</varlistentry>
+
 </variablelist>
 </para>
 
diff --git a/trunk/conf/LSobjects/config.LSobjects.LSeepeople.php b/trunk/conf/LSobjects/config.LSobjects.LSeepeople.php
index fa5504eb..c104c959 100644
--- a/trunk/conf/LSobjects/config.LSobjects.LSeepeople.php
+++ b/trunk/conf/LSobjects/config.LSobjects.LSeepeople.php
@@ -114,7 +114,8 @@ $GLOBALS['LSobjects']['LSeepeople'] = array (
       'cn',
       'uid',
       'mail'
-    )
+    ),
+    'recursive' => true
   ),
   
   // Attributes
diff --git a/trunk/css/black/base.css b/trunk/css/black/base.css
index c85f0948..f2e91b7d 100644
--- a/trunk/css/black/base.css
+++ b/trunk/css/black/base.css
@@ -228,6 +228,14 @@ strong.LSobject-list-page {
   color:              #433f3a;
 }
 
+#LSobject_list_nbresult {
+  float:              right;
+  color:              #333;
+  font-style:         italic;
+  margin-right:       20px;
+  text-transform:     lowercase;
+}
+
 /*
  *******************
  * LSview-actions
diff --git a/trunk/css/default/base.css b/trunk/css/default/base.css
index 25da785f..59516cad 100644
--- a/trunk/css/default/base.css
+++ b/trunk/css/default/base.css
@@ -226,6 +226,14 @@ strong.LSobject-list-page {
   color:              #0072b8;
 }
 
+#LSobject_list_nbresult {
+  float:              right;
+  color:              #333;
+  font-style:         italic;
+  margin-right:       20px;
+  text-transform:     lowercase;
+}
+
 /*
  *******************
  * LSview-actions
diff --git a/trunk/select.php b/trunk/select.php
index fa468834..311ac7ec 100644
--- a/trunk/select.php
+++ b/trunk/select.php
@@ -61,7 +61,7 @@ if(LSsession :: startLSsession()) {
         $topDn = $object -> config['container_dn'].','.LSsession :: getTopDn();
         $params = array('scope' => 'one');
         $pattern = false;
-        $recur = false;
+        $recur = LSconfig :: get("LSobjects.$LSobject.LSsearch.recursive");
         $approx = false;
         $selectedTopDn = LSsession :: getTopDn();
         $orderby = false;
diff --git a/trunk/templates/default/viewList.tpl b/trunk/templates/default/viewList.tpl
index a24acce3..3b4be1ea 100644
--- a/trunk/templates/default/viewList.tpl
+++ b/trunk/templates/default/viewList.tpl
@@ -49,6 +49,7 @@
           </tr>  
         {/foreach}
     </table>
+    <span id='LSobject_list_nbresult'>{$LSobject_list_nbresult} {$pagetitle}</span>
     {if $LSobject_list_nbpage}
       <p class='LSobject-list-page'>
       {section name=listpage loop=$LSobject_list_nbpage step=1}
diff --git a/trunk/view.php b/trunk/view.php
index a84417c9..29d92fe7 100644
--- a/trunk/view.php
+++ b/trunk/view.php
@@ -116,7 +116,7 @@ if(LSsession :: startLSsession()) {
             $topDn = $object -> config['container_dn'].','.LSsession :: getTopDn();
             $params = array('scope' => 'one');
             $pattern = false;
-            $recur = false;
+            $recur = LSconfig :: get("LSobjects.$LSobject.LSsearch.recursive");
             $approx = false;
             $orderby = false;
             $_REQUEST['orderby']=LSconfig :: get("LSobjects.$LSobject.orderby");