From bcd1f4910adebb1f7d95a63f4bfcf69f51dbe87d Mon Sep 17 00:00:00 2001
From: SylvainLelievre <lelievre.sylvain@gmail.com>
Date: Mon, 15 Feb 2021 14:37:17 +0100
Subject: [PATCH] Ajout core/module/addon

---
 core/class/helper.class.php |  4 ++--
 core/core.php               | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/core/class/helper.class.php b/core/class/helper.class.php
index 7abbb97d..d711bceb 100755
--- a/core/class/helper.class.php
+++ b/core/class/helper.class.php
@@ -137,10 +137,10 @@ class helper {
 	 */
 	public  static function getModules() {
 		$modules = array();
-		$dirs = array_diff(scandir($folder), array('..', '.'));
+		$dirs = array_diff(scandir('module'), array('..', '.'));
 		foreach ($dirs as $key => $value) {
 			// Dossier non vide
-			if (file_exists($folder . '/' . $value . '/' . $value . '.php')) {
+			if (file_exists('module/' . $value . '/' . $value . '.php')) {
 				// Lire les constantes en gérant les erreurs de nom de classe
 				try  {
 					$class_reflex = new \ReflectionClass($value);
diff --git a/core/core.php b/core/core.php
index 88048e39..e75ba604 100755
--- a/core/core.php
+++ b/core/core.php
@@ -56,7 +56,8 @@ class common {
 		'sitemap',
 		'theme',
 		'user',
-		'translate'
+		'translate',
+		'addon'
 	];
 	public static $accessList = [
 		'user',
@@ -177,7 +178,8 @@ class common {
 		'theme' => '',
 		'admin' => '',
 		'blacklist' => '',
-		'locale' => ''
+		'locale' => '',
+		'addon'
 	];
 
 	/**
@@ -603,7 +605,7 @@ class common {
 		$this->setData(['theme',$tempData['theme']]);
 
 		// Import des users sauvegardés si option active
-		if ($keepUsers === false 
+		if ($keepUsers === false
 			AND $tempData['user'] !== NULL) {
 			$this->setData(['user',$tempData['user']]);
 		}
@@ -2901,7 +2903,7 @@ class layout extends common {
 				$rightItems .= '<li><a href="' . helper::baseUrl() . 'user" data-tippy-content="Configurer les utilisateurs">' . template::ico('users') . '</a></li>';
 				$rightItems .= '<li><a href="' . helper::baseUrl() . 'theme" data-tippy-content="Personnaliser les thèmes">' . template::ico('brush') . '</a></li>';
 				//$rightItems .= '<li><a href="' . helper::baseUrl() . 'translate" data-tippy-content="Gestion des langues">' . template::ico('flag') . '</a></li>';
-				$rightItems .= '<li><a href="' . helper::baseUrl() . 'modules" data-tippy-content="Gérer les modules">' . template::ico('puzzle') . '</a></li>';
+				$rightItems .= '<li><a href="' . helper::baseUrl() . 'addon" data-tippy-content="Gérer les modules">' . template::ico('puzzle') . '</a></li>';
 				$rightItems .= '<li><a href="' . helper::baseUrl() . 'config" data-tippy-content="Configurer le site">' . template::ico('cog-alt') . '</a></li>';
 				// Mise à jour automatique
 				$today = mktime(0, 0, 0);