X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=htdocs%2Flistes_redirect.php;h=8c08052c24f8ff9dff9d5c0763cce3bea6a8902f;hb=f6e35ff3fefafe908e1675690340ab93265192a0;hp=b25f634f88a44053d5bf701146c41c27fb09a5a2;hpb=a7de4ef724d1a3b0bf978a50ce7cc9d23412c7a0;p=platal.git

diff --git a/htdocs/listes_redirect.php b/htdocs/listes_redirect.php
index b25f634..8c08052 100644
--- a/htdocs/listes_redirect.php
+++ b/htdocs/listes_redirect.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2007 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -20,22 +20,24 @@
  ***************************************************************************/
 
 require_once dirname(__FILE__).'/../include/xorg.inc.php';
+$platal = new Xorg();
 
-preg_match('/^\/(moderate|admin|members)\/(.*)_([^_]*)$/', $_SERVER['REQUEST_URI'], $matches);
+preg_match('!^/(moderate|admin|members|archives)/(.*)_([^_]*)(/.*)?$!', $_SERVER['REQUEST_URI'], $matches);
 
 if ($matches) {
 
     $action = $matches[1];
     $mbox   = $matches[2];
     $fqdn   = strtolower($matches[3]);
+    $sup    = @$matches[4];
 
     if ($fqdn == 'polytechnique.org') {
-        http_redirect("https://www.polytechnique.org/lists/$action/$mbox");
+        http_redirect("https://www.polytechnique.org/lists/$action/$mbox$sup");
     }
 
-    $res = XDB::query("select diminutif from groupex.asso where mail_domain = {?}", $fqdn);
+    $res = XDB::query("SELECT diminutif FROM groups WHERE mail_domain = {?}", $fqdn);
     if ($gpx = $res->fetchOneCell()) {
-        http_redirect("http://www.polytechnique.net/$gpx/lists/$action/$mbox");
+        http_redirect("http://www.polytechnique.net/$gpx/lists/$action/$mbox$sup");
     }
 }
 ?>
@@ -50,5 +52,7 @@ if ($matches) {
     <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:
 ?>