contacts ok

diff --git a/htdocs/mescontacts.php b/htdocs/mescontacts.php
index 1c6cdbb..adf86b1 100644 (file)
--- a/htdocs/mescontacts.php
+++ b/htdocs/mescontacts.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: mescontacts.php,v 1.6 2004-08-31 10:03:28 x2000habouzit Exp $
+        $Id: mescontacts.php,v 1.7 2004-09-02 19:51:22 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -29,16 +29,14 @@ require("applis.func.inc.php");
 if (isset($_REQUEST['action'])) {
     if($_REQUEST['action']=='retirer') {
 
-        if (($res = $globals->db->query("SELECT user_id FROM auth_user_md5 WHERE username='{$_REQUEST['user']}'")) && mysql_num_rows($res)==1) {
-            list($cont_user_id) = mysql_fetch_row($res);
-            if ($globals->db->query("DELETE FROM contacts WHERE uid = '{$_SESSION['uid']}' AND contact='$cont_user_id'"))
-                $page->assign('erreur', "Contact {$_REQUEST['user']} retiré !\n");
-        }
+       list($cont_user_id) = mysql_fetch_row($res);
+       if ($globals->db->query("DELETE FROM contacts WHERE uid = '{$_SESSION['uid']}' AND contact='{$_REQUEST['user']}'"))
+           $page->assign('erreur', "Contact retiré !\n");
 
         // si l'utilisateur demande l'ajout de qqun à sa liste
     } elseif ($_REQUEST["action"]=="ajouter") {
 
-        if (($res = $globals->db->query("SELECT user_id FROM auth_user_md5 WHERE username='".$_REQUEST["user"]."'")) && mysql_num_rows($res)==1) {
+        if (($res = $globals->db->query("SELECT id FROM aliases WHERE alias='{$_REQUEST['user']}'")) && mysql_num_rows($res)==1) {
             list($cont_user_id) = mysql_fetch_row($res);
             if ($globals->db->query("INSERT INTO contacts set uid = '{$_SESSION['uid']}', contact = '$cont_user_id'")) {
                 $page->assign('erreur', 'Contact ajouté !');

diff --git a/templates/include/x_inscrit.tpl b/templates/include/x_inscrit.tpl
index 340613b..f64e970 100644 (file)
--- 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.6 2004-08-31 11:25:40 x2000habouzit Exp $
+        $Id: x_inscrit.tpl,v 1.7 2004-09-02 19:51:23 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -39,13 +39,13 @@
     {/strip}
   </div>
   <div class="bits">
-    <a href="javascript:x()" onclick="popWin('fiche.php?user={$c.username}')">
+    <a href="javascript:x()" onclick="popWin('fiche.php?user={$c.user_id}')">
       <img src="images/loupe.gif" alt="Afficher les détails" />
     </a>
-    <a href="vcard.php/{$c.username}.vcf?x={$c.username}">
+    <a href="vcard.php/{$c.prenom}{$c.nom}..{$c.promo}.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.username}">
+    <a href="mescontacts.php?action={$show_action}&amp;user={$c.user_id}">
       <img src="images/{$show_action}.gif" alt="{$show_action} aux/des contacts" />
     </a>
     {perms level='admin'}