Merge commit 'origin/platal-0.10.0'

[platal.git] / htdocs / webredirect.php

diff --git a/htdocs/webredirect.php b/htdocs/webredirect.php
index dfecc26..3b96319 100644 (file)
--- a/htdocs/webredirect.php
+++ b/htdocs/webredirect.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2007 Polytechnique.org                              *
+ *  Copyright (C) 2003-2009 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -19,18 +19,18 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once dirname(__FILE__).'/../include/xorg.inc.php';
+require_once 'xorg.inc.php';
+
+new Xorg('core');
 
 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')) 
-      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);
+        "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 = {?}
+       GROUP BY  redirecturl", $username);
 
 if ($url = $res->fetchOneCell()) {
     $url = preg_replace('@/+$@', '', $url);
@@ -55,5 +55,7 @@ header("HTTP/1.0 404 Not Found");
     <hr>
     <address>Apache Server at www.carva.org Port 80</address>
   </body>
+</html>
+<?php
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>