a lot better

diff --git a/htdocs/search.php b/htdocs/search.php
index 732199e..202731e 100644 (file)
--- a/htdocs/search.php
+++ b/htdocs/search.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: search.php,v 1.18 2004-10-12 17:23:01 x2000habouzit Exp $
+        $Id: search.php,v 1.19 2004-10-12 17:31:44 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -64,7 +64,7 @@ if (array_key_exists('rechercher', $_REQUEST)) {
                        r.matricule,i.matricule_ax,
                        u.nom!="" AS inscrit,
                        IF(u.nom!="",u.nom,i.nom) AS nom,
-                       u.*, ep.alias AS epouse,
+                       u.*,
                        IF(u.prenom!="",u.prenom,i.prenom) AS prenom,
                        IF(u.promo!="",u.promo,i.promo) AS promo,
                        i.deces!=0 AS decede,
@@ -79,7 +79,6 @@ if (array_key_exists('rechercher', $_REQUEST)) {
            INNER JOIN  identification AS i   ON (i.matricule=r.matricule)
            INNER JOIN  auth_user_md5  AS u   ON (u.matricule=r.matricule)
            INNER JOIN  aliases        AS a   ON (u.user_id = a.id AND a.type="a_vie")
-            LEFT JOIN  aliases        AS ep  ON (u.user_id = a.id AND a.type="epouse")
             LEFT JOIN  contacts       AS c   ON (c.uid='.((array_key_exists('uid',$_SESSION))?$_SESSION['uid']:0).' AND c.contact=u.user_id)
             LEFT JOIN  applis_ins     AS ai0 ON (u.user_id = ai0.uid AND ai0.ordre = 0)
             LEFT JOIN  applis_def     AS ad0 ON (ad0.id = ai0.aid)

diff --git a/templates/include/x_inscrit.tpl b/templates/include/x_inscrit.tpl
index d35bccb..f93419b 100644 (file)
--- a/templates/include/x_inscrit.tpl
+++ b/templates/include/x_inscrit.tpl
@@ -17,14 +17,13 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: x_inscrit.tpl,v 1.9 2004-09-02 23:36:57 x2000habouzit Exp $
+        $Id: x_inscrit.tpl,v 1.10 2004-10-12 17:31:38 x2000habouzit Exp $
  ***************************************************************************}
 
 
 <div class="contact">
   <div class="nom">
-    {$c.nom} {$c.prenom}
-    {if $c.epouse}<br />({$c.epouse} {$c.nom}){/if}
+    {if $c.epouse}{$c.epouse} {$c.prenom}<br />({$c.nom} $c.prenom}){else}{$c.nom} {$c.prenom}{/if}
     {if $c.dcd}(décédé){/if}
   </div>
   <div class="appli">

diff --git a/templates/search.result.public.tpl b/templates/search.result.public.tpl
index c6d0d10..ac21fab 100644 (file)
--- a/templates/search.result.public.tpl
+++ b/templates/search.result.public.tpl
@@ -17,16 +17,11 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: search.result.public.tpl,v 1.4 2004-10-10 09:23:57 x2000chevalier Exp $
+        $Id: search.result.public.tpl,v 1.5 2004-10-12 17:31:38 x2000habouzit Exp $
  ***************************************************************************}
 
 <div class="nom">
-  {if $result.epouse neq ""}
-    {$result.epouse} {$result.prenom}
-    <br />({$result.nom} {$result.prenom})
-  {else}
-    {$result.nom} {$result.prenom}
-  {/if}
+  {if $result.epouse}{$result.epouse} {$result.prenom} <br />({$result.nom} {$result.prenom}){else}{$result.nom} {$result.prenom}{/if}
   {if $result.decede == 1}
     (décédé)
   {/if}