Merge commit 'origin/master' into fusionax

[platal.git] / htdocs / webredirect.php

diff --git a/htdocs/webredirect.php b/htdocs/webredirect.php
index bd9e5a9..0de8baa 100644 (file)
--- a/htdocs/webredirect.php
+++ b/htdocs/webredirect.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2008 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -19,15 +19,18 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once dirname(__FILE__).'/../include/xorg.inc.php';
-require_once dirname(__FILE__).'/../classes/XDB.php';
+require_once 'xorg.inc.php';
 
+new Platal('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'))
-          WHERE  al.alias = {?}", $username);
+          WHERE  al.alias = {?}
+       GROUP BY  redirecturl", $username);
 
 if ($url = $res->fetchOneCell()) {
     $url = preg_replace('@/+$@', '', $url);
@@ -53,3 +56,6 @@ header("HTTP/1.0 404 Not Found");
     <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:
+?>