From a9816536b7770ab8df5059396f90c83c79e8a2dc Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Tue, 12 Dec 2006 20:17:05 +0000
Subject: [PATCH] =?UTF-8?q?H=C3=A9=20James,=20attention,=20tu=20en=20as=20?=
=?UTF-8?q?oubli=C3=A9=2024=20des=20echo=20sur=20minipres.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/exec/admin_repair.php | 4 ++--
ecrire/exec/aide_index.php | 2 +-
ecrire/exec/dater.php | 2 +-
ecrire/exec/documenter.php | 2 +-
ecrire/exec/documents_colonne.php | 2 +-
ecrire/exec/editer_auteurs.php | 2 +-
ecrire/exec/editer_mot.php | 2 +-
ecrire/exec/iconifier.php | 2 +-
ecrire/exec/legender.php | 2 +-
ecrire/exec/petitionner.php | 2 +-
ecrire/exec/referencer_traduction.php | 2 +-
ecrire/exec/regler_moderation.php | 2 +-
ecrire/exec/tourner.php | 2 +-
ecrire/exec/virtualiser.php | 2 +-
ecrire/inc/admin.php | 4 ++--
ecrire/inc/ajouter_documents.php | 2 +-
ecrire/inc/auth.php | 4 ++--
ecrire/inc/getdocument.php | 2 +-
ecrire/inc/legender.php | 2 +-
ecrire/inc/meta.php | 2 +-
ecrire/inc/minipres.php | 3 ++-
ecrire/inc/securiser_action.php | 2 +-
ecrire/inc/utils.php | 2 +-
ecrire/public/cacher.php | 2 +-
24 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/ecrire/exec/admin_repair.php b/ecrire/exec/admin_repair.php
index 0792e79e11..0b5520eccb 100644
--- a/ecrire/exec/admin_repair.php
+++ b/ecrire/exec/admin_repair.php
@@ -87,10 +87,10 @@ function exec_admin_repair_dist()
if (! $res = verifier_base())
$res = "<br /><br /><font color='red'><b><tt>"._T('avis_erreur_mysql').' '.spip_sql_errno().': '.spip_sql_error() ."</tt></b></font><br /><br /><br />\n";
fin_admin($action);
- minipres(_T('texte_tentative_recuperation'), $res);
+ echo minipres(_T('texte_tentative_recuperation'), $res);
}
else {
- minipres(_T('titre_reparation'), "<p>$message</p>");
+ echo minipres(_T('titre_reparation'), "<p>$message</p>");
}
}
?>
diff --git a/ecrire/exec/aide_index.php b/ecrire/exec/aide_index.php
index 5e9475c1b7..e555904d68 100644
--- a/ecrire/exec/aide_index.php
+++ b/ecrire/exec/aide_index.php
@@ -44,7 +44,7 @@ function help_frame ($aide, $lang) {
// http://doc.spip.org/@erreur_aide_indisponible
function erreur_aide_indisponible() {
global $help_server;
- minipres(_T('forum_titre_erreur'),
+ echo minipres(_T('forum_titre_erreur'),
"<div>$help_server: "._T('aide_non_disponible')."</div><div align='right'>".menu_langues('var_lang_ecrire')."</div>");
}
diff --git a/ecrire/exec/dater.php b/ecrire/exec/dater.php
index ead932d94a..a52c53817a 100644
--- a/ecrire/exec/dater.php
+++ b/ecrire/exec/dater.php
@@ -25,7 +25,7 @@ function exec_dater_dist()
OR ($type == 'article' AND !acces_article($id))) {
spip_log("Tentative d'intrusion du " . $GLOBALS['auteur_session']['statut'] . ' ' . $GLOBALS['auteur_session']['nom'] . " dans " . $GLOBALS['exec'] . " sur $type $id.");
include_spip('inc/minipres');
- minipres(_T('info_acces_interdit'));
+ echo minipres(_T('info_acces_interdit'));
}
$table = ($type=='syndic') ? 'syndic' : ($type . 's');
diff --git a/ecrire/exec/documenter.php b/ecrire/exec/documenter.php
index bdd3e05768..9e15e8f4f7 100644
--- a/ecrire/exec/documenter.php
+++ b/ecrire/exec/documenter.php
@@ -43,7 +43,7 @@ function exec_documenter_dist()
if (!$editable) {
spip_log("Tentative d'intrusion de " . $GLOBALS['auteur_session']['nom'] . " dans " . $GLOBALS['exec']);
include_spip('inc/minipres');
- minipres(_T('info_acces_interdit'));
+ echo minipres(_T('info_acces_interdit'));
}
$documenter = charger_fonction('documenter', 'inc');
diff --git a/ecrire/exec/documents_colonne.php b/ecrire/exec/documents_colonne.php
index 3e213fd2be..071066ed30 100644
--- a/ecrire/exec/documents_colonne.php
+++ b/ecrire/exec/documents_colonne.php
@@ -23,7 +23,7 @@ function exec_documents_colonne_dist()
: acces_rubrique($id))) {
spip_log("Tentative d'intrusion de " . $GLOBALS['auteur_session']['nom'] . " dans " . $GLOBALS['exec']);
include_spip('inc/minipres');
- minipres(_T('info_acces_interdit'));
+ echo minipres(_T('info_acces_interdit'));
}
include_spip("inc/documents");
diff --git a/ecrire/exec/editer_auteurs.php b/ecrire/exec/editer_auteurs.php
index 8e81dd5e46..b100a1bea6 100644
--- a/ecrire/exec/editer_auteurs.php
+++ b/ecrire/exec/editer_auteurs.php
@@ -20,7 +20,7 @@ function exec_editer_auteurs_dist()
if (! acces_article($id_article)) {
spip_log("Tentative d'intrusion de " . $GLOBALS['auteur_session']['nom'] . " dans " . $GLOBALS['exec']);
include_spip('inc/minipres');
- minipres(_T('info_acces_interdit'));
+ echo minipres(_T('info_acces_interdit'));
}
$editer_auteurs = charger_fonction('editer_auteurs', 'inc');
diff --git a/ecrire/exec/editer_mot.php b/ecrire/exec/editer_mot.php
index 4f6d895d34..7729740a89 100644
--- a/ecrire/exec/editer_mot.php
+++ b/ecrire/exec/editer_mot.php
@@ -35,7 +35,7 @@ function exec_editer_mot_dist()
if (!$droit) {
spip_log("Tentative d'intrusion de " . $GLOBALS['auteur_session']['nom'] . " dans " . $GLOBALS['exec']);
include_spip('inc/minipres');
- minipres(_T('info_acces_interdit'));
+ echo minipres(_T('info_acces_interdit'));
}
$ch = _request('cherche_mot');
diff --git a/ecrire/exec/iconifier.php b/ecrire/exec/iconifier.php
index e18a522626..4ce007e625 100644
--- a/ecrire/exec/iconifier.php
+++ b/ecrire/exec/iconifier.php
@@ -44,7 +44,7 @@ function exec_iconifier_dist()
if (!$droit) {
spip_log("Tentative d'intrusion de " . $GLOBALS['auteur_session']['nom'] . " dans " . $GLOBALS['exec']);
include_spip('inc/minipres');
- minipres(_T('info_acces_interdit'));
+ echo minipres(_T('info_acces_interdit'));
}
$iconifier = charger_fonction('iconifier', 'inc');
diff --git a/ecrire/exec/legender.php b/ecrire/exec/legender.php
index 00e3d5c9b2..a863e6b271 100644
--- a/ecrire/exec/legender.php
+++ b/ecrire/exec/legender.php
@@ -24,7 +24,7 @@ function exec_legender_dist()
: acces_rubrique($id))) {
spip_log("Tentative d'intrusion de " . $GLOBALS['auteur_session']['nom'] . " dans " . $GLOBALS['exec']);
include_spip('inc/minipres');
- minipres(_T('info_acces_interdit'));
+ echo minipres(_T('info_acces_interdit'));
}
$legender = charger_fonction('legender', 'inc');
diff --git a/ecrire/exec/petitionner.php b/ecrire/exec/petitionner.php
index 7c7b3607d8..df7acaa115 100644
--- a/ecrire/exec/petitionner.php
+++ b/ecrire/exec/petitionner.php
@@ -21,7 +21,7 @@ function exec_petitionner_dist()
if (!acces_article($id_article)) {
spip_log("Tentative d'intrusion de " . $GLOBALS['auteur_session']['nom'] . " dans " . $GLOBALS['exec']);
include_spip('inc/minipres');
- minipres(_T('info_acces_interdit'));
+ echo minipres(_T('info_acces_interdit'));
}
$petitionner = charger_fonction('petitionner', 'inc');
diff --git a/ecrire/exec/referencer_traduction.php b/ecrire/exec/referencer_traduction.php
index 9088d04961..cf3e555a8d 100644
--- a/ecrire/exec/referencer_traduction.php
+++ b/ecrire/exec/referencer_traduction.php
@@ -20,7 +20,7 @@ function exec_referencer_traduction_dist()
if (!acces_article($id_article)) {
spip_log("Tentative d'intrusion de " . $GLOBALS['auteur_session']['nom'] . " dans " . $GLOBALS['exec']);
include_spip('inc/minipres');
- minipres(_T('info_acces_interdit'));
+ echo minipres(_T('info_acces_interdit'));
}
$row = spip_fetch_array(spip_query("SELECT id_trad, id_rubrique FROM spip_articles WHERE id_article=$id_article"));
diff --git a/ecrire/exec/regler_moderation.php b/ecrire/exec/regler_moderation.php
index da1167823d..a98a47f87c 100644
--- a/ecrire/exec/regler_moderation.php
+++ b/ecrire/exec/regler_moderation.php
@@ -21,7 +21,7 @@ function exec_regler_moderation_dist()
if (!acces_article($id_article)) {
spip_log("Tentative d'intrusion de " . $GLOBALS['auteur_session']['nom'] . " dans " . $GLOBALS['exec']);
include_spip('inc/minipres');
- minipres(_T('info_acces_interdit'));
+ echo minipres(_T('info_acces_interdit'));
}
$regler_moderation = charger_fonction('regler_moderation', 'inc');
diff --git a/ecrire/exec/tourner.php b/ecrire/exec/tourner.php
index 14af15092b..d347d9ac02 100644
--- a/ecrire/exec/tourner.php
+++ b/ecrire/exec/tourner.php
@@ -24,7 +24,7 @@ function exec_tourner_dist()
: acces_rubrique($id))) {
spip_log("Tentative d'intrusion de " . $GLOBALS['auteur_session']['nom'] . " dans " . $GLOBALS['exec']);
include_spip('inc/minipres');
- minipres(_T('info_acces_interdit'));
+ echo minipres(_T('info_acces_interdit'));
}
$tourner = charger_fonction('tourner', 'inc');
diff --git a/ecrire/exec/virtualiser.php b/ecrire/exec/virtualiser.php
index 792b8c34cf..26bba2b4b0 100644
--- a/ecrire/exec/virtualiser.php
+++ b/ecrire/exec/virtualiser.php
@@ -21,7 +21,7 @@ function exec_virtualiser_dist()
if (!acces_article($id_article)) {
spip_log("Tentative d'intrusion de " . $GLOBALS['auteur_session']['nom'] . " dans " . $GLOBALS['exec']);
include_spip('inc/minipres');
- minipres(_T('info_acces_interdit'));
+ echo minipres(_T('info_acces_interdit'));
}
$row = spip_fetch_array(spip_query("SELECT chapo FROM spip_articles WHERE id_article='$id_article'"));
diff --git a/ecrire/inc/admin.php b/ecrire/inc/admin.php
index f99c5e394e..aabc91e1b4 100644
--- a/ecrire/inc/admin.php
+++ b/ecrire/inc/admin.php
@@ -24,7 +24,7 @@ function debut_admin($script, $action, $commentaire='') {
if ((!$action) || ($connect_statut != "0minirezo")) {
include_spip('inc/minipres');
- minipres(_T('info_acces_refuse'));
+ echo minipres(_T('info_acces_refuse'));
}
if ($connect_toutes_rubriques) {
$dir = _DIR_TMP;
@@ -57,7 +57,7 @@ function debut_admin($script, $action, $commentaire='') {
. bouton_suivant(_T('recharger_page'))))
. "</form>";
- minipres(_T('info_action', array('action' => $action)),
+ echo minipres(_T('info_action', array('action' => $action)),
$form,
" onload='barre_inserer(\"$signal\", document.forms[0].fichier)'");
}
diff --git a/ecrire/inc/ajouter_documents.php b/ecrire/inc/ajouter_documents.php
index c1a8aa67cc..df03eeb7a0 100644
--- a/ecrire/inc/ajouter_documents.php
+++ b/ecrire/inc/ajouter_documents.php
@@ -468,7 +468,7 @@ function liste_archive_jointe($valables, $mode, $type, $id, $id_document, $hash,
exit;
}
- minipres(_T('upload_fichier_zip'),
+ echo minipres(_T('upload_fichier_zip'),
"<p>" .
_T('upload_fichier_zip_texte') .
"</p><p>" .
diff --git a/ecrire/inc/auth.php b/ecrire/inc/auth.php
index 893c4b00e3..d7fbf1e929 100644
--- a/ecrire/inc/auth.php
+++ b/ecrire/inc/auth.php
@@ -225,9 +225,9 @@ function auth_areconnecter($auth_login)
if (!spip_connect()) {
spip_log("Erreur base de donnees");
- minipres(_T('info_travaux_titre'), _T('titre_probleme_technique'). "<p><tt>".spip_sql_errno()." ".spip_sql_error()."</tt></p>");
+ echo minipres(_T('info_travaux_titre'), _T('titre_probleme_technique'). "<p><tt>".spip_sql_errno()." ".spip_sql_error()."</tt></p>");
} else {
- minipres(_T('avis_erreur_connexion'), "<br><br><p>" . _T('texte_inc_auth_1', array('auth_login' => $auth_login)). " <a href='". generer_url_action('logout', "logout=prive"). "'>". _T('texte_inc_auth_2'). "</a>"._T('texte_inc_auth_3'));
+ echo minipres(_T('avis_erreur_connexion'), "<br><br><p>" . _T('texte_inc_auth_1', array('auth_login' => $auth_login)). " <a href='". generer_url_action('logout', "logout=prive"). "'>". _T('texte_inc_auth_2'). "</a>"._T('texte_inc_auth_3'));
}
}
diff --git a/ecrire/inc/getdocument.php b/ecrire/inc/getdocument.php
index 7e5c218708..2f752519f0 100644
--- a/ecrire/inc/getdocument.php
+++ b/ecrire/inc/getdocument.php
@@ -158,7 +158,7 @@ function erreur_upload_trop_gros() {
array('max' => ini_get('upload_max_filesize')))
."</p>";
- minipres(_T('pass_erreur'),"<div class='upload_answer upload_error'>".$msg."</div>");
+ echo minipres(_T('pass_erreur'),"<div class='upload_answer upload_error'>".$msg."</div>");
exit;
}
diff --git a/ecrire/inc/legender.php b/ecrire/inc/legender.php
index fe183f0a83..0b58276ab7 100644
--- a/ecrire/inc/legender.php
+++ b/ecrire/inc/legender.php
@@ -91,7 +91,7 @@ function inc_legender_dist($id_document, $document, $script, $type, $id, $ancre,
"</textarea>\n" .
$taille .
"\n<div " .
- ($flag == 'ajax' ? '' : "class='display_au_chargement'") .
+ ($flag == 'ajax' ? '' : "class='display_au_chargement' ") .
"id='valider_doc$id_document' align='".
$GLOBALS['spip_lang_right'].
"'>\n<input class='fondo' style='font-size:9px;' value='".
diff --git a/ecrire/inc/meta.php b/ecrire/inc/meta.php
index c3a45faeb5..89f3ecc933 100644
--- a/ecrire/inc/meta.php
+++ b/ecrire/inc/meta.php
@@ -59,7 +59,7 @@ function ecrire_metas() {
$ok = ecrire_fichier (_FILE_META, serialize($GLOBALS['meta']));
if (!$ok && $GLOBALS['connect_statut'] == '0minirezo') {
include_spip('inc/minipres');
- minipres(_T('texte_inc_meta_2'), "<h4 font color=red>"
+ echo minipres(_T('texte_inc_meta_2'), "<h4 font color=red>"
. _T('texte_inc_meta_1', array('fichier' => _FILE_META))
. " <a href='". generer_url_action('test_dirs'). "'>"
. _T('texte_inc_meta_2')
diff --git a/ecrire/inc/minipres.php b/ecrire/inc/minipres.php
index 0c5e15c629..996c13b301 100644
--- a/ecrire/inc/minipres.php
+++ b/ecrire/inc/minipres.php
@@ -13,6 +13,7 @@
if (!defined("_ECRIRE_INC_VERSION")) return;
include_spip('inc/lang');
+include_spip('inc/texte');
//
// Presentation des pages d'installation et d'erreurs
@@ -312,7 +313,7 @@ function http_img_pack($img, $alt, $att, $title='') {
return "<img src='" . http_wrapper($img)
. ("'\nalt=\"" .
- str_replace('"','', ($alt ? $alt : ($title ? $title : '')))
+ str_replace('"','', textebrut($alt ? $alt : ($title ? $title : '')))
. '" ')
. ($title ? " title=\"$title\"" : '')
. $att
diff --git a/ecrire/inc/securiser_action.php b/ecrire/inc/securiser_action.php
index e7e2f5f399..1a83be8e02 100644
--- a/ecrire/inc/securiser_action.php
+++ b/ecrire/inc/securiser_action.php
@@ -25,7 +25,7 @@ function inc_securiser_action_dist($action='', $arg='', $redirect="", $mode=fals
return securiser_action_auteur($action, $arg, $redirect, $mode, $att);
elseif (!verifier_action_auteur(_request('action') . '-' . _request('arg'), _request('hash'))) {
include_spip('inc/minipres');
- minipres(_T('info_acces_interdit'));
+ echo minipres(_T('info_acces_interdit'));
}
}
diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php
index f5a3d3c85d..f757d0effc 100644
--- a/ecrire/inc/utils.php
+++ b/ecrire/inc/utils.php
@@ -54,7 +54,7 @@ function charger_fonction($nom, $dossier='exec', $continue=false) {
($inc ? "" : " (fichier $d absent)"));
include_spip('inc/minipres');
- minipres(_T('forum_titre_erreur'),
+ echo minipres(_T('forum_titre_erreur'),
_T('fichier_introuvable', array('fichier'=> '<b>'.htmlentities($d).'</b>')));
}
diff --git a/ecrire/public/cacher.php b/ecrire/public/cacher.php
index 530e745fad..8a819afbe0 100644
--- a/ecrire/public/cacher.php
+++ b/ecrire/public/cacher.php
@@ -216,7 +216,7 @@ function public_cacher_dist($contexte, &$use_cache, &$chemin_cache, &$page, &$la
else {
spip_log("Erreur base de donnees, impossible utiliser $chemin_cache");
include_spip('inc/minipres');
- minipres(_T('info_travaux_titre'), _T('titre_probleme_technique'));
+ echo minipres(_T('info_travaux_titre'), _T('titre_probleme_technique'));
}
}
--
GitLab