From b03bb7b857f63489bdf96b31c7c3b04f08ace95e Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Thu, 24 Oct 2019 14:17:12 +0200
Subject: [PATCH] [10.0.51.dev] Ajustement import users d'une v9

---
 core/core.php                             | 16 ++++++++++++----
 core/module/config/config.php             | 14 +++++++++-----
 core/module/config/view/index/index.php   |  2 +-
 core/module/config/view/manage/manage.php |  8 ++++----
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/core/core.php b/core/core.php
index 25a86982..7e4aae20 100644
--- a/core/core.php
+++ b/core/core.php
@@ -639,10 +639,18 @@ class common {
 			// Ecriture des données
 			$this->setData(['config',$tempData['config']]);
 			$this->setData(['core',$tempData['core']]);	
-			if (isset($_POST['configManageImportUser']) === true) {
-				$this->setData(['user',$tempData['user']]);	
-				unset($_POST['configManageImportUser']);
-			}							
+
+			// Import des users
+			if (isset($_POST['configManageImportUser']) === true ) { 
+				if ($_POST['configManageImportUser'] ===  false) {	 // user non préservés
+					$this->setData(['user',$tempData['user']]);		 // On importe les nouveaux
+				}			
+				unset($_POST['configManageImportUser']);				
+			} else {
+				$this->setData(['user',$tempData['user']]);
+			}
+
+
 			$this->setData(['page',$tempData['page']]);
 			$this->setData(['module',$tempData['module']]);
 			$this->setData(['theme',$tempTheme['theme']]);
diff --git a/core/module/config/config.php b/core/module/config/config.php
index 0dcb2ac8..fbd5e2ee 100755
--- a/core/module/config/config.php
+++ b/core/module/config/config.php
@@ -294,16 +294,20 @@ class config extends common {
 			// Vérifier la présence des fichiers à minima theme et core (v9)
 			if (in_array('theme.json',$files) === true &&
 				in_array('core.json',$files) === true) {
-					// Users d'une version 10 conservés
-					if ($this->getInput('configManageImportUser', helper::FILTER_BOOLEAN) === true ) { 
-						$users = $this->getData(['user']);
+
+					// Users d'une version 10 conservés si option cochée
+					if (in_array('user.json',$files) === true && 
+						$this->getInput('configManageImportUser', helper::FILTER_BOOLEAN) === true ) { 
+						$users = $this->getData(['user']); 
+					} else {
+						// V9 on transmets l'option à la fonction importData	
 						$_POST['configManageImportUser'] = $this->getInput('configManageImportUser', helper::FILTER_BOOLEAN);
 					}
 					// Extraire le zip
 					$success = $zip->extractTo( '.' );				
-					// Fermer l'archive
+					// Fermer l'archive	
 					$zip->close();
-					// Restaurer les users lus
+					// Restaurer les users originaux d'une v10 si option cochée
 					if (!empty($users)) { 
 						$this->setData(['user',$users]);						
 					}
diff --git a/core/module/config/view/index/index.php b/core/module/config/view/index/index.php
index 60938a39..db9e7b46 100755
--- a/core/module/config/view/index/index.php
+++ b/core/module/config/view/index/index.php
@@ -11,7 +11,7 @@
 		<div class="col3 offset5">
 			<?php echo template::button('configManageButton', [
 				'href' => helper::baseUrl() . 'config/manage',
-				'value' => 'Exporter / Importer'
+				'value' => 'Sauvegarder / Restaurer'
 			]); ?>
 		</div>		
 		<div class="col2">
diff --git a/core/module/config/view/manage/manage.php b/core/module/config/view/manage/manage.php
index ff9e5bad..13c2262c 100644
--- a/core/module/config/view/manage/manage.php
+++ b/core/module/config/view/manage/manage.php
@@ -17,7 +17,7 @@
 	<div class="row">
 		<div class="col6">
 			<div class="block">
-				<h4>Exporter</h4>											
+				<h4>Sauvegarder</h4>											
 				<div class="row">
 					<div class="col10 offset1">
 						<?php echo template::button('configManageButton', [
@@ -30,16 +30,16 @@
 		</div>	
 		<div class="col6">
 			<div class="block">
-				<h4>Importer</h4>
+				<h4>Restaurer</h4>
 				<div class="row">				
 					<?php echo template::file('configManageImportFile', [
-						'label' => 'Sauvegarde ZIP',
+						'label' => 'Sauvegarde au format ZIP',
 						'type' => 2,
 						'help' => 'Importe d\'une archive déposée dans le gestionaire de fichiers.'
 					]); ?>
 				</div>
 				<div class="row">
-					<?php echo template::checkbox('configManageImportUser', true, 'Préserver les comptes utilisateurs d\'une sauvegarde de version 10 ou +', [
+					<?php echo template::checkbox('configManageImportUser', true, 'Préserver les comptes des utilisateurs déjà installés', [
 						'checked' => true
 					]); ?>			
 				</div>