From 71cdeb001a2232c54c67f36f91f3fc73d7a8d16d Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Thu, 13 Jan 2005 10:37:11 +0000
Subject: [PATCH] ne plus accepter {par $...}
---
inc-criteres.php3 | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/inc-criteres.php3 b/inc-criteres.php3
index 856b846e50..8a4ef80671 100644
--- a/inc-criteres.php3
+++ b/inc-criteres.php3
@@ -250,14 +250,8 @@ function critere_par_dist($idb, &$boucles, $param, $not) {
}
}
// tris specifies par l'URL
- // (formule composee, virgules, etc).
- // hack {par $GLOBALS["tri"]} obsolete; utiliser #HTTP_VARS{tri}
- elseif ($tri[0] == '$')
- $boucle->order = $tri;
else {
- $a = calculer_param_dynamique($tri, $boucles, $idb);
- if (ereg('" \. *addslashes(.*)\. "', $a, $m)) $a = $m[1];
- $boucle->order = $a;
+ $boucle->order = simplifie_param_dynamique($tri, $boucles, $idb);
}
}
@@ -285,8 +279,7 @@ function calculer_critere_parties_aux($idb, &$boucles, $param) {
if ($m[1] == 'n')
$a = 'n';
else {
- $a = calculer_param_dynamique($m[1], $boucles, $idb);
- if (ereg('" \. *addslashes(.*)\. "', $a, $m2)) $a = $m2[1];
+ $a = simplifie_param_dynamique($m[1], $boucles, $idb);
}
return array($a, ($m[5] ? $m[5] : 0));
}
@@ -625,4 +618,11 @@ function calculer_params_dynamiques($liste, &$boucles, $idb) {
}
return join(',', $res);
}
+
+function simplifie_param_dynamique($val, &$boucles, $idb)
+{
+ $a = calculer_param_dynamique($val, $boucles, $idb);
+ if (!ereg('" \. *(.*)\. "', $a, $m)) return $a;
+ return $m[1];
+}
?>
--
GitLab