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

[10.0.018.dev] préserver comptes import

Browse Source
This commit is contained in:
Fred Tempez 2019-12-17 16:04:40 +01:00
parent f70d77a25e
commit 0eacd56612
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/core.php
View File

@ -34,7 +34,7 @@ class common {
const TEMP_DIR = 'site/tmp/';
// Numéro de version
const ZWII_VERSION = '10.0.017.dev';
const ZWII_VERSION = '10.0.018.dev';
public static $actions = [];
public static $coreModuleIds = [
@ -145,9 +145,10 @@ class common {
// Import version 9
if (file_exists(self::DATA_DIR . 'core.json') === true &&
$this->getData(['core','dataVersion']) < 10000) {
$this->importData($_SESSION['KeepUsers']);
unset ($_SESSION['KeepUsers']);
$this->getData(['core','dataVersion']) < 10000) {
$keepUsers = isset($_SESSION['KEEP_USERS']) ? $_SESSION['KEEP_USERS'] : false;
$this->importData($keepUsers);
unset ($_SESSION['KEEP_USERS']);
// Réinstaller htaccess
copy('core/module/config/ressource/.htaccess', self::DATA_DIR . '.htaccess');
common::$importNotices [] = "Importation réalisée avec succès" ;

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

@ -335,9 +335,8 @@ class config extends common {
// Préserver les comptes des utilisateurs d'une version 9 si option cochée
// Positionnement d'une variable de session lue au constructeur
if ($version === '9' &&
$this->getInput('configManageImportUser', helper::FILTER_BOOLEAN) === true) {
$_SESSION['KeepUsers'] = true;
if ($version === '9') {
$_SESSION['KEEP_USERS'] = $this->getInput('configManageImportUser', helper::FILTER_BOOLEAN);
}
// Extraire le zip
@ -349,7 +348,7 @@ class config extends common {
if (!empty($users) &&
$version === '10' &&
$this->getInput('configManageImportUser', helper::FILTER_BOOLEAN) === true) {
$this->setData(['user',$users]);
$this->setData(['user',$users]);
}
// Message de notification