get rid of username in search

diff --git a/htdocs/advanced_search.php b/htdocs/advanced_search.php
index 19c02a5..95331c7 100644 (file)
--- a/htdocs/advanced_search.php
+++ b/htdocs/advanced_search.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: advanced_search.php,v 1.6 2004-08-31 21:02:10 x2000bedo Exp $
+        $Id: advanced_search.php,v 1.7 2004-09-02 23:04:19 x2000bedo Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -78,12 +78,13 @@ if (array_key_exists('rechercher', $_REQUEST)) {
                        u.prenom,
                        u.promo,
                        i.deces!=0 AS decede,
-                       u.username,
+                       a.alias AS forlife,
                        u.date,
                        ad0.text AS app0text, ad0.url AS app0url, ai0.type AS app0type,
                        ad1.text AS app1text, ad1.url AS app1url, ai1.type AS app1type,
                        c.uid AS contact
                  FROM  auth_user_md5  AS u '.$fields->get_select_statement().'
+           INNER JOIN  aliases        AS a ON (u.user_id = a.id AND a.type="a_vie")
            INNER JOIN  identification AS i ON (i.matricule=u.matricule)
             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)

diff --git a/htdocs/search.php b/htdocs/search.php
index bd96ff2..502bba6 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.16 2004-08-31 10:03:28 x2000habouzit Exp $
+        $Id: search.php,v 1.17 2004-09-02 23:04:19 x2000bedo Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -68,7 +68,7 @@ if (array_key_exists('rechercher', $_REQUEST)) {
                        IF(u.prenom!="",u.prenom,i.prenom) AS prenom,
                        IF(u.promo!="",u.promo,i.promo) AS promo,
                        i.deces!=0 AS decede,
-                       u.username,
+                       a.alias AS forlife,
                        u.date,
                        ad0.text AS app0text, ad0.url AS app0url, ai0.type AS app0type,
                        ad1.text AS app1text, ad1.url AS app1url, ai1.type AS app1type,
@@ -76,6 +76,7 @@ if (array_key_exists('rechercher', $_REQUEST)) {
                  FROM  '.(($with_soundex)?'recherche_soundex':'recherche').'      AS r
            INNER JOIN  identification AS i ON (i.matricule=r.matricule)
             LEFT JOIN  auth_user_md5  AS u ON (u.matricule=r.matricule)
+            LEFT JOIN  aliases        AS a ON (u.user_id = a.id AND a.type="a_vie")
             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/search.result.private.tpl b/templates/search.result.private.tpl
index 2b7767d..ca16574 100644 (file)
--- a/templates/search.result.private.tpl
+++ b/templates/search.result.private.tpl
@@ -17,18 +17,18 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: search.result.private.tpl,v 1.7 2004-08-31 22:21:05 x2000habouzit Exp $
+        $Id: search.result.private.tpl,v 1.8 2004-09-02 23:04:21 x2000bedo Exp $
  ***************************************************************************}
 
 <div class="bits">
   {if $result.inscrit==1}
-    <a href="javascript:x()" onclick="popWin('fiche.php?user={$result.username}')">
+    <a href="javascript:x()" onclick="popWin('fiche.php?user={$result.forlife}')">
       <img src="images/loupe.gif" alt="Afficher les détails" />
     </a>
-    <a href="vcard.php/{$result.username}.vcf?x={$result.username}">
+    <a href="vcard.php/{$result.forlife}.vcf?x={$result.forlife}">
       <img src="images/vcard.png" alt="Afficher la carte de visite" />
     </a>
-    <a href="mescontacts.php?action={if $result.contact!=""}retirer{else}ajouter{/if}&amp;user={$result.username}&amp;mode=normal">
+    <a href="mescontacts.php?action={if $result.contact!=""}retirer{else}ajouter{/if}&amp;user={$result.forlife}&amp;mode=normal">
       <img src="images/{if $result.contact!=""}retirer{else}ajouter{/if}.gif" alt="{if $result.contact!=""}Retirer de{else}Ajouter parmi{/if} mes contacts" />
     </a>
   {/if}