better like that

diff --git a/htdocs/alias.php b/htdocs/alias.php
index 567a5b7..559a68e 100644 (file)
--- a/htdocs/alias.php
+++ b/htdocs/alias.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: alias.php,v 1.7 2004-11-07 18:19:02 x2000habouzit Exp $
+        $Id: alias.php,v 1.8 2004-11-07 20:17:22 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -32,7 +32,7 @@ $page->assign('demande', AliasReq::get_unique_request($_SESSION['uid']));
 $sql = "SELECT  alias
           FROM  virtual
     INNER JOIN  virtual_redirect USING(vid)
-          WHERE redirect='{$_SESSION['forlife']}@m4x.org'";
+          WHERE redirect='{$_SESSION['forlife']}@m4x.org' AND alias LIKE '%@melix.net'";
 if($result = $globals->db->query($sql)) {
     list($aliases) = mysql_fetch_row($result);
     mysql_free_result($result);

diff --git a/htdocs/emails.php b/htdocs/emails.php
index a3ffb2b..5a39687 100644 (file)
--- a/htdocs/emails.php
+++ b/htdocs/emails.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: emails.php,v 1.9 2004-11-07 18:19:02 x2000habouzit Exp $
+        $Id: emails.php,v 1.10 2004-11-07 20:17:22 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -41,7 +41,7 @@ $page->mysql_assign($sql, 'mails', 'nb_mails');
 $sql = "SELECT  alias
           FROM  virtual          AS v
     INNER JOIN  virtual_redirect AS vr USING(vid)
-         WHERE  redirect='{$_SESSION['forlife']}@m4x.org'";
+         WHERE  redirect='{$_SESSION['forlife']}@m4x.org' AND alias LIKE '%@melix.net'";
 $result = $globals->db->query($sql);
 if ($result && list($aliases) = mysql_fetch_row($result))
     $page->assign('melix', substr($aliases,0,-3));

diff --git a/htdocs/routage-mail.php b/htdocs/routage-mail.php
index 1fe9f9a..9372f21 100644 (file)
--- a/htdocs/routage-mail.php
+++ b/htdocs/routage-mail.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: routage-mail.php,v 1.9 2004-11-07 18:19:02 x2000habouzit Exp $
+        $Id: routage-mail.php,v 1.10 2004-11-07 20:17:22 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -46,7 +46,7 @@ if (isset($_REQUEST['emailop'])) {
 $sql = "SELECT  alias
           FROM  virtual
     INNER JOIN  virtual_redirect USING(vid)
-          WHERE redirect='{$_SESSION['forlife']}@m4x.org'";
+          WHERE redirect='{$_SESSION['forlife']}@m4x.org' AND alias LIKE '%@melix.net'";
 $res = $globals->db->query($sql);
 list($grx) = mysql_fetch_row($res);
 $page->assign('grx',$grx);

diff --git a/include/valid_aliases.inc.php b/include/valid_aliases.inc.php
index 3b29745..b3b4312 100644 (file)
--- 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.17 2004-11-07 18:19:03 x2000habouzit Exp $
+        $Id: valid_aliases.inc.php,v 1.18 2004-11-07 20:17:23 x2000habouzit Exp $
  ***************************************************************************/
 
 class AliasReq extends Validate {
@@ -42,7 +42,7 @@ class AliasReq extends Validate {
        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."'");
+             WHERE  user_id='".$this->uid."' AND v.alias LIKE '%@melix.net'");
         list($this->forlife,$this->prenom,$this->nom,$this->old) = mysql_fetch_row($sql);
         mysql_free_result($sql);
     }