From e1dc259aef50cf6af603e115f974f1c816e8536a Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Sat, 21 Jan 2006 15:36:12 +0000
Subject: [PATCH] unification de presentation

---
 ecrire/inc_getdocument.php3          | 33 +++++++++++++---------------
 ecrire/inc_messagerie.php            |  1 -
 ecrire/inc_meta.php3                 | 31 ++++++++++++--------------
 ecrire/inc_spip_action_test_dirs.php |  4 ++--
 4 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/ecrire/inc_getdocument.php3 b/ecrire/inc_getdocument.php3
index ed3b374552..5a6c5286ad 100644
--- a/ecrire/inc_getdocument.php3
+++ b/ecrire/inc_getdocument.php3
@@ -122,17 +122,14 @@ function check_upload_error($error, $msg='') {
 
 	spip_log ("erreur upload $error");
 
-	install_debut_html($msg); echo '<form action="' ,
-	  _DIR_RESTREINT_ABS,
-	  urldecode($GLOBALS['redirect']),
-	  '"><div align="',
-	  $spip_lang_right,
-	  '"><input type="submit" class="fondl"  value="',
-	  _T('ecrire:bouton_suivant'),
-	  ' >>"></div>',
-	  '</form></body></html>';
-	install_fin_html();
-	exit;
+	minipres($msg, '<form action="' .
+	  _DIR_RESTREINT_ABS.
+	  urldecode($GLOBALS['redirect']).
+	  '"><div align="'.
+	  $spip_lang_right.
+	  '"><input type="submit" class="fondl"  value="'.
+	  _T('ecrire:bouton_suivant').
+		 ' >>"></div></form>');
 }
 
 
@@ -383,13 +380,13 @@ function ajouter_un_document ($source, $nom_envoye, $type_lien, $id_lien, $mode,
 }
 
 function afficher_compactes($action) {
-	install_debut_html(_T('upload_fichier_zip')); echo "<p>",
-		_T('upload_fichier_zip_texte'),
-		"</p>",
-		"<p>",
-		_T('upload_fichier_zip_texte2'),
-							"</p>",$action;
-	install_fin_html();
+	minipres(_T('upload_fichier_zip'),
+	  "<p>" .
+		_T('upload_fichier_zip_texte') .
+	  "</p><p>" .
+		_T('upload_fichier_zip_texte2') .
+	  "</p>" .
+	  $action);
 }
 
 //
diff --git a/ecrire/inc_messagerie.php b/ecrire/inc_messagerie.php
index eefb4e61c0..56c1e79e63 100644
--- a/ecrire/inc_messagerie.php
+++ b/ecrire/inc_messagerie.php
@@ -28,7 +28,6 @@ function messagerie_dist()
 	spip_query("DELETE FROM spip_auteurs_messages WHERE id_message=$id_message AND id_auteur=$supp_dest");
 }
 
-  spip_log("messa det $detruire_message");
 if ($detruire_message) {
 	spip_query("DELETE FROM spip_messages WHERE id_message=$detruire_message");
 	spip_query("DELETE FROM spip_auteurs_messages WHERE id_message=$detruire_message");
diff --git a/ecrire/inc_meta.php3 b/ecrire/inc_meta.php3
index 9bdfb52142..8778fd5e3c 100644
--- a/ecrire/inc_meta.php3
+++ b/ecrire/inc_meta.php3
@@ -10,19 +10,15 @@
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-
-//
 if (!defined("_ECRIRE_INC_VERSION")) return;
 
 function lire_metas() {
 	global $meta;
 
-	$meta = '';
-	$query = 'SELECT nom,valeur FROM spip_meta';
-	$result = spip_query($query);
-	while ($row = spip_fetch_array($result)) {
-		$nom = $row['nom'];
-		$meta[$nom] = $row['valeur'];
+	$meta = array();
+	$result = spip_query('SELECT nom,valeur FROM spip_meta');
+	while (list($nom,$valeur) = spip_fetch_array($result)) {
+		$meta[$nom] = $valeur;
 	}
 }
 
@@ -46,16 +42,17 @@ function ecrire_metas() {
 	lire_metas();
 
 	if (is_array($meta)) {
-
 		$ok = ecrire_fichier (_FILE_META, serialize($meta));
-		if (!$ok && $GLOBALS['connect_statut'] == '0minirezo')
-		  echo "<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'),
-		    "</a> ",
-		    _T('texte_inc_meta_3', array('repertoire' => _DIR_SESSIONS)),
-		    "&nbsp;</h4>\n";
+		if (!$ok && $GLOBALS['connect_statut'] == '0minirezo') {
+		  include_ecrire('minipres');
+		  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').
+		    "</a> ".
+		    _T('texte_inc_meta_3', array('repertoire' => _DIR_SESSIONS)).
+			   "</h4>\n");
+		}
 	}
 }
 
diff --git a/ecrire/inc_spip_action_test_dirs.php b/ecrire/inc_spip_action_test_dirs.php
index 78e6a6b9e0..455ae1b8a2 100644
--- a/ecrire/inc_spip_action_test_dirs.php
+++ b/ecrire/inc_spip_action_test_dirs.php
@@ -101,11 +101,11 @@ if ($bad_dirs OR $absent_dirs) {
 	  "<DIV align='right'><input type='submit' class='fondl' value='". 
 	  _T('login_recharger')."'></DIV>" .
 	  "</form>";
-	install_debut_html($titre);echo $res;	install_fin_html();
+	minipres($titre, $res);
 
  } else {
 	if (!_FILE_CONNECT)
-	  header("Location: " . generer_url_ecrire("install",  "etape=1", true));
+	  header("Location: " . generer_url_ecrire("install", "etape=1", true));
 	else
 		header("Location: " . _DIR_RESTREINT_ABS);
  }
-- 
GitLab