From: x2000habouzit <x2000habouzit>
Date: Mon, 15 Nov 2004 08:30:15 +0000 (+0000)
Subject: backport
X-Git-Tag: xorg/old~937
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=85632b0d2389e3903c1cea3bba2309b673bad010;p=platal.git

backport
---

diff --git a/include/valid_aliases.inc.php b/include/valid_aliases.inc.php
index b3b4312..db59d17 100644
--- a/include/valid_aliases.inc.php
+++ b/include/valid_aliases.inc.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: valid_aliases.inc.php,v 1.18 2004-11-07 20:17:23 x2000habouzit Exp $
+        $Id: valid_aliases.inc.php,v 1.19 2004-11-15 08:30:15 x2000habouzit Exp $
  ***************************************************************************/
 
 class AliasReq extends Validate {
@@ -41,8 +41,8 @@ class AliasReq extends Validate {
 	      FROM  auth_user_md5    AS u
 	INNER JOIN  aliases          AS l  ON (u.user_id=l.id AND l.type='a_vie')
 	 LEFT JOIN  virtual_redirect AS vr ON (CONCAT(l.alias,'@m4x.org') = vr.redirect)
-	 LEFT JOIN  virtual          AS v  USING(vid)
-             WHERE  user_id='".$this->uid."' AND v.alias LIKE '%@melix.net'");
+	 LEFT JOIN  virtual          AS v  ON(v.vid=vr.vid AND v.alias LIKE '%@melix.net')
+             WHERE  user_id='".$this->uid."'");
         list($this->forlife,$this->prenom,$this->nom,$this->old) = mysql_fetch_row($sql);
         mysql_free_result($sql);
     }