From 7b58a080f49fb6ff355bde92c0c852f5fd95f911 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Tue, 30 Nov 2004 14:50:39 +0000
Subject: [PATCH] transfert dans l'API d'une fonction de balise pour Mortimer
http://www.spip-contrib.net/ecrire/articles.php3?id_article=787
---
inc-balises.php3 | 23 +----------------------
inc-calcul-outils.php3 | 4 ++--
inc-compilo-index.php3 | 26 ++++++++++++++++++++++++++
3 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/inc-balises.php3 b/inc-balises.php3
index 6204c12416..0c22f1289b 100644
--- a/inc-balises.php3
+++ b/inc-balises.php3
@@ -281,28 +281,7 @@ function balise_TOTAL_BOUCLE_dist($p) {
}
function balise_POINTS_dist($p) {
- $n = 0;
- $b = $p->id_boucle;
- $p->code = '';
- while ($b != '') {
- if ($s = $p->boucles[$b]->param) {
- foreach($s as $v) {
- if (strpos($v,'recherche') !== false) {
- $p->code = '$Pile[$SP' . (($n==0) ? "" : "-$n") .
- '][points]';
- $b = '';
- break;
- }
- }
- }
- $n++;
- $b = $p->boucles[$b]->id_parent;
- }
- if (!$p->code) {
- erreur_squelette(_L("Champ #POINTS hors d'une recherche"), $p->id_boucle);
- }
- $p->statut = 'php';
- return $p;
+ return rindex_pile($p, 'points', 'recherche');
}
function balise_POPULARITE_ABSOLUE_dist($p) {
diff --git a/inc-calcul-outils.php3 b/inc-calcul-outils.php3
index fba6fdacc3..452ffab73e 100644
--- a/inc-calcul-outils.php3
+++ b/inc-calcul-outils.php3
@@ -87,8 +87,8 @@ function affiche_logos($arton, $artoff, $lien, $align) {
$afflien = "<div";
$afflien2 = "div>";
}
- $milieu = "$afflien onMouseOver=\"image$num_survol.src=".
- "'$artoff'\" onMouseOut=\"image$num_survol.src=".
+ $milieu = "$afflien onmouseover=\"image$num_survol.src=".
+ "'$artoff'\" onmouseout=\"image$num_survol.src=".
"'$arton'\">$milieu</$afflien2";
}
else if ($lien) {
diff --git a/inc-compilo-index.php3 b/inc-compilo-index.php3
index 00ca62ba10..9a3f442abd 100644
--- a/inc-compilo-index.php3
+++ b/inc-compilo-index.php3
@@ -221,4 +221,30 @@ function calculer_argument_precedent($idb, $nom_champ, &$boucles) {
return index_pile ($boucles[$idb]->id_parent, $nom_champ, $boucles);
}
+function rindex_pile($p, $champ, $motif)
+{
+ $n = 0;
+ $b = $p->id_boucle;
+ $p->code = '';
+ while ($b != '') {
+ if ($s = $p->boucles[$b]->param) {
+ foreach($s as $v) {
+ if (strpos($v,$motif) !== false) {
+ $p->code = '$Pile[$SP' . (($n==0) ? "" : "-$n") .
+ "]['$champ']";
+ $b = '';
+ break;
+ }
+ }
+ }
+ $n++;
+ $b = $p->boucles[$b]->id_parent;
+ }
+ if (!$p->code) {
+ erreur_squelette(_L("Champ #" . strtoupper($champ) . " hors d'une boucle de motif $motif"), $p->id_boucle);
+ }
+ $p->statut = 'php';
+ return $p;
+}
+
?>
--
GitLab