ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team/ZwiiCMS
10
9
Fork 3
Code Releases 154 Activity

Merge branch '12308' into 12400

Browse Source
This commit is contained in:
Fred Tempez 2023-04-23 07:50:14 +02:00
commit 7dfae68bb9
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/module/install/install.php
View File

@ -50,7 +50,9 @@ class install extends common
'access' => false 'access' => false
]); ]);
} }
// Accès autorisé
// Soumission du formulaire // Soumission du formulaire
if ($this->isPost()) { if ($this->isPost()) {
$lang = $this->getInput('installLanguage'); $lang = $this->getInput('installLanguage');
@ -64,6 +66,9 @@ class install extends common
]); ]);
} }
// Régénère la session
session_regenerate_id();
// Liste des langues UI disponibles // Liste des langues UI disponibles
if (is_dir(self::I18N_DIR)) { if (is_dir(self::I18N_DIR)) {
foreach ($this->getData(['language']) as $lang => $value) { foreach ($this->getData(['language']) as $lang => $value) {

5
core/module/user/user.php
View File

@ -324,7 +324,6 @@ class user extends common
} }
} }
// Valeurs en sortie // Valeurs en sortie
$this->addOutput([ $this->addOutput([
'title' => $this->getData(['user', $this->getUrl(2), 'firstname']) . ' ' . $this->getData(['user', $this->getUrl(2), 'lastname']), 'title' => $this->getData(['user', $this->getUrl(2), 'firstname']) . ' ' . $this->getData(['user', $this->getUrl(2), 'lastname']),
@ -711,6 +710,10 @@ class user extends common
if ($this->getData(['config', 'connect', 'log'])) { if ($this->getData(['config', 'connect', 'log'])) {
file_put_contents(self::DATA_DIR . 'journal.log', $dataLog, FILE_APPEND); file_put_contents(self::DATA_DIR . 'journal.log', $dataLog, FILE_APPEND);
} }
// Régénère la session
session_regenerate_id();
// Stockage des cookies // Stockage des cookies
if (!empty($_COOKIE['ZWII_USER_ID'])) { if (!empty($_COOKIE['ZWII_USER_ID'])) {
self::$userId = $_COOKIE['ZWII_USER_ID']; self::$userId = $_COOKIE['ZWII_USER_ID'];