From c913a0829f90b5171d8b60d46081b99cc5d8d275 Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Mon, 23 Jul 2007 09:06:59 +0000
Subject: [PATCH] affichage du chargeur

---
 dist/minipres.css                | 4 +---
 ecrire/action/charger_plugin.php | 7 ++++++-
 ecrire/inc/charger_plugin.php    | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/dist/minipres.css b/dist/minipres.css
index 313439600d..514b60b545 100644
--- a/dist/minipres.css
+++ b/dist/minipres.css
@@ -35,9 +35,7 @@ img {
 	border: 0;
 }
 
-p {
-	text-align: justify;
-}
+p {}
 
 ul {
 	text-align: justify;
diff --git a/ecrire/action/charger_plugin.php b/ecrire/action/charger_plugin.php
index bac2fb885c..aa067141cc 100644
--- a/ecrire/action/charger_plugin.php
+++ b/ecrire/action/charger_plugin.php
@@ -100,7 +100,6 @@ function action_charger_plugin_dist() {
 		);
 		if (_request('extract')) {
 			@unlink($fichier);
-			@rename($tmp, $dest);
 		}
 	}
 
@@ -132,6 +131,12 @@ function action_charger_plugin_dist() {
 
 				$texte .= '<p>'._L('Le fichier '.$zip.' a &#233;t&#233; d&#233;compact&#233; et install&#233;').'</p>';
 				$texte .= _L("<h2 style='text-align:center;'>Continuez pour l'activer.</h2>");
+
+				// Indiquer par un fichier install.log
+				// a la racine que c'est chargeur qui a installe ce plugin
+				ecrire_fichier($status['dirname'].'/install.log',
+					'installation / charger_plugin / '.gmdate('Y-m-d\TH:i:s\Z', time()));
+
 			} else {
 				$texte = '<p>'._L('Le fichier '.$zip.' a &#233;t&#233; t&#233;l&#233;charg&#233;').'</p>';
 				$texte .= liste_fichiers_pclzip($status);
diff --git a/ecrire/inc/charger_plugin.php b/ecrire/inc/charger_plugin.php
index d5b8738a72..a7dfe31baf 100644
--- a/ecrire/inc/charger_plugin.php
+++ b/ecrire/inc/charger_plugin.php
@@ -309,7 +309,7 @@ function liste_fichiers_pclzip($status) {
 	$l .= "<ul style='font-size:x-small;'>\n";
 	foreach ($list as $f) {
 		if (basename($f) == 'svn.revision')
-			lire_fichier($status['dirname'].'/'.$f,$svn);
+			lire_fichier($status['tmpname'].'/'.$f,$svn);
 		if ($joli = preg_replace(',^(.*/)([^/]+/?)$,', '<span style="visibility:hidden">\1</span>\2', $f))
 			$l .= "<li>".$joli."</li>\n";
 	}
-- 
GitLab