diff --git a/core/core.php b/core/core.php index 98858373..c451f19d 100644 --- a/core/core.php +++ b/core/core.php @@ -312,7 +312,7 @@ class common } // Extraction de la sesion - $this->input['_SESSION'] = $_SESSION; + // $this->input['_SESSION'] = $_SESSION; // Déterminer la langue du contenu du site if (isset($_SESSION['ZWII_CONTENT'])) { @@ -356,7 +356,7 @@ class common : self::$i18nUI; } else { // Installation - self::$i18nUI = $this->getInput('ZWII_UI') ? $this->getInput('ZWII_UI') : 'fr_FR'; + self::$i18nUI = $_SESSION['ZWII_UI'] ? $_SESSION['ZWII_UI'] : 'fr_FR'; } diff --git a/core/module/install/install.php b/core/module/install/install.php index cbd14589..61ca1e5c 100644 --- a/core/module/install/install.php +++ b/core/module/install/install.php @@ -54,8 +54,9 @@ class install extends common // Soumission du formulaire if ($this->isPost()) { $lang = $this->getInput('installLanguage'); - // Place le cookie pour la suite de l'installation - setcookie('ZWII_UI', $lang, time() + 3600, helper::baseUrl(false, false), '', false, false); + // Pour la suite de l'installation + // setcookie('ZWII_UI', $lang, time() + 3600, helper::baseUrl(false, false), '', false, false); + $_SESSION['ZWII_UI'] = $this->getInput('installLanguage'); // Valeurs en sortie $this->addOutput([ @@ -166,7 +167,8 @@ class install extends common $this->initData('page', self::$i18nContent, false); $this->initData('module', self::$i18nContent, false); // Supprime l'installation FR générée par défaut. - $this->removeDir(self::DATA_DIR . 'fr_FR'); + if (is_dir(self::DATA_DIR . 'fr_FR')) + $this->removeDir(self::DATA_DIR . 'fr_FR'); } // Sauvegarder la configuration du Proxy diff --git a/core/module/install/view/postinstall/postinstall.css b/core/module/install/view/postinstall/postinstall.css index d7c543b0..ab1171cc 100644 --- a/core/module/install/view/postinstall/postinstall.css +++ b/core/module/install/view/postinstall/postinstall.css @@ -1 +1,22 @@ -/* Vide */ \ No newline at end of file +/** + * 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 + * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2023, Frédéric Tempez + * @license CC Attribution-NonCommercial-NoDerivatives 4.0 International + * @link http://zwiicms.fr/ + */ + + +/** NE PAS EFFACER +* admin.css +*/ + +.title { + font-weight: bold; +} \ No newline at end of file diff --git a/core/module/install/view/postinstall/postinstall.php b/core/module/install/view/postinstall/postinstall.php index 6de89690..770b49cd 100644 --- a/core/module/install/view/postinstall/postinstall.php +++ b/core/module/install/view/postinstall/postinstall.php @@ -2,71 +2,79 @@

-

- -

-
-
-
- 'off', - 'label' => 'Identifiant' - ]); ?> -
-
-
-
- 'off', - 'label' => 'Mot de passe' - ]); ?> -
-
- 'off', - 'label' => 'Confirmation' - ]); ?> -
-
-
-
- 'off', - 'label' => 'Adresse électronique' - ]); ?> -
-
-
-
- 'off', - 'label' => 'Prénom' - ]); ?> -
-
- 'off', - 'label' => 'Nom' - ]); ?> -
-
-
- + + +
getInput('ZWII_CONTENT') !== $lang + $_SESSION['ZWII_CONTENT'] !== $lang && is_dir(self::DATA_DIR . $lang) &&