From 9bb52296b706f58de5e3b19768818238b5a970fb Mon Sep 17 00:00:00 2001
From: Benjamin Renard <brenard@easter-eggs.com>
Date: Thu, 14 May 2020 10:53:41 +0200
Subject: [PATCH] LSsession :: loadLSaddon: keep trace of already loaded addon
 to avoid loading more than once

---
 src/includes/class/class.LSsession.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/includes/class/class.LSsession.php b/src/includes/class/class.LSsession.php
index 71ab5cec..6cd5160e 100644
--- a/src/includes/class/class.LSsession.php
+++ b/src/includes/class/class.LSsession.php
@@ -99,6 +99,9 @@ class LSsession {
   // Initialized telltale
   private static $initialized = false;
 
+  // List of currently loaded LSaddons
+  private static $loadedAddons = array();
+
   /**
    * Get session info by key
    *
@@ -453,15 +456,17 @@ class LSsession {
   }
 
  /**
-  * Chargement d'un addons d'LdapSaisie
+  * Load a LSaddon (if not already loaded)
   *
-  * @param[in] $addon Nom de l'addon à charger (Exemple : samba)
+  * @param[in] $addon The addon name (ex: samba)
   *
   * @author Benjamin Renard <brenard@easter-eggs.com
   *
-  * @retval boolean true si le chargement a réussi, false sinon.
+  * @retval boolean True if addon loaded, false otherwise
   */
   public static function loadLSaddon($addon) {
+    if (in_array($addon, self :: $loadedAddons))
+      return true;
     if(self :: includeFile(LS_ADDONS_DIR .'LSaddons.'.$addon.'.php')) {
       // Load LSaddon config file (without warning if not found)
       $conf_file = LS_CONF_DIR."LSaddons/config.LSaddons.".$addon.".php";
@@ -473,6 +478,7 @@ class LSsession {
         LSerror :: addErrorCode('LSsession_02',$addon);
         return;
       }
+      self :: $loadedAddons[] = $addon;
       return true;
     }
     return;