From 1932632877ce6d89ee0414691a5516b67dd55ba5 Mon Sep 17 00:00:00 2001
From: x2000habouzit <x2000habouzit>
Date: Thu, 2 Sep 2004 23:36:57 +0000
Subject: [PATCH] vcard

---
 htdocs/vcard.php                | 20 +++++++++++---------
 templates/include/x_inscrit.tpl |  4 ++--
 templates/vcard.tpl             | 10 +++++-----
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/htdocs/vcard.php b/htdocs/vcard.php
index 72613c3..43d5e57 100644
--- a/htdocs/vcard.php
+++ b/htdocs/vcard.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: vcard.php,v 1.8 2004-08-31 19:48:46 x2000habouzit Exp $
+        $Id: vcard.php,v 1.9 2004-09-02 23:36:57 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -77,18 +77,20 @@ function format_adr($params, &$smarty) {
 $page->register_modifier('qp_enc', 'quoted_printable_encode');
 $page->register_function('format_adr', 'format_adr');
 
-$myquery = 
-    "SELECT prenom, nom, epouse, username, mobile, web, libre, promo, alias, user_id, date
-    FROM auth_user_md5 AS a
-    WHERE username='{$_REQUEST['x']}'";
-    $result=$globals->db->query($myquery);
-if (mysql_num_rows($result)!=1) {
-    exit;
-}
+$myquery = "SELECT  prenom, nom, epouse, mobile, web, libre, promo, user_id, date, a.alias AS forlife
+              FROM  auth_user_md5 AS u
+        INNER JOIN  aliases       AS a  ON (u.user_id=a.id AND a.type='a_vie')
+             WHERE  a.id='{$_REQUEST['x']}'";
+
+$result=$globals->db->query($myquery);
+if (mysql_num_rows($result)!=1) { exit; }
+
 $vcard = mysql_fetch_assoc($result);
 $page->assign_by_ref('vcard', $vcard);
 mysql_free_result($result);
 
+$page->mysql_assign("SELECT alias FROM aliases WHERE id={$vcard['user_id']} AND type!='a_vie'",'aliases');
+
 $adr = $globals->db->query(
         "SELECT statut,adr1,adr2,adr3,cp,ville,gp.pays,gr.name,tel,fax,
         FIND_IN_SET('courrier', a.statut) AS courrier
diff --git a/templates/include/x_inscrit.tpl b/templates/include/x_inscrit.tpl
index efcef0d..d35bccb 100644
--- a/templates/include/x_inscrit.tpl
+++ b/templates/include/x_inscrit.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: x_inscrit.tpl,v 1.8 2004-09-02 23:06:11 x2000habouzit Exp $
+        $Id: x_inscrit.tpl,v 1.9 2004-09-02 23:36:57 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -42,7 +42,7 @@
     <a href="javascript:x()" onclick="popWin('fiche.php?user={$c.forlife}')">
       <img src="images/loupe.gif" alt="Afficher les détails" />
     </a>
-    <a href="vcard.php/{$c.prenom}{$c.nom}..{$c.promo}.vcf?x={$c.user_id}">
+    <a href="vcard.php/{$c.forlife}.vcf?x={$c.user_id}">
       <img src="images/vcard.png" alt="Afficher la carte de visite" />
     </a>
     <a href="mescontacts.php?action={$show_action}&amp;user={$c.user_id}">
diff --git a/templates/vcard.tpl b/templates/vcard.tpl
index 044f693..174ceea 100644
--- a/templates/vcard.tpl
+++ b/templates/vcard.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: vcard.tpl,v 1.3 2004-08-31 11:25:39 x2000habouzit Exp $
+        $Id: vcard.tpl,v 1.4 2004-09-02 23:36:57 x2000habouzit Exp $
  ***************************************************************************}
 
 BEGIN:VCARD
@@ -28,10 +28,10 @@ FN;ENCODING=QUOTED-PRINTABLE:{"`$vcard.prenom` `$vcard.epouse` (`$vcard.nom`)"|q
 FN;ENCODING=QUOTED-PRINTABLE:{"`$vcard.prenom` `$vcard.nom`"|qp_enc}
 {/if}
 N;ENCODING=QUOTED-PRINTABLE:{$vcard.nom|qp_enc};{$vcard.prenom|qp_enc};{$vcard.epouse|qp_enc};;
-EMAIL;TYPE=internet:{$vcard.username}@polytechnique.org
-{if $vcard.alias}
-EMAIL;TYPE=internet:{$vcard.alias}@polytechnique.org
-{/if}
+EMAIL;TYPE=internet:{$vcard.forlife}@polytechnique.org
+{foreach from=$aliases item=a}
+EMAIL;TYPE=internet:{$a.alias}@polytechnique.org
+{/foreach}
 {if $vcard.mobile}
 TEL;TYPE=cell;ENCODING=QUOTED-PRINTABLE:{$vcard.mobile|qp_enc}
 {/if}
-- 
2.1.4