From c22198d52db9b69cbd3397dfe3fe16fe4aa6c431 Mon Sep 17 00:00:00 2001
From: fredtempez <frederic.tempez@outlook.com>
Date: Tue, 1 Nov 2022 20:53:19 +0100
Subject: [PATCH] =?UTF-8?q?Activation=20de=20la=20langue=20=C3=A0=20l'inst?=
 =?UTF-8?q?allation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core.php                                  |  3 +--
 core/module/install/install.php                | 11 ++++++-----
 .../install/view/postinstall/postinstall.php   | 14 +++++++++-----
 .../module/install/view/postinstall/update.css | 18 ------------------
 core/module/user/view/login/login.php          |  4 ++--
 5 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 core/module/install/view/postinstall/update.css

diff --git a/core/core.php b/core/core.php
index 6ddd7e83..25337b40 100644
--- a/core/core.php
+++ b/core/core.php
@@ -341,12 +341,11 @@ class common
 		if ($this->getData(['user']) === []) {
 			// Installation en cours
 			self::$i18nUI = array_key_exists($this->getInput('ZWII_UI'), self::$languages) ? $this->getInput('ZWII_UI') : 'fr_FR';
-			helper::deleteCookie('ZWII_UI');
 		} else {
 			// Langue sélectionnée dans le compte
 			self::$i18nUI = $this->getData(['user', $this->getUser('id'), 'language']);
 			// Validation de la langue
-			self::$i18nUI =  (empty(self::$i18nUI) || is_null(self::$i18nUI)) ? self::$i18nUI = 'fr_FR' : self::$i18nUI;
+			self::$i18nUI =  (empty(self::$i18nUI) || is_null(self::$i18nUI)) ? 'fr_FR' : self::$i18nUI;
 		}
 
 		// Le fichier existe-t-il ?
diff --git a/core/module/install/install.php b/core/module/install/install.php
index f12bf6fa..c50ceddd 100644
--- a/core/module/install/install.php
+++ b/core/module/install/install.php
@@ -199,6 +199,7 @@ class install extends common
 					// Nettoyage
 					unlink(self::TEMP_DIR . 'files.tar.gz');
 					unlink(self::TEMP_DIR . 'files.tar');
+					helper::deleteCookie('ZWII_UI');
 
 					// Créer le dossier des fontes
 					if (!is_dir(self::DATA_DIR . 'fonts')) {
@@ -221,6 +222,11 @@ class install extends common
 					$this->copyDir('core/module/install/ressource/themes', self::FILE_DIR . 'source/theme');
 					unlink(self::FILE_DIR . 'source/theme/themes.json');
 
+					// Créer sitemap
+					$this->createSitemap();
+					// Mise à jour de la liste des pages pour TinyMCE
+					$this->listPages();
+
 					// Valeurs en sortie
 					$this->addOutput([
 						'redirect' => helper::baseUrl(false),
@@ -237,11 +243,6 @@ class install extends common
 			$dataThemes = json_decode($dataThemes, true);
 			self::$themes = helper::arrayColumn($dataThemes, 'name');
 
-			// Créer sitemap
-			$this->createSitemap();
-			// Mise à jour de la liste des pages pour TinyMCE
-			$this->listPages();
-
 			// Valeurs en sortie
 			$this->addOutput([
 				'display' => self::DISPLAY_LAYOUT_LIGHT,
diff --git a/core/module/install/view/postinstall/postinstall.php b/core/module/install/view/postinstall/postinstall.php
index 7554f9eb..668e1bcd 100644
--- a/core/module/install/view/postinstall/postinstall.php
+++ b/core/module/install/view/postinstall/postinstall.php
@@ -65,15 +65,15 @@
 				<div class="col3">
 					<?php echo template::select('installProxyType', $module::$proxyType, [
 						'label' => 'Type de proxy'
-						]); ?>
-					</div>
-				<div  class="col6">
+					]); ?>
+				</div>
+				<div class="col6">
 					<?php echo template::text('installProxyUrl', [
 						'label' => 'Adresse du proxy',
 						'placeholder' => 'cache.proxy.fr'
 					]); ?>
 				</div>
-				<div  class="col3">
+				<div class="col3">
 					<?php echo template::text('installProxyPort', [
 						'label' => 'Port du proxy',
 						'placeholder' => '6060'
@@ -82,10 +82,14 @@
 			</div>
 			<div class="row">
 				<div class="col12">
-				<?php echo template::select('installTheme', $module::$themes, [
+					<?php echo template::select('installTheme', $module::$themes, [
 						'label' => 'Thème'
 					]); ?>
+					<?php echo template::hidden('installLanguage', [
+						'value' => $this->getUrl(2)
+					]); ?>
 				</div>
+
 			</div>
 		</div>
 	</li>
diff --git a/core/module/install/view/postinstall/update.css b/core/module/install/view/postinstall/update.css
deleted file mode 100644
index 52709ea6..00000000
--- a/core/module/install/view/postinstall/update.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * This file is part of Zwii.
- *
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- *
- * @author Rémi Jean <remi.jean@outlook.com>
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2022, Frédéric Tempez
- * @license GNU General Public License, version 3
- * @link http://zwiicms.fr/
- */
-
-
-/** NE PAS EFFACER
-* admin.css
-*/
\ No newline at end of file
diff --git a/core/module/user/view/login/login.php b/core/module/user/view/login/login.php
index 96803cd3..7e65fb2f 100644
--- a/core/module/user/view/login/login.php
+++ b/core/module/user/view/login/login.php
@@ -29,12 +29,12 @@
 	</div>
 <?php endif; ?>
 <div class="row">
-	<div class="col6">
+	<div class="col9">
 		<?php echo template::checkbox('userLoginLongTime', true, 'Rester connecté sur ce navigateur', [
 			'checked' => $module::$userLongtime
 		]);	?>
 	</div>
-	<div class="col6 textAlignRight">
+	<div class="col3 textAlignRight">
 		<a href="<?php echo helper::baseUrl(); ?>user/forgot/<?php echo $this->getUrl(2); ?>">Mot de passe perdu ?</a>
 	</div>
 </div>