From 0cf247cce554c7ec82177e2cad7a228fc3a1a5e1 Mon Sep 17 00:00:00 2001 From: Raphael Marichez Date: Thu, 5 May 2005 11:58:59 +0000 Subject: [PATCH] two backports : resolving very minor conflicts Patches applied: * opensource@polytechnique.org--2005/platal--release--0.9.5--patch-16 manageurs bugfix / modif de JM git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-623 --- include/exalead/exalead.parser.inc.php | 8 +------- scripts/listes_redirect.php | 4 ++-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/include/exalead/exalead.parser.inc.php b/include/exalead/exalead.parser.inc.php index 27014d8..d5a15fa 100644 --- a/include/exalead/exalead.parser.inc.php +++ b/include/exalead/exalead.parser.inc.php @@ -270,13 +270,7 @@ class Exalead{ $currentCategory->automatic = $attrs['AUTOMATIC']; $currentCategory->cref = $attrs['CREF']; if(isset($attrs['REFINEHREF'])) $currentCategory->refine_href = convert_url($attrs['REFINEHREF']); - //if(isset($attrs['REFINEHREF'])) $this->currentCategory->refine_href = $attrs['REFINEHREF']; - //if(isset($attrs['EXCLUDEHREF'])){ - // $currentCategory->exclude_href = $attrs['EXCLUDEHREF']; - //} - //else{ - $currentCategory->exclude_href = '_c=-'.$currentCategory->cref; - //} + $currentCategory->exclude_href = '_c=-'.$currentCategory->cref; if(isset($attrs['RESETHREF'])){ $currentCategory->reset_href = $attrs['RESETHREF']; } diff --git a/scripts/listes_redirect.php b/scripts/listes_redirect.php index fa47cac..4a93889 100644 --- a/scripts/listes_redirect.php +++ b/scripts/listes_redirect.php @@ -7,12 +7,12 @@ if (empty($matches)) { $mbox = $matches[2]; $fqdn = strtolower($matches[3]); if ($fqdn == 'polytechnique.org') { - header("Location: https://www.polytechnique.org/listes/$action?liste=$mbox"); + header("Location: https://www.polytechnique.org/listes/$action.php?liste=$mbox"); } else { require("../include/xorg.inc.php"); $res = $globals->xdb->query("select diminutif from groupex.asso where mail_domain = {?}", $fqdn); if ($gpx = $res->fetchOneCell()) { - header("Location: http://www.polytechnique.net/$gpx/listes-$action?liste=$mbox"); + header("Location: http://www.polytechnique.net/$gpx/listes-$action.php?liste=$mbox"); } } } -- 2.1.4