From 9de4b08d20b14b2c80c935d606e688cb66caf1b8 Mon Sep 17 00:00:00 2001
From: F Tempez <ftempez@gmail.com>
Date: Tue, 6 Apr 2021 17:35:46 +0200
Subject: [PATCH] =?UTF-8?q?addon=20effacement=20des=20donn=C3=A9es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/module/addon/addon.php | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/core/module/addon/addon.php b/core/module/addon/addon.php
index a2fd5d67..62efd452 100644
--- a/core/module/addon/addon.php
+++ b/core/module/addon/addon.php
@@ -50,19 +50,13 @@ class addon extends common {
 			$infoModules = helper::getModules();
 			$module = $this->getUrl(2);
 			//Liste des dossiers associés au module non effacés
-			$list = '';
-			foreach( $infoModules[$module]['dataDirectory'] as $moduleId){
-				if (strpos($moduleId,'module.json') === false && strpos($moduleId,'page.json') === false) {
-					$list === '' ? $list = self::DATA_DIR . $moduleId : $list .= ', '.self::DATA_DIR. $moduleId;
-				}
-			}
-			if( $this->removeDir('./module/'.$module ) === true){
+			if( $this->removeDir('./module/'.$module ) === true   ){
 				$success = true;
-				if( $list === ''){
-					$notification = 'Module '.$module .' désinstallé';
-				}
-				else{
-					$notification = 'Module '.$module .' désinstallé, il reste des données dans '.$list;
+				$notification = 'Module '. $module .' désinstallé';
+				if(($infoModules[$this->getUrl(2)]['dataDirectory']) ) {
+					if (!$this->removeDir($infoModules[$this->getUrl(2)]['dataDirectory'])){
+						$notification = 'Module '.$module .' désinstallé, il reste des données dans ' . $infoModules[$this->getUrl(2)]['dataDirectory'];
+					}
 				}
 			}
 			else{