From a9cda0a75bba5fb7583fc9aedcc65a8c6ef7154e Mon Sep 17 00:00:00 2001
From: Fred Tempez <frederic.tempez@outlook.com>
Date: Tue, 14 Mar 2023 13:11:02 +0100
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20reponse=20installation=20au?=
 =?UTF-8?q?to?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/module/install/install.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/module/install/install.php b/core/module/install/install.php
index 321faacf..997c5fd1 100644
--- a/core/module/install/install.php
+++ b/core/module/install/install.php
@@ -278,10 +278,10 @@ class install extends common
 				}
 				// Nettoyage des fichiers d'installation précédents
 				if (file_exists(self::TEMP_DIR . 'update.tar.gz') && $success) {
-					$success = unlink(self::TEMP_DIR . 'update.tar.gz');
+					$success = $success || unlink(self::TEMP_DIR . 'update.tar.gz');
 				}
 				if (file_exists(self::TEMP_DIR . 'update.tar') && $success) {
-					$success = unlink(self::TEMP_DIR . 'update.tar');
+					$success = $success || unlink(self::TEMP_DIR . 'update.tar');
 				}
 				// Valeurs en sortie
 				$this->addOutput([
@@ -356,10 +356,11 @@ class install extends common
 						'</IfModule>' . PHP_EOL .
 						'# URL rewriting' . PHP_EOL;
 					$fileContent = str_replace('# URL rewriting', $rewriteData, $fileContent);
-					file_put_contents(
+					$r = file_put_contents(
 						'.htaccess',
 						$fileContent
 					);
+					$success = $r === false ? false : true;
 				}
 				// Recopie htaccess
 				if (
@@ -367,7 +368,7 @@ class install extends common
 					$success && file_exists('.htaccess.bak')
 				) {
 					// L'écraser avec le backup
-					$success = copy('.htaccess.bak', '.htaccess');
+					$success = $success || copy('.htaccess.bak', '.htaccess');
 					// Effacer le backup
 					unlink('.htaccess.bak');
 				}