From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Tue, 9 Oct 2007 14:07:58 +0000 (+0200)
Subject: Repare carva
X-Git-Tag: xorg/0.9.15~43
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=a40328ac43945999042f31fe7388406b3354350f;p=platal.git

Repare carva
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

diff --git a/htdocs/webredirect.php b/htdocs/webredirect.php
index fd83b8d..d5ef547 100644
--- a/htdocs/webredirect.php
+++ b/htdocs/webredirect.php
@@ -27,10 +27,8 @@ $res = XDB::query(
         "SELECT  redirecturl
            FROM  auth_user_quick AS a
      INNER JOIN  aliases         AS al ON (al.id = a.user_id AND (al.type='a_vie' OR al.type='alias'))
-      LEFT JOIN  virtuals_redirect AS vr ON (vr.redirect LIKE CONCAT(al.alias, '@%')
-     INNER JOIN  virtuals        AS v ON (v.vid = vr.vid)
-          WHERE  al.alias = {?} OR v.alias = CONCAT({?}, '@', {?})
-       GROUP BY  redirecturl", $username, $username, $globals->mail->alias_dom);
+          WHERE  al.alias = {?}
+       GROUP BY  redirecturl", $username);
 
 if ($url = $res->fetchOneCell()) {
     $url = preg_replace('@/+$@', '', $url);