X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=htdocs%2Fwebredirect.php;h=fd83b8d03e683a373a243f38f0d112093542983d;hb=baa62e58cdfb6839040e156ef91e2827bdde1600;hp=95c478e7a63bffdc4182d685e08cb5a4efbd4c70;hpb=42a50827dc2ac2b13ddaf77ea16c0989cd8b960d;p=platal.git

diff --git a/htdocs/webredirect.php b/htdocs/webredirect.php
index 95c478e..fd83b8d 100644
--- a/htdocs/webredirect.php
+++ b/htdocs/webredirect.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2007 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -21,12 +21,16 @@
 
 require_once dirname(__FILE__).'/../include/xorg.inc.php';
 
+global $globals;
 list($username, $path) = preg_split('/\//', $_SERVER["REQUEST_URI"], 2, PREG_SPLIT_NO_EMPTY);
 $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'))
-          WHERE  al.alias = {?}", $username);
+      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);
 
 if ($url = $res->fetchOneCell()) {
     $url = preg_replace('@/+$@', '', $url);
@@ -51,4 +55,5 @@ header("HTTP/1.0 404 Not Found");
     <hr>
     <address>Apache Server at www.carva.org Port 80</address>
   </body>
-</html>
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
+?>