From 26e2377dfb83642b77f3cce1fcb1651b2b4c9f42 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Tue, 12 Dec 2006 20:40:19 +0000
Subject: [PATCH] et il y avait un exit en plus, dans minipres.

---
 ecrire/action/purger.php              | 2 +-
 ecrire/exec/aide_index.php            | 1 +
 ecrire/exec/convert_utf8.php          | 1 +
 ecrire/exec/dater.php                 | 1 +
 ecrire/exec/documents_colonne.php     | 1 +
 ecrire/exec/editer_auteurs.php        | 1 +
 ecrire/exec/editer_mot.php            | 1 +
 ecrire/exec/iconifier.php             | 1 +
 ecrire/exec/install.php               | 5 +++--
 ecrire/exec/legender.php              | 1 +
 ecrire/exec/petitionner.php           | 1 +
 ecrire/exec/referencer_traduction.php | 1 +
 ecrire/exec/regler_moderation.php     | 1 +
 ecrire/exec/tourner.php               | 1 +
 ecrire/exec/virtualiser.php           | 1 +
 ecrire/inc/admin.php                  | 2 ++
 ecrire/inc/ajouter_documents.php      | 1 +
 ecrire/inc/auth.php                   | 1 +
 ecrire/inc/getdocument.php            | 1 +
 ecrire/inc/meta.php                   | 1 +
 ecrire/inc/minipres.php               | 1 -
 ecrire/inc/securiser_action.php       | 1 +
 ecrire/inc/utils.php                  | 1 +
 ecrire/public/cacher.php              | 1 +
 ecrire/public/debug.php               | 1 +
 25 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/ecrire/action/purger.php b/ecrire/action/purger.php
index 997e8e5148..72389c2f02 100644
--- a/ecrire/action/purger.php
+++ b/ecrire/action/purger.php
@@ -71,7 +71,7 @@ function action_purger_dist()
  _T('ecrire:taille_cache_image',
 		     array('dir' => _DIR_VAR,
 			   'taille' => "<b>".taille_en_octets($taille)."</b>")) .'</div>'); 
-	break;
+	exit;
   }
 }
 ?>
diff --git a/ecrire/exec/aide_index.php b/ecrire/exec/aide_index.php
index e555904d68..5c4e96bb58 100644
--- a/ecrire/exec/aide_index.php
+++ b/ecrire/exec/aide_index.php
@@ -46,6 +46,7 @@ function erreur_aide_indisponible() {
 	global $help_server;
 	echo minipres(_T('forum_titre_erreur'),
 		 "<div>$help_server: "._T('aide_non_disponible')."</div><div align='right'>".menu_langues('var_lang_ecrire')."</div>");
+	exit;
 }
 
 // Selection de l'aide correspondant a la langue demandee
diff --git a/ecrire/exec/convert_utf8.php b/ecrire/exec/convert_utf8.php
index e02832a543..80cc54c4f9 100644
--- a/ecrire/exec/convert_utf8.php
+++ b/ecrire/exec/convert_utf8.php
@@ -59,6 +59,7 @@ function demander_conversion($tables_a_convertir, $action) {
 
 	// Ici en cas d'erreur, une page admin normale avec bouton de retour
 	echo minipres($action, ('<p>'.$message. "</p><p align='right'> <a href='" . generer_url_ecrire("config_lang"). "'> &gt;&gt; "._T('icone_retour')."</a>"));
+	exit;
 }
 
 // stocker le nouvel extra
diff --git a/ecrire/exec/dater.php b/ecrire/exec/dater.php
index a52c53817a..e15a6954f8 100644
--- a/ecrire/exec/dater.php
+++ b/ecrire/exec/dater.php
@@ -26,6 +26,7 @@ function exec_dater_dist()
 		spip_log("Tentative d'intrusion du " . $GLOBALS['auteur_session']['statut'] . ' ' . $GLOBALS['auteur_session']['nom'] . " dans " . $GLOBALS['exec'] . " sur $type $id.");
 		include_spip('inc/minipres');
 		echo minipres(_T('info_acces_interdit'));
+		exit;
 	}
 
 	$table = ($type=='syndic') ? 'syndic' : ($type . 's');
diff --git a/ecrire/exec/documents_colonne.php b/ecrire/exec/documents_colonne.php
index 071066ed30..6bd5f4f759 100644
--- a/ecrire/exec/documents_colonne.php
+++ b/ecrire/exec/documents_colonne.php
@@ -24,6 +24,7 @@ function exec_documents_colonne_dist()
 		spip_log("Tentative d'intrusion de " . $GLOBALS['auteur_session']['nom'] . " dans " . $GLOBALS['exec']);
 		include_spip('inc/minipres');
 		echo minipres(_T('info_acces_interdit'));
+		exit;
 	}
 
 	include_spip("inc/documents");
diff --git a/ecrire/exec/editer_auteurs.php b/ecrire/exec/editer_auteurs.php
index b100a1bea6..9c7d8a7aba 100644
--- a/ecrire/exec/editer_auteurs.php
+++ b/ecrire/exec/editer_auteurs.php
@@ -21,6 +21,7 @@ function exec_editer_auteurs_dist()
 		spip_log("Tentative d'intrusion de " . $GLOBALS['auteur_session']['nom'] . " dans " . $GLOBALS['exec']);
 		include_spip('inc/minipres');
 		echo minipres(_T('info_acces_interdit'));
+		exit;
 	}
 
 	$editer_auteurs = charger_fonction('editer_auteurs', 'inc');
diff --git a/ecrire/exec/editer_mot.php b/ecrire/exec/editer_mot.php
index 7729740a89..3b4406e7bf 100644
--- a/ecrire/exec/editer_mot.php
+++ b/ecrire/exec/editer_mot.php
@@ -36,6 +36,7 @@ function exec_editer_mot_dist()
 		spip_log("Tentative d'intrusion de " . $GLOBALS['auteur_session']['nom'] . " dans " . $GLOBALS['exec']);
 		include_spip('inc/minipres');
 		echo minipres(_T('info_acces_interdit'));
+		exit;
 	}
 
 	$ch = _request('cherche_mot');
diff --git a/ecrire/exec/iconifier.php b/ecrire/exec/iconifier.php
index 4ce007e625..f51068c1c2 100644
--- a/ecrire/exec/iconifier.php
+++ b/ecrire/exec/iconifier.php
@@ -45,6 +45,7 @@ function exec_iconifier_dist()
 		spip_log("Tentative d'intrusion de " . $GLOBALS['auteur_session']['nom'] . " dans " . $GLOBALS['exec']);
 		include_spip('inc/minipres');
 		echo minipres(_T('info_acces_interdit'));
+		exit;
 	}
 
 	$iconifier = charger_fonction('iconifier', 'inc');
diff --git a/ecrire/exec/install.php b/ecrire/exec/install.php
index 25e2ff8fc4..5f9fe69921 100644
--- a/ecrire/exec/install.php
+++ b/ecrire/exec/install.php
@@ -19,9 +19,10 @@ define('_FILE_TMP', '_install');
 function exec_install_dist()
 {
 	$etape = _request('etape');
-	if (_FILE_CONNECT) 
+	if (_FILE_CONNECT) {
 		echo minipres('AUTO', _T('avis_espace_interdit'));
-	else {
+		exit;
+	} else {
 
 	// On va supprimer les eventuelles vieilles valeurs de meta,
 	// mais il faut relancer init_langues pour savoir quelles
diff --git a/ecrire/exec/legender.php b/ecrire/exec/legender.php
index a863e6b271..a6058e141a 100644
--- a/ecrire/exec/legender.php
+++ b/ecrire/exec/legender.php
@@ -25,6 +25,7 @@ function exec_legender_dist()
 		spip_log("Tentative d'intrusion de " . $GLOBALS['auteur_session']['nom'] . " dans " . $GLOBALS['exec']);
 		include_spip('inc/minipres');
 		echo minipres(_T('info_acces_interdit'));
+		exit;
 	}
 
 	$legender = charger_fonction('legender', 'inc');
diff --git a/ecrire/exec/petitionner.php b/ecrire/exec/petitionner.php
index df7acaa115..9764edae21 100644
--- a/ecrire/exec/petitionner.php
+++ b/ecrire/exec/petitionner.php
@@ -22,6 +22,7 @@ function exec_petitionner_dist()
 		spip_log("Tentative d'intrusion de " . $GLOBALS['auteur_session']['nom'] . " dans " . $GLOBALS['exec']);
 		include_spip('inc/minipres');
 		echo minipres(_T('info_acces_interdit'));
+		exit;
 	}
 
 	$petitionner = charger_fonction('petitionner', 'inc');
diff --git a/ecrire/exec/referencer_traduction.php b/ecrire/exec/referencer_traduction.php
index cf3e555a8d..4cb0cf49fd 100644
--- a/ecrire/exec/referencer_traduction.php
+++ b/ecrire/exec/referencer_traduction.php
@@ -21,6 +21,7 @@ function exec_referencer_traduction_dist()
 		spip_log("Tentative d'intrusion de " . $GLOBALS['auteur_session']['nom'] . " dans " . $GLOBALS['exec']);
 		include_spip('inc/minipres');
 		echo minipres(_T('info_acces_interdit'));
+		exit;
 	}
 
 	$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 a98a47f87c..d2922fd47d 100644
--- a/ecrire/exec/regler_moderation.php
+++ b/ecrire/exec/regler_moderation.php
@@ -22,6 +22,7 @@ function exec_regler_moderation_dist()
 		spip_log("Tentative d'intrusion de " . $GLOBALS['auteur_session']['nom'] . " dans " . $GLOBALS['exec']);
 		include_spip('inc/minipres');
 		echo minipres(_T('info_acces_interdit'));
+		exit;
 	}
 
 	$regler_moderation = charger_fonction('regler_moderation', 'inc');
diff --git a/ecrire/exec/tourner.php b/ecrire/exec/tourner.php
index d347d9ac02..0b93e925cc 100644
--- a/ecrire/exec/tourner.php
+++ b/ecrire/exec/tourner.php
@@ -25,6 +25,7 @@ function exec_tourner_dist()
 		spip_log("Tentative d'intrusion de " . $GLOBALS['auteur_session']['nom'] . " dans " . $GLOBALS['exec']);
 		include_spip('inc/minipres');
 		echo minipres(_T('info_acces_interdit'));
+		exit;
 	}
 
 	$tourner = charger_fonction('tourner', 'inc');
diff --git a/ecrire/exec/virtualiser.php b/ecrire/exec/virtualiser.php
index 26bba2b4b0..191fa69b1e 100644
--- a/ecrire/exec/virtualiser.php
+++ b/ecrire/exec/virtualiser.php
@@ -22,6 +22,7 @@ function exec_virtualiser_dist()
 		spip_log("Tentative d'intrusion de " . $GLOBALS['auteur_session']['nom'] . " dans " . $GLOBALS['exec']);
 		include_spip('inc/minipres');
 		echo minipres(_T('info_acces_interdit'));
+		exit;
 	}
 
 	$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 aabc91e1b4..2740f5afa8 100644
--- a/ecrire/inc/admin.php
+++ b/ecrire/inc/admin.php
@@ -25,6 +25,7 @@ function debut_admin($script, $action, $commentaire='') {
 	if ((!$action) || ($connect_statut != "0minirezo")) {
 		include_spip('inc/minipres');
 		echo minipres(_T('info_acces_refuse'));
+		exit;
 	}
 	if ($connect_toutes_rubriques) {
 		$dir = _DIR_TMP;
@@ -60,6 +61,7 @@ function debut_admin($script, $action, $commentaire='') {
 	echo minipres(_T('info_action', array('action' => $action)),
 		 $form,
 		 " onload='barre_inserer(\"$signal\", document.forms[0].fichier)'");
+	exit;
 }
 
 // http://doc.spip.org/@fin_admin
diff --git a/ecrire/inc/ajouter_documents.php b/ecrire/inc/ajouter_documents.php
index df03eeb7a0..144961cfcd 100644
--- a/ecrire/inc/ajouter_documents.php
+++ b/ecrire/inc/ajouter_documents.php
@@ -475,6 +475,7 @@ function liste_archive_jointe($valables, $mode, $type, $id, $id_document, $hash,
 		_T('upload_fichier_zip_texte2') .
 	  "</p>" .
 	  $action);
+	exit;
 	// a tout de suite en joindre4, joindre5, ou joindre6
 }
 
diff --git a/ecrire/inc/auth.php b/ecrire/inc/auth.php
index d7fbf1e929..85817de9f3 100644
--- a/ecrire/inc/auth.php
+++ b/ecrire/inc/auth.php
@@ -229,6 +229,7 @@ function auth_areconnecter($auth_login)
 	} else {
 		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'));
 	}
+	exit;
 }
 
 // redemande login, avec nettoyage
diff --git a/ecrire/inc/getdocument.php b/ecrire/inc/getdocument.php
index 2f752519f0..7ff0e0bb23 100644
--- a/ecrire/inc/getdocument.php
+++ b/ecrire/inc/getdocument.php
@@ -143,6 +143,7 @@ function check_upload_error($error, $msg='') {
 		'"><input type="submit" class="fondl"  value="'.
 		_T('ecrire:bouton_suivant').
 		' &gt;&gt;"></div></form>');
+	exit;
 }
 
 // Erreur appelee depuis public.php (la precedente ne fonctionne plus
diff --git a/ecrire/inc/meta.php b/ecrire/inc/meta.php
index 89f3ecc933..ea6f4eed89 100644
--- a/ecrire/inc/meta.php
+++ b/ecrire/inc/meta.php
@@ -67,6 +67,7 @@ function ecrire_metas() {
 			. _T('texte_inc_meta_3',
 				array('repertoire' => joli_repertoire(_DIR_TMP)))
 			. "</h4>\n");
+			exit;
 		}
 	}
 }
diff --git a/ecrire/inc/minipres.php b/ecrire/inc/minipres.php
index 996c13b301..002a92fb22 100644
--- a/ecrire/inc/minipres.php
+++ b/ecrire/inc/minipres.php
@@ -140,7 +140,6 @@ function minipres($titre, $corps="", $onload='')
 		$corps.
 		install_fin_html();
 	}
-	exit;
 }
 
 //
diff --git a/ecrire/inc/securiser_action.php b/ecrire/inc/securiser_action.php
index 1a83be8e02..163694ad16 100644
--- a/ecrire/inc/securiser_action.php
+++ b/ecrire/inc/securiser_action.php
@@ -26,6 +26,7 @@ function inc_securiser_action_dist($action='', $arg='', $redirect="", $mode=fals
 	elseif (!verifier_action_auteur(_request('action') . '-' . _request('arg'), _request('hash'))) {
 		include_spip('inc/minipres');
 		echo minipres(_T('info_acces_interdit'));
+		exit;
 	}
 }
 
diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php
index f757d0effc..800d5e7c53 100644
--- a/ecrire/inc/utils.php
+++ b/ecrire/inc/utils.php
@@ -56,6 +56,7 @@ function charger_fonction($nom, $dossier='exec', $continue=false) {
 	include_spip('inc/minipres');
 	echo minipres(_T('forum_titre_erreur'),
 		 _T('fichier_introuvable', array('fichier'=> '<b>'.htmlentities($d).'</b>')));
+	exit;
 }
 
 //
diff --git a/ecrire/public/cacher.php b/ecrire/public/cacher.php
index 8a819afbe0..e5c479e48a 100644
--- a/ecrire/public/cacher.php
+++ b/ecrire/public/cacher.php
@@ -217,6 +217,7 @@ function public_cacher_dist($contexte, &$use_cache, &$chemin_cache, &$page, &$la
 			spip_log("Erreur base de donnees, impossible utiliser $chemin_cache");
 			include_spip('inc/minipres');
 			echo minipres(_T('info_travaux_titre'),  _T('titre_probleme_technique'));
+			exit;
 		}
 	}
 
diff --git a/ecrire/public/debug.php b/ecrire/public/debug.php
index 02ae8b403d..917ccc28c7 100644
--- a/ecrire/public/debug.php
+++ b/ecrire/public/debug.php
@@ -137,6 +137,7 @@ function erreur_squelette($message='', $lieu='') {
 				. ' '
 				. supprimer_tags(extraire_multi($GLOBALS['meta']['nom_site']));
 			echo minipres($titre, affiche_erreurs_page($tableau_des_erreurs));
+			exit;
 		}
 	}
 }
-- 
GitLab