From d5ea99252fef67343e32210a5a16f09afb218765 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Wed, 28 Aug 2019 11:03:12 +0200
Subject: [PATCH] :tractor: fix(session) Normalize session unsetting to un_set

No more global_un_set, global_delete or delete

issue #6024
---
 include/class_Language.inc           |  2 +-
 include/class_config.inc             |  2 +-
 include/class_session.inc            | 20 ++++++++------------
 include/login/class_LoginMethod.inc  |  2 +-
 plugins/config/tabs_configInLdap.inc |  2 +-
 setup/class_setup.inc                |  2 +-
 setup/class_setupStepConfig.inc      |  2 +-
 7 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/include/class_Language.inc b/include/class_Language.inc
index f6e7b304b..773943771 100644
--- a/include/class_Language.inc
+++ b/include/class_Language.inc
@@ -72,7 +72,7 @@ class Language
         if ($_SERVER['REQUEST_METHOD'] != 'POST') {
           @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, session::get('lang'), 'Plist already loaded with language');
         }
-        session::global_un_set('plist');
+        session::un_set('plist');
         session::set('lang', $lang);
         pluglist::load();
       }
diff --git a/include/class_config.inc b/include/class_config.inc
index 0c9d2d748..fdf99e775 100644
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -97,7 +97,7 @@ class config
     $tmp = stat(CACHE_DIR.'/'.CLASS_CACHE);
     if (session::is_set('class_location.inc:timestamp')
       && ($tmp['mtime'] != session::get('class_location.inc:timestamp'))) {
-      session::global_un_set('plist');
+      session::un_set('plist');
     }
     session::set('class_location.inc:timestamp', $tmp['mtime']);
 
diff --git a/include/class_session.inc b/include/class_session.inc
index b32c6e591..033da8ed2 100644
--- a/include/class_session.inc
+++ b/include/class_session.inc
@@ -102,15 +102,11 @@ class session
   }
 
   /*!
-   * \brief Delete a session
-   *
-   * \param string $name Name of the session to delete
+   * \brief Deprecated
    */
   public static function delete ($name)
   {
-    if (isset($_SESSION[$name])) {
-      unset($_SESSION[$name]);
-    }
+    return static::un_set($name);
   }
 
   /*!
@@ -118,7 +114,7 @@ class session
    */
   public static function global_delete ($name)
   {
-    static::delete($name);
+    return static::un_set($name);
   }
 
   /*!
@@ -128,17 +124,17 @@ class session
    */
   public static function un_set ($name)
   {
-    return static::delete($name);
+    if (isset($_SESSION[$name])) {
+      unset($_SESSION[$name]);
+    }
   }
 
   /*!
-   * \brief Unset a session
-   *
-   * \param string $name Name of the session to delete
+   * \brief Deprecated
    */
   public static function global_un_set ($name)
   {
-    return static::global_delete($name);
+    return static::un_set($name);
   }
 
   /*!
diff --git a/include/login/class_LoginMethod.inc b/include/login/class_LoginMethod.inc
index 1e5b7a04e..406c31e4f 100644
--- a/include/login/class_LoginMethod.inc
+++ b/include/login/class_LoginMethod.inc
@@ -126,7 +126,7 @@ class LoginMethod
 
     /* We need a fully loaded plist and config to test account expiration */
     if (!$plistReloaded) {
-      session::global_un_set('plist');
+      session::un_set('plist');
     }
     pluglist::load();
 
diff --git a/plugins/config/tabs_configInLdap.inc b/plugins/config/tabs_configInLdap.inc
index 7ba0f1f61..19603f69f 100644
--- a/plugins/config/tabs_configInLdap.inc
+++ b/plugins/config/tabs_configInLdap.inc
@@ -28,7 +28,7 @@ class tabs_configInLdap extends simpleTabs
     /* check_and_reload */
     $config->check_and_reload(TRUE);
     /* reload plist as well as some plInfo might use $config or get_ou */
-    session::global_un_set('plist');
+    session::un_set('plist');
     pluglist::load();
     session::un_set('passwordMethod::get_available_methods');
 
diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index 142141c28..a65d21832 100644
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -274,7 +274,7 @@ class setup
     $xml = $smarty->fetch(CONFIG_TEMPLATE_DIR.CONFIG_FILE);
     $config->parse_data($xml);
     $config->set_current($config->data['MAIN']['DEFAULT']);
-    session::global_un_set('plist');
+    session::un_set('plist');
     pluglist::load();
     $this->reBuildConfigStep();
   }
diff --git a/setup/class_setupStepConfig.inc b/setup/class_setupStepConfig.inc
index b9db000c2..c6234de0a 100644
--- a/setup/class_setupStepConfig.inc
+++ b/setup/class_setupStepConfig.inc
@@ -121,7 +121,7 @@ class setupStepConfig extends configInLdap
       }
       /* Reload config from LDAP */
       $config->set_current($config->current['NAME']);
-      session::global_un_set('plist');
+      session::un_set('plist');
       pluglist::load();
       $this->is_completed = TRUE;
       $this->parent->reBuildConfigStep(TRUE);
-- 
GitLab