diff --git a/formulaire_admin-dist.html b/formulaire_admin-dist.html
index 3e08ba6229a1c4c0a7fdb6a3bcace6014f9f73a2..b27e74912778002e239b5442453e607a128d918a 100644
--- a/formulaire_admin-dist.html
+++ b/formulaire_admin-dist.html
@@ -1,16 +1,16 @@
-[<(#HTTP_VARS{floatdiv}) class="spip-admin-float">]
+[<(#ENV{floatdiv}) class="spip-admin-float">]
<div class="spip-admin-bloc" dir='#LANG_DIR'>
<div class="spip-admin">
<ul>[
- <li><a href='ecrire/articles.php3?id_article=(#HTTP_VARS{id_article})' class='spip-admin-boutons'><:admin_modifier_article:> ([(#HTTP_VARS{id_article})])</a></li>][
- <li><a href='ecrire/breves_voir.php3?id_breve=(#HTTP_VARS{id_breve})' class='spip-admin-boutons'><:admin_modifier_breve:> ([(#HTTP_VARS{id_breve})])</a></li>][
- <li><a href='ecrire/naviguer.php3?id_rubrique=(#HTTP_VARS{id_rubrique})' class='spip-admin-boutons'><:admin_modifier_rubrique:> ([(#HTTP_VARS{id_rubrique})])</a></li>][
- <li><a href='ecrire/mots_edit.php3?id_mot=(#HTTP_VARS{id_mot})' class='spip-admin-boutons'><:admin_modifier_mot:> ([(#HTTP_VARS{id_mot})])</a></li>][
- <li><a href='ecrire/auteurs_edit.php3?id_auteur=(#HTTP_VARS{id_auteur})' class='spip-admin-boutons'><:admin_modifier_auteur:> ([(#HTTP_VARS{id_auteur})])</a></li>]
- <li><a href='[(#HTTP_VARS{action})]var_mode=recalcul' class='spip-admin-boutons'><:admin_recalculer:>[(#HTTP_VARS{use_cache})]</a></li>[
- <li><a href='ecrire/(#HTTP_VARS{statistiques})[id_article=(#HTTP_VARS{id_article})]' class='spip-admin-boutons'><:info_visites:> [(#HTTP_VARS{visites})]; <:info_popularite_5:> [(#HTTP_VARS{popularite})]</a></li>][
- <li><a href='[(#HTTP_VARS{action})]var_mode=(#HTTP_VARS{debug})' class='spip-admin-boutons'><:admin_debug:></a></li>]
+ <li><a href='ecrire/articles.php3?id_article=(#ENV{id_article})' class='spip-admin-boutons'><:admin_modifier_article:> ([(#ENV{id_article})])</a></li>][
+ <li><a href='ecrire/breves_voir.php3?id_breve=(#ENV{id_breve})' class='spip-admin-boutons'><:admin_modifier_breve:> ([(#ENV{id_breve})])</a></li>][
+ <li><a href='ecrire/naviguer.php3?id_rubrique=(#ENV{id_rubrique})' class='spip-admin-boutons'><:admin_modifier_rubrique:> ([(#ENV{id_rubrique})])</a></li>][
+ <li><a href='ecrire/mots_edit.php3?id_mot=(#ENV{id_mot})' class='spip-admin-boutons'><:admin_modifier_mot:> ([(#ENV{id_mot})])</a></li>][
+ <li><a href='ecrire/auteurs_edit.php3?id_auteur=(#ENV{id_auteur})' class='spip-admin-boutons'><:admin_modifier_auteur:> ([(#ENV{id_auteur})])</a></li>]
+ <li><a href='[(#ENV{action})]var_mode=recalcul' class='spip-admin-boutons'><:admin_recalculer:>[(#ENV{use_cache})]</a></li>[
+ <li><a href='ecrire/(#ENV{statistiques})[id_article=(#ENV{id_article})]' class='spip-admin-boutons'><:info_visites:> [(#ENV{visites})]; <:info_popularite_5:> [(#ENV{popularite})]</a></li>][
+ <li><a href='[(#ENV{action})]var_mode=(#ENV{debug})' class='spip-admin-boutons'><:admin_debug:></a></li>]
</ul>
</div>
</div>
-[</(#HTTP_VARS{floatdiv})>]
+[</(#ENV{floatdiv})>]
diff --git a/formulaire_ecrire_auteur-dist.html b/formulaire_ecrire_auteur-dist.html
index 5dffd805108314c0d31b4d921b00f9ae0d1f6132..8d6dd9a50f6d89398a2e6f7207770c389814bfb5 100644
--- a/formulaire_ecrire_auteur-dist.html
+++ b/formulaire_ecrire_auteur-dist.html
@@ -1,20 +1,20 @@
-[<br /><img src='puce(#HTTP_VARS{sujetko}).gif' border='0' alt='-' /> <:form_prop_indiquer_sujet:><br /> ][
-<br /><img src='puce(#HTTP_VARS{mailko}).gif' border='0' alt='-' /> <:form_prop_indiquer_email:><br /><br />
-]<form action="[(#HTTP_VARS{action})]" method='post'>
+[<br /><img src='puce(#ENV{sujetko}).gif' border='0' alt='-' /> <:form_prop_indiquer_sujet:><br /> ][
+<br /><img src='puce(#ENV{mailko}).gif' border='0' alt='-' /> <:form_prop_indiquer_email:><br /><br />
+]<form action="[(#ENV{action})]" method='post'>
<p><label><:form_pet_votre_email:>
<input type="text" class="forml" name="email_message_auteur"
- value="[(#HTTP_VARS{mail})]" size="30" />
+ value="[(#ENV{mail})]" size="30" />
</label></p>
<p><label><:form_prop_sujet:><br />
<input type="text" class="forml" name="sujet_message_auteur"
- value="[(#HTTP_VARS{sujet})]" size="30" />
+ value="[(#ENV{sujet})]" size="30" />
</label></p>
<p>
-<textarea name='texte_message_auteur' rows='10' class='forml' cols='40'>[(#HTTP_VARS{texte})]</textarea>
+<textarea name='texte_message_auteur' rows='10' class='forml' cols='40'>[(#ENV{texte})]</textarea>
</p>
-[<input type="hidden" name="id_auteur" value="(#HTTP_VARS{id_auteur})" />]
+[<input type="hidden" name="id_auteur" value="(#ENV{id_auteur})" />]
<div align="right">
<input type="submit" class="spip_bouton" name="valide"
- value="[(#HTTP_VARS{valide})]" />
+ value="[(#ENV{valide})]" />
</div>
</form>
diff --git a/formulaire_forum-dist.html b/formulaire_forum-dist.html
index c067b96eabcf580240ef8daa8d7c56a797aafaf1..b7a6c4ffd0d0b35f846f057eb355dc0c2cb9dfe4 100644
--- a/formulaire_forum-dist.html
+++ b/formulaire_forum-dist.html
@@ -1,52 +1,52 @@
-<form action="[(#HTTP_VARS{url})]" method="post" name="formulaire">
+<form action="[(#ENV{url})]" method="post" name="formulaire">
<input type="hidden" name="ajout_forum" value="oui" />
-[<input type="hidden" name="alea" value="(#HTTP_VARS{alea})" />]
-[<input type="hidden" name="hash" value="(#HTTP_VARS{hash})" />]
-[<input type="hidden" name="retour" value="(#HTTP_VARS{retour})" />]
+[<input type="hidden" name="alea" value="(#ENV{alea})" />]
+[<input type="hidden" name="hash" value="(#ENV{hash})" />]
+[<input type="hidden" name="retour" value="(#ENV{retour})" />]
-[<p>(#HTTP_VARS*{modere})</p>]
+[<p>(#ENV*{modere})</p>]
-[(#HTTP_VARS*{afficher_texte_hidden})]
-[(#HTTP_VARS*{afficher_texte_input})
- [(#HTTP_VARS*{previsu})
+[(#ENV*{afficher_texte_hidden})]
+[(#ENV*{afficher_texte_input})
+ [(#ENV*{previsu})
<fieldset class="spip_encadrer">
<legend><b><:forum_titre:></b></legend>
<label><input type="text" name="titre"
- [value="(#HTTP_VARS{titre})" ]class="forml" size="40" />
+ [value="(#ENV{titre})" ]class="forml" size="40" />
</label>
</fieldset>
<br />
<fieldset class="spip_encadrer">
<legend><b><:forum_texte:></b></legend>
<p><:info_creation_paragraphe:></p>
- [(#HTTP_VARS{texte}|barre_forum)]
+ [(#ENV{texte}|barre_forum)]
</fieldset>
<br />
- [<p>(#HTTP_VARS*{table})</p>]
+ [<p>(#ENV*{table})</p>]
<fieldset class="spip_encadrer">
<legend><:forum_lien_hyper:></legend>
<p><:forum_page_url:></p>
<p><label><:forum_titre:>
<input type="text" name="nom_site_forum" class="forml" size="40"
- value="[(#HTTP_VARS{nom_site_forum})]" />
+ value="[(#ENV{nom_site_forum})]" />
</label></p>
<p><label><:forum_url:>
<input type="text" name="url_site" class="forml" size="40"
- value="[(#HTTP_VARS{url_site})]" />
+ value="[(#ENV{url_site})]" />
</label></p>
</fieldset>
<br />
<fieldset class="spip_encadrer">
<legend><:forum_qui_etes_vous:></legend>
<p><label><:forum_votre_nom:>
- <input type="text" name="auteur" value="[(#HTTP_VARS{auteur})]"
- class="forml" size="40" [(#HTTP_VARS{disabled})] />
+ <input type="text" name="auteur" value="[(#ENV{auteur})]"
+ class="forml" size="40" [(#ENV{disabled})] />
</label></p>
<p><label><:forum_votre_email:>
<input type="text" name="email_auteur"
- value="[(#HTTP_VARS{email_auteur})]"
- class="forml" size="40" [(#HTTP_VARS{disabled})] />
+ value="[(#ENV{email_auteur})]"
+ class="forml" size="40" [(#ENV{disabled})] />
</label></p>
</fieldset>
<br />
diff --git a/formulaire_inscription-dist.html b/formulaire_inscription-dist.html
index 62db3961bc18824cf9da7edafe34697af225fee4..0b276bff543708d4deceda89db330af2964be9de 100644
--- a/formulaire_inscription-dist.html
+++ b/formulaire_inscription-dist.html
@@ -1,11 +1,11 @@
[
-(#HTTP_VARS*{message})
+(#ENV*{message})
][
-(#HTTP_VARS*{message}|?{'',' '})[
- (#HTTP_VARS{mode}|=={forum}|?{' ',''})
+(#ENV*{message}|?{'',' '})[
+ (#ENV{mode}|=={forum}|?{' ',''})
<:pass_forum_bla:><br /><br />
][
- (#HTTP_VARS{mode}|=={redac}|?{' ',''})
+ (#ENV{mode}|=={redac}|?{' ',''})
<:pass_espace_prive_bla:><br /><br />
]<:form_forum_indiquer_nom_email:>
<form id="inscription" method='post' action='#SELF'
@@ -24,12 +24,12 @@
</div>
</form>[
<script type="text/javascript"><!--
-document.inscription.(#HTTP_VARS{focus}).focus()
+document.inscription.(#ENV{focus}).focus()
--></script>
]
][<br />
<div align="right">
-(#HTTP_VARS{target}|?{' ',''})
+(#ENV{target}|?{' ',''})
<script type="text/javascript"><!--
document.write("<a href='")
document.write((window.opener) ? "javascript:close()" : "./")
diff --git a/formulaire_login-dist.html b/formulaire_login-dist.html
index 4e32042bfda353649d59c5710d0cd0bb812704ec..bc441746d953ac654e20caa72131c4fc7c259c3a 100644
--- a/formulaire_login-dist.html
+++ b/formulaire_login-dist.html
@@ -1,9 +1,9 @@
-[(#HTTP_VARS{echec_cookie})
+[(#ENV{echec_cookie})
<h3 class="spip"><:erreur_probleme_cookie:></h3>
<b><:login_cookie_oblige:></b>
<:login_cookie_accepte:><p />
][
-(#HTTP_VARS*{message})
+(#ENV*{message})
<br />
<:forum_vous_enregistrer:>
[<a href='(#URL_SITE_SPIP|inscriptionok{forum})spip_inscription.php3?mode=forum&focus=nom_inscription&target=spip_pass'
@@ -14,63 +14,63 @@
onclick="javascript:window.open(this.href, 'spip_pass', 'scrollbars=yes, resizable=yes, width=480, height=280'); return false;"><:login_motpasseoublie:></a>]<br /><br />
]<div style="font-family: Verdana,arial,helvetica,sans-serif; font-size: 12px;">
<script type="text/javascript" src="ecrire/md5.js"></script>
- <form id="login[_(#HTTP_VARS{login})]"
- action="[(#HTTP_VARS{action2})]"
- method="post"[(#HTTP_VARS{source}|=={spip}|?{' ',''})
+ <form id="login[_(#ENV{login})]"
+ action="[(#ENV{action2})]"
+ method="post"[(#ENV{source}|=={spip}|?{' ',''})
onSubmit='if (this.session_password.value) {
- this.session_password_md5.value = calcMD5("[(#HTTP_VARS{alea_actuel})]" + this.session_password.value);
- this.next_session_password_md5.value = calcMD5("[(#HTTP_VARS{alea_futur})]" + this.session_password.value);
+ this.session_password_md5.value = calcMD5("[(#ENV{alea_actuel})]" + this.session_password.value);
+ this.next_session_password_md5.value = calcMD5("[(#ENV{alea_futur})]" + this.session_password.value);
this.session_password.value = "";
}']>
<div class="spip_encadrer" style="[(#URL_SITE_SPIP|style_align)]">[
- <div class="reponse_formulaire">(#HTTP_VARS*{erreur})<br /><br /></div>
+ <div class="reponse_formulaire">(#ENV*{erreur})<br /><br /></div>
][
- <label><b><:login_login2:></b><br /></label>(#HTTP_VARS{login}|?{'',' '})
+ <label><b><:login_login2:></b><br /></label>(#ENV{login}|?{'',' '})
<input type="text" id='var_login' name="var_login" class="forml" value="" size="40" />
][
<div>
- <input type="hidden" name="session_login_hidden" value="(#HTTP_VARS{login})" />
+ <input type="hidden" name="session_login_hidden" value="(#ENV{login})" />
<script type="text/javascript"><!--
-document.write("<:login_login:> <b>[(#HTTP_VARS{login})]<" + "/b><br />[<a href='spip_cookie.php3?cookie_admin=non&url=[(#HTTP_VARS{url})][&retour=(#SELF|urlencode)]'><font size='2'><:login_autre_identifiant:><" + "/font><" + "/a>]")
+document.write("<:login_login:> <b>[(#ENV{login})]<" + "/b><br />[<a href='spip_cookie.php3?cookie_admin=non&url=[(#ENV{url})][&retour=(#SELF|urlencode)]'><font size='2'><:login_autre_identifiant:><" + "/font><" + "/a>]")
//--></script>
<noscript>
<font face="Georgia, Garamond, Times, serif" size="3">
<:login_non_securise:>
- <a href="[(#HTTP_VARS{action})]"><:login_recharger:></a>
+ <a href="[(#ENV{action})]"><:login_recharger:></a>
</font>
<label><b><:login_login2:></b><br /></label>
- <input type='text' name='session_login' class='forml' [value="(#HTTP_VARS{login})" ]size='40' />
+ <input type='text' name='session_login' class='forml' [value="(#ENV{login})" ]size='40' />
</noscript>
-[<img src="(#HTTP_VARS{id_auteur}|silogoauteur)"
+[<img src="(#ENV{id_auteur}|silogoauteur)"
width="75"
valign="top"
align="right"
- alt="[(#HTTP_VARS{login})]"><br /><br /><br />]
+ alt="[(#ENV{login})]"><br /><br /><br />]
</div>
<p>
- <label><b><:login_pass2:></b></label> <input type="password" name="session_password"[ id="var_login_(#HTTP_VARS{login})]" class="forml" value="" size="40" />
+ <label><b><:login_pass2:></b></label> <input type="password" name="session_password"[ id="var_login_(#ENV{login})]" class="forml" value="" size="40" />
<br /> <input type="checkbox"
name="session_remember"
- id="session[_(#HTTP_VARS{login})]"
- value="oui"[(#HTTP_VARS*{prefs}|filtre_rester_connecte)checked="checked"]/>
- <label for="session[_(#HTTP_VARS{login})]"><:login_rester_identifie:></label>
+ id="session[_(#ENV{login})]"
+ value="oui"[(#ENV*{prefs}|filtre_rester_connecte)checked="checked"]/>
+ <label for="session[_(#ENV{login})]"><:login_rester_identifie:></label>
</p>
<input type="hidden" name="session_password_md5" value="" />
<input type="hidden" name="next_session_password_md5" value="" />
<input type="hidden" name="essai_login" value="oui" />
-] <input type="hidden" name="url" value="[(#HTTP_VARS{url})]" />
+] <input type="hidden" name="url" value="[(#ENV{url})]" />
<div align="right"><input type="submit" class="spip_bouton" value="<:bouton_valider:>" /></div>
</div>
</form>
<script type="text/javascript"><!--
-document.getElementById('var_login[_(#HTTP_VARS{login})]').focus();
+document.getElementById('var_login[_(#ENV{login})]').focus();
--></script>[
- <form action="(#HTTP_VARS{auth})" method="get">
+ <form action="(#ENV{auth})" method="get">
<fieldset>
<p>
<:login_preferez_refuser:>
<input type="hidden" name="essai_auth_http" value="oui"/>
- [<input type="hidden" name="url" value="(#HTTP_VARS{url})"/>]
+ [<input type="hidden" name="url" value="(#ENV{url})"/>]
<div align="right"><input type="submit" class="spip_bouton" value="<:login_sans_cookiie:>"/></div>
</fieldset>
</form>
diff --git a/formulaire_menu_lang-dist.html b/formulaire_menu_lang-dist.html
index 217fb110ae1ddbb2c4dbb85f2768ab243bca0d86..1434ab8e29613f003d06bb28d309f6bbdfe5280a 100644
--- a/formulaire_menu_lang-dist.html
+++ b/formulaire_menu_lang-dist.html
@@ -1,12 +1,12 @@
-<form action='[(#HTTP_VARS{url})]'
+<form action='[(#ENV{url})]'
method='post'
style='margin:0px; padding:0px;'>[
- <input type='hidden' name='url' value='(#HTTP_VARS{cible})' />
-] <select name='[(#HTTP_VARS{nom})]'
+ <input type='hidden' name='url' value='(#ENV{cible})' />
+] <select name='[(#ENV{nom})]'
class='forml'
style='vertical-align: top; max-height: 24px; margin-bottom: 5px; width: 120px;'
- onchange="document.location.href='[(#HTTP_VARS{retour})]&[(#HTTP_VARS{nom})]='+this.options[this.selectedIndex].value">
- [(#HTTP_VARS*{langues})]
+ onchange="document.location.href='[(#ENV{retour})]&[(#ENV{nom})]='+this.options[this.selectedIndex].value">
+ [(#ENV*{langues})]
</select>
<noscript>
<input type='submit' value='>>' class='spip_bouton' />
diff --git a/formulaire_oubli-dist.html b/formulaire_oubli-dist.html
index 7c00259cbbbdcaebc4c3ebd81800607e3367f2c5..e233ab62e686af5e2e1270df1fd349dc0005f556 100644
--- a/formulaire_oubli-dist.html
+++ b/formulaire_oubli-dist.html
@@ -1,16 +1,16 @@
[
-(#HTTP_VARS*{message})
+(#ENV*{message})
][
-(#HTTP_VARS*{message}|?{'',' '})
+(#ENV*{message}|?{'',' '})
<form id="oubli_form" action='spip_pass.php3' method='post'>
<fieldset style="border: none;"><legend></legend>[
<:pass_nouveau_pass:>
- <input type='hidden' name="p" value="(#HTTP_VARS{p})">
+ <input type='hidden' name="p" value="(#ENV{p})">
<label>
<:pass_choix_pass:>
<input type="password" name="oubli">
</label>][
- (#HTTP_VARS{p}|?{'',' '})
+ (#ENV{p}|?{'',' '})
<label>
<:pass_indiquez_cidessous:>
<input type="texte" name="oubli">
@@ -23,7 +23,7 @@
<div align="right">
<script type="text/javascript"><!--
[
-(#HTTP_VARS*{message}|?{'',' '})
+(#ENV*{message}|?{'',' '})
document.oubli_form.oubli.focus()
]
document.write("<a href='")
diff --git a/formulaire_recherche-dist.html b/formulaire_recherche-dist.html
index aa45b2e8127184847ed93cb792c7180629094f91..355a8cecdba2fc2c6ebff463bc7d2e2168141edb 100644
--- a/formulaire_recherche-dist.html
+++ b/formulaire_recherche-dist.html
@@ -1,9 +1,9 @@
-<form action="[(#HTTP_VARS{lien})]" method="get" class="formrecherche">
+<form action="[(#ENV{lien})]" method="get" class="formrecherche">
<div>
<input type="text"
id="formulaire_recherche"
class="formrecherche"
name="recherche"
- value="[(#HTTP_VARS*{recherche_securisee})]" />
+ value="[(#ENV*{recherche_securisee})]" />
</div>
</form>
diff --git a/formulaire_signature-dist.html b/formulaire_signature-dist.html
index a5dc21114f10f73d093a265f4a3080fdb5d46738..bc1da41ee5890e3dfd9a561d9fe3fa67d982f072 100644
--- a/formulaire_signature-dist.html
+++ b/formulaire_signature-dist.html
@@ -1,8 +1,8 @@
<form method='post'
- action='#SELF#sp[(#HTTP_VARS{id_article})]' >
+ action='#SELF#sp[(#ENV{id_article})]' >
<input type="hidden" name="url_page" value="#URL_SITE_SPIP/#SELF">
<div class='spip_encadrer' style='color: black; font-size: 80%; font-weight: normal;'>
- [(#HTTP_VARS*{texte}|propre)]
+ [(#ENV*{texte}|propre)]
<fieldset style='font-size: 110%; font-weight: bold;'>
<legend></legend>
<label>
@@ -15,7 +15,7 @@
</label>
</fieldset>
<br />
- <p>[(#HTTP_VARS{site_obli}|=={oui}|?{'',' '})<:form_pet_votre_site:><br />]
+ <p>[(#ENV{site_obli}|=={oui}|?{'',' '})<:form_pet_votre_site:><br />]
<fieldset style='font-size: 110%; font-weight: bold;'>
<legend></legend>
<label>
@@ -30,7 +30,7 @@
<br />
<fieldset style='font-weight: bold'>
<legend></legend>
- (#HTTP_VARS{message}|=={oui}|?{' ',''})
+ (#ENV{message}|=={oui}|?{' ',''})
<label>
<:form_pet_message_commentaire:><br />
<textarea name="message" rows="3" class="forml" cols="20"></textarea>
diff --git a/inc-balises.php3 b/inc-balises.php3
index 98a20b7826e45f43f7396b33d61c4ee17ae06701..1a74ed4fea333e66578c1bb0eda4e6f2cee66944 100644
--- a/inc-balises.php3
+++ b/inc-balises.php3
@@ -47,7 +47,7 @@ function champs_traitements ($p) {
'URL_SITE_SPIP' => 'htmlspecialchars(vider_url(%s))',
'URL_SITE' => 'htmlspecialchars(vider_url(%s))',
'URL_SYNDIC' => 'htmlspecialchars(vider_url(%s))',
- 'HTTP_VARS' => 'entites_html(%s)'
+ 'ENV' => 'entites_html(%s)'
);
$ps = $traitements[$p->nom_champ];
if (!$ps) return $p->code;
@@ -694,22 +694,29 @@ function balise_SELF_dist($p) {
return $p;
}
+
//
-// Reference aux parametres GET & POST (ou params dynamiques)
+// #ENV
+// l'"environnement", id est le $contexte (ou $contexte_inclus)
//
// en standard on applique |entites_html, mais attention si
-// vous utilisez [(#HTTP_VARS*{toto})] il *faut* vous assurer vous-memes
+// vous utilisez [(#ENV*{toto})] il *faut* vous assurer vous-memes
// de la securite anti-php et anti-javascript
//
-function balise_HTTP_VARS_dist($p) {
+// La syntaxe #ENV{toto, rempl} renverra 'rempl' si $toto est vide
+//
+function balise_ENV_dist($p) {
$nom = param_balise($p);
- if (!$nom)
- erreur_squelette(
- _T('zbug_champ_argument_manquant',
- array('champ' => '#HTTP_VARS')
- ), $p->id_boucle);
- else {
- $p->code = '$Pile[0]["' . addslashes($nom) . '"]';
+ if (!$nom) {
+ // cas de #ENV sans argument : on retourne le serialize() du tableau
+ // une belle fonction [(#ENV|affiche_env)] serait pratique
+ $p->code = 'serialize($Pile[0])';
+ $p->statut = 'html';
+ } else {
+ // admet deux arguments : nom de variable, valeur par defaut si vide
+ $nom = split(',', $nom, 2);
+ $p->code = 'sinon($Pile[0]["' . addslashes($nom[0]) . '"],
+ \''. texte_script($nom[1]) .'\')';
$p->statut = 'php';
}
return $p;
diff --git a/inc-criteres.php3 b/inc-criteres.php3
index 1e58586108cca2be05f15b4b232da4db96fd400a..4d1e98b32c4ddd909d432a1cd797e9ff6de37bcd 100644
--- a/inc-criteres.php3
+++ b/inc-criteres.php3
@@ -611,7 +611,7 @@ function calculer_param_dynamique($val, &$boucles, $idb) {
} else {
if ($val[0]== '%') {
spip_log($val .
- " est obsolete; utiliser HTTP_VARS{" . substr($val,1) . "}");
+ " est obsolete; utiliser ENV{" . substr($val,1) . "}");
return '" . addslashes($Pile[0][\''. substr($val,1) ."']) . \"";
}
else
diff --git a/nouveautes-dist.html b/nouveautes-dist.html
index 08da97e265c5a558629280c2cc79d79c64be6774..4317522d0cf29a056c8b278279f5d55c8fda78dc 100644
--- a/nouveautes-dist.html
+++ b/nouveautes-dist.html
@@ -4,7 +4,7 @@
<:bonjour|texte_script:>
<:texte_lettre_information|texte_script:> "[(#NOM_SITE_SPIP|textebrut|texte_script)]" (#URL_SITE_SPIP).
-<:texte_lettre_information_2|texte_script:> [(#HTTP_VARS{jours_neuf})] <:jours|texte_script:>.
+<:texte_lettre_information_2|texte_script:> [(#ENV{jours_neuf})] <:jours|texte_script:>.
<BOUCLE0(AUTEURS){0,1}><B_nv1>
<:nouveaux_articles|texte_script:>