diff --git a/ecrire/exec/admin_repair.php b/ecrire/exec/admin_repair.php
index 0792e79e115d8d38a7b5ad7581ab2df64207a239..0b5520eccb13fff4799be1e3ac50a7baf3ffc338 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 5e9475c1b72280890a91762847ea6fb916d108d5..e555904d680bd100cc897dcdacef51375ef8b371 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 ead932d94a618cb48f8a7891de43dbcceee27c66..a52c53817a0b2f840fc4d879d82a532cd9fdf1f3 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 bdd3e057686fc9d9cea5deb20f86b56435cbb0b1..9e15e8f4f74d9ef78ca676d877c86674406b762f 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 3e213fd2befa1fc0f8c8382d3729ba4de6cbe627..071066ed3070efdd1b3592e2a293d96c719a4cf9 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 8e81dd5e46d1bcafa65a7d0b52d412011057969e..b100a1bea6fa8121c007db94b2f843e7a565df40 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 4f6d895d34cf31172e2885b2189a19971599c297..7729740a89a86a40dc53a73fcbe61bbe2b312477 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 e18a522626425453e7e7a44b57bc32920820e117..4ce007e625d110babd36f1cfae5bdddca7be680c 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 00e3d5c9b2a52d4f77b72a478575a181e858e9e3..a863e6b271a2136819be542678dc968235bd5b8a 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 7c7b3607d84723866b2f24dc901392eec985ff69..df7acaa115acb93b66785f75921215cd05d5916d 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 9088d049613b8bbcaa83b86fb6a3961499fb4d06..cf3e555a8d1a6c8da2c086ef200eba7b2add23f6 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 da1167823de98bb927dbcfb28905fa89eac0631a..a98a47f87c2ff36a9e495dcbf6f71ff669efc5d4 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 14af15092bd08de046eb6c8855b0cc90e0410d8d..d347d9ac02fc98e6b8cf7cedf4620b7a9395e92a 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 792b8c34cfe16aa99f43b3157a4ca2d24722924f..26bba2b4b0f94a4a808e5eda80e661614f704d1c 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 f99c5e394e2335d61887e683cee9229663babbb3..aabc91e1b4dcddbe117bffeed96e7900bfb7d27c 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 c1a8aa67cc96fb63e5b1df0e24eb86509c5b1696..df03eeb7a02d1dc2377a819970807e75b891bf2b 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 893c4b00e3ab1622966508f3d9f1a34add7f1114..d7fbf1e9297a807d245696e87a5024ccae840d27 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 7e5c2187082afb53968ddaead801384a8f6e574c..2f752519f0b493b4526b46d08a2b5de08ff02288 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 fe183f0a83cbde245265564150e2359d0419dd15..0b58276ab77925914b7ed8436898258037cbe210 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 c3a45faeb500f8ac0c2d66a8062da69b05dd2506..89f3ecc933a00de242c766038d193648fd890b10 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 0c5e15c629b95ec4d0ff08f637a4a0e51314f7b6..996c13b301f32d2ffb31040d20a4bc0698623c23 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 e7e2f5f399bc3da5099dfa7c5521388ebabbc771..1a83be8e027797c6bc755c6713e92e42c070b7f6 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 f5a3d3c85dfcdf07a376ceb4c6dafb3c5f1848b4..f757d0effc2326e73d13db114e07abbd8a1625e8 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 530e745fada7240667f23087698054b2039cf859..8a819afbe0acb485fb42c8f6a173885f66e85846 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'));
}
}