diff --git a/inc-balises.php3 b/inc-balises.php3 index 6204c12416a1063f99f2897c59484bed0896cdaf..0c22f1289b3bef385a2645e649b55c1e43d91813 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 fba6fdacc398228df45a0f02df9db338b9ada987..452ffab73e10a69c105a99b8da28fcf361f13bd1 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 00ca62ba105645c089bb4cde659a7f2e0def1556..9a3f442abd994c0b922f9e66b92c7e3f3e8a2936 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; +} + ?>