diff --git a/html/autocomplete.php b/html/autocomplete.php
index e4259658f02d6a7de3c4427fc03e4a43c81297b8..f686a2ce8e3c8bc0d0316d13ad1edaff34c9a06d 100644
--- a/html/autocomplete.php
+++ b/html/autocomplete.php
@@ -26,10 +26,10 @@
session_cache_limiter("private");
session::start();
-session::global_set('errorsAlreadyPosted', array());
+session::set('errorsAlreadyPosted', array());
/* Logged in? Simple security check */
-if (!session::global_is_set('ui')) {
+if (!session::is_set('ui')) {
logging::log('security', 'unknown', '', array(), 'Error: autocomplete.php called without session');
header ('Location: index.php');
exit;
diff --git a/html/class_passwordRecovery.inc b/html/class_passwordRecovery.inc
index ad1650d57aa7e977de5085a2d6da1ec5a925c6b8..2f2c5d01ffe5c10f27dd7cd14fc8c2427413dce6 100644
--- a/html/class_passwordRecovery.inc
+++ b/html/class_passwordRecovery.inc
@@ -86,7 +86,7 @@ class standAlonePage {
/* Set config to selected one */
$config->set_current($this->directory);
- session::global_set('config', $config);
+ session::set('config', $config);
}
$this->activated = $this->readLdapConfig();
@@ -97,7 +97,7 @@ class standAlonePage {
if ($this->interactive) {
Language::init();
- if (session::global_is_set('plist')) {
+ if (session::is_set('plist')) {
session::global_un_set('plist');
}
$ui = new fake_userinfo();
@@ -123,7 +123,7 @@ class standAlonePage {
/* Parse configuration file */
$config = new config(CONFIG_DIR."/".CONFIG_FILE, $BASE_DIR);
- session::global_set('DEBUGLEVEL', $config->get_cfg_value("debuglevel"));
+ session::set('DEBUGLEVEL', $config->get_cfg_value("debuglevel"));
@DEBUG(DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, "config");
return $config;
}
@@ -300,8 +300,8 @@ class passwordRecovery extends standAlonePage {
/* Got a formular answer, validate and try to log in */
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
- if (session::global_is_set('_LAST_PAGE_REQUEST')) {
- session::global_set('_LAST_PAGE_REQUEST', time());
+ if (session::is_set('_LAST_PAGE_REQUEST')) {
+ session::set('_LAST_PAGE_REQUEST', time());
}
if (isset($_POST['change'])) {
diff --git a/html/getbin.php b/html/getbin.php
index 57632c5c97eb44307fd4c0bcd4fc834589a7032b..0598ea9175d06ed4be6faa170a2bf295ec6d7234 100644
--- a/html/getbin.php
+++ b/html/getbin.php
@@ -27,10 +27,10 @@
error_reporting (0);
session_cache_limiter('private');
session::start();
-session::global_set('errorsAlreadyPosted', array());
+session::set('errorsAlreadyPosted', array());
/* Logged in? Simple security check */
-if (!session::global_is_set('ui')) {
+if (!session::is_set('ui')) {
logging::log('security', 'unknown', '', array(), 'Error: getbin.php called without session');
header ('Location: index.php');
exit;
diff --git a/html/geticon.php b/html/geticon.php
index 57d2dba9021ce642e7e3303dd593e717879671b0..7d41faf7c6b84a02d22d47e1ae6fc05a9768afaa 100644
--- a/html/geticon.php
+++ b/html/geticon.php
@@ -25,10 +25,10 @@
session_cache_limiter("private");
session::start();
-session::global_set('errorsAlreadyPosted', array());
+session::set('errorsAlreadyPosted', array());
$theme = '';
-if (session::global_is_set('config')) {
+if (session::is_set('config')) {
$config = session::global_get('config');
$theme = $config->get_cfg_value('theme');
} else {
diff --git a/html/index.php b/html/index.php
index 38918fb6b9315727bcd65363441e0fe0d8e05316..1439c8dd8694b5f6b1076681f194c6a16ec20d20 100644
--- a/html/index.php
+++ b/html/index.php
@@ -114,7 +114,7 @@ function displayLogin()
session::start();
if (isset($_REQUEST['signout']) && $_REQUEST['signout']) {
- if (session::global_is_set('connected')) {
+ if (session::is_set('connected')) {
$config = session::global_get('config');
if ($config->get_cfg_value('casActivated') == 'TRUE') {
require_once('CAS.php');
@@ -163,8 +163,8 @@ if (!is_readable(CONFIG_DIR.'/'.CONFIG_FILE)) {
/* Parse configuration file */
$config = new config(CONFIG_DIR.'/'.CONFIG_FILE, $BASE_DIR);
-session::global_set('config', $config);
-session::global_set('DEBUGLEVEL', $config->get_cfg_value('DEBUGLEVEL'));
+session::set('config', $config);
+session::set('DEBUGLEVEL', $config->get_cfg_value('DEBUGLEVEL'));
@DEBUG (DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, 'config');
/* Set template compile directory */
@@ -201,7 +201,7 @@ if (
($config->get_cfg_value('casActivated') == 'TRUE') ||
($config->get_cfg_value('httpAuthActivated') == 'TRUE') ||
($config->get_cfg_value('httpHeaderAuthActivated') == 'TRUE')) {
- session::global_set('DEBUGLEVEL', 0);
+ session::set('DEBUGLEVEL', 0);
}
/* If SSL is forced, just forward to the SSL enabled site */
@@ -321,7 +321,7 @@ class Index {
del_user_locks($ui->dn);
/* Save userinfo and plugin structure */
- session::global_set('ui', $ui);
+ session::set('ui', $ui);
/* User might have its own language, re-run initLanguage */
$plistReloaded = Language::init();
@@ -355,8 +355,8 @@ class Index {
global $config;
/* Not account expired or password forced change go to main page */
logging::log('security', 'login', '', array(), 'User "'.static::$username.'" logged in successfully.');
- session::global_set('connected', 1);
- session::global_set('DEBUGLEVEL', $config->get_cfg_value('DEBUGLEVEL'));
+ session::set('connected', 1);
+ session::set('DEBUGLEVEL', $config->get_cfg_value('DEBUGLEVEL'));
header ('Location: main.php?global_check=1');
exit;
}
diff --git a/html/main.php b/html/main.php
index 9c40400d954e56ec333af36dc18dfc45520d51d7..655f3f7c27fb1e8a5e942fd894d712ac96b0b973 100644
--- a/html/main.php
+++ b/html/main.php
@@ -41,7 +41,7 @@ textdomain($domain);
/* Remember everything we did after the last click */
session::start();
session::set('errorsAlreadyPosted', array());
-session::global_set('runtime_cache', array());
+session::set('runtime_cache', array());
session::set('limit_exceeded', FALSE);
if ($_SERVER["REQUEST_METHOD"] == "POST") {
@@ -50,7 +50,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
@DEBUG (DEBUG_SESSION, __LINE__, __FUNCTION__, __FILE__, session::get_all(), "_SESSION");
/* Logged in? Simple security check */
-if (!session::global_is_set('connected')) {
+if (!session::is_set('connected')) {
logging::log('security', 'login', '', array(), 'main.php called without session - logging out');
header ('Location: index.php?message=nosession');
exit;
@@ -89,7 +89,7 @@ if (session::global_get('_LAST_PAGE_REQUEST') != '') {
}
}
}
-session::global_set('_LAST_PAGE_REQUEST', time());
+session::set('_LAST_PAGE_REQUEST', time());
@DEBUG (DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, "config");
@@ -98,8 +98,8 @@ session::global_set('_LAST_PAGE_REQUEST', time());
$smarty->compile_dir = $config->get_cfg_value("templateCompileDirectory", SPOOL_DIR);
/* Preset current main base */
-if (!session::global_is_set('CurrentMainBase')) {
- session::global_set('CurrentMainBase', get_base_from_people($ui->dn));
+if (!session::is_set('CurrentMainBase')) {
+ session::set('CurrentMainBase', get_base_from_people($ui->dn));
}
Language::init();
@@ -120,7 +120,7 @@ if (isset($global_check) && $config->get_cfg_value("forceglobals") == "TRUE") {
}
/* Check Plugin variable */
-if (session::global_is_set('plugin_dir')) {
+if (session::is_set('plugin_dir')) {
$old_plugin_dir = session::global_get('plugin_dir');
} else {
$old_plugin_dir = "";
@@ -164,7 +164,7 @@ if ($config->get_cfg_value("handleExpiredAccounts") == "TRUE") {
if (isset($_GET['plug']) && $plist->plugin_access_allowed($_GET['plug'])) {
$plug = validate($_GET['plug']);
$plugin_dir = $plist->get_path($plug);
- session::global_set('plugin_dir', $plugin_dir);
+ session::set('plugin_dir', $plugin_dir);
if ($plugin_dir == '') {
logging::log('security', 'fusiondirectory', '', array(), "main.php called with invalid plug parameter \"$plug\"");
header ('Location: index.php?signout=1&message=invalidparameter&plug='.$plug);
@@ -172,7 +172,7 @@ if (isset($_GET['plug']) && $plist->plugin_access_allowed($_GET['plug'])) {
}
} else {
/* set to welcome page as default plugin */
- session::global_set('plugin_dir', 'welcome');
+ session::set('plugin_dir', 'welcome');
$plugin_dir = "$BASE_DIR/plugins/generic/welcome";
}
@@ -260,17 +260,17 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
if (isset($_POST['delete_lock']) || isset($_POST['open_readonly'])) {
/* Set old Post data */
- if (session::global_is_set('LOCK_VARS_USED_GET')) {
+ if (session::is_set('LOCK_VARS_USED_GET')) {
foreach (session::global_get('LOCK_VARS_USED_GET') as $name => $value) {
$_GET[$name] = $value;
}
}
- if (session::global_is_set('LOCK_VARS_USED_POST')) {
+ if (session::is_set('LOCK_VARS_USED_POST')) {
foreach (session::global_get('LOCK_VARS_USED_POST') as $name => $value) {
$_POST[$name] = $value;
}
}
- if (session::global_is_set('LOCK_VARS_USED_REQUEST')) {
+ if (session::is_set('LOCK_VARS_USED_REQUEST')) {
foreach (session::global_get('LOCK_VARS_USED_REQUEST') as $name => $value) {
$_REQUEST[$name] = $value;
}
@@ -344,8 +344,6 @@ $display = $smarty->fetch(get_template_path('headers.tpl')).
echo $display;
/* Save plist and config */
-session::global_set('plist', $plist);
-session::global_set('config', $config);
+session::set('plist', $plist);
+session::set('config', $config);
session::set('errorsAlreadyPosted', array());
-
-?>
diff --git a/html/setup.php b/html/setup.php
index 9167b8bee16e53b159e0f6e88787192fdf50d769..31b31f9c91a3fc5f7459a6823500e8c77fb3c9e3 100644
--- a/html/setup.php
+++ b/html/setup.php
@@ -49,7 +49,7 @@ ini_set("session.gc_maxlifetime", 24 * 60 * 60);
/* Start session */
session::start();
-session::global_set('DEBUGLEVEL', 0);
+session::set('DEBUGLEVEL', 0);
session::set('errorsAlreadyPosted', array());
CSRFProtection::check();
@@ -75,7 +75,7 @@ if (isset($_POST['lang_selected']) && $_POST['lang_selected'] != '') {
if (!preg_match('/utf(-)?8$/i', $lang)) {
$lang .= '.UTF-8';
}
-} elseif (session::global_is_set('lang')) {
+} elseif (session::is_set('lang')) {
$lang = session::global_get('lang');
/* Append .UTF-8 to language string if necessary */
@@ -92,9 +92,9 @@ $smarty->assign("rtl", Language::isRTL($lang));
$smarty->assign("must", '<span class="must">*</span>');
/* Minimal config */
-if (!session::global_is_set('config')) {
+if (!session::is_set('config')) {
$config = new config('');
- session::global_set('config', $config);
+ session::set('config', $config);
}
$config = session::global_get('config');
IconTheme::loadThemes('themes');
diff --git a/include/class_Language.inc b/include/class_Language.inc
index 966181080c4f7c00618e20b6606f1d9e2f2186aa..28c9191e21ba60a92f8d72c8b5cd82b712c8636f 100644
--- a/include/class_Language.inc
+++ b/include/class_Language.inc
@@ -66,19 +66,19 @@ class Language
$ret = FALSE;
/* Reset plist cache if language changed */
- if ((!session::global_is_set('lang')) || (session::global_get('lang') != $lang)) {
+ if ((!session::is_set('lang')) || (session::global_get('lang') != $lang)) {
$ret = TRUE;
- if (session::global_is_set('plist')) {
+ if (session::is_set('plist')) {
if ($_SERVER['REQUEST_METHOD'] != 'POST') {
@DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, session::global_get('lang'), 'Plist already loaded with language');
}
session::global_un_set('plist');
- session::global_set('lang', $lang);
+ session::set('lang', $lang);
load_plist();
}
}
- session::global_set('lang', $lang);
+ session::set('lang', $lang);
return $ret;
}
diff --git a/include/class_baseSelector.inc b/include/class_baseSelector.inc
index 1e9f5f1c0dd5faaea95cf389a0fd8fc4b33ab990..4acac02379090ca23120f66d1604ec3b755f9ccc 100644
--- a/include/class_baseSelector.inc
+++ b/include/class_baseSelector.inc
@@ -130,7 +130,7 @@ class baseSelector
}
// Save bases to session for autocompletion
- session::global_set('pathMapping', $this->pathMapping);
+ session::set('pathMapping', $this->pathMapping);
}
/*!
diff --git a/include/class_config.inc b/include/class_config.inc
index c07ae223b1f6fb1e42aa4a46542c1a25a71441ee..9f086c3ad92b63edcc0d949b5b5fcbe0ca461d29 100644
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -96,12 +96,12 @@ class config
/* Check if class_location.inc has changed, this is the case
if we have installed or removed plugins. */
$tmp = stat(CACHE_DIR.'/'.CLASS_CACHE);
- if (session::global_is_set('class_location.inc:timestamp')) {
+ if (session::is_set('class_location.inc:timestamp')) {
if ($tmp['mtime'] != session::global_get('class_location.inc:timestamp')) {
session::global_un_set('plist');
}
}
- session::global_set('class_location.inc:timestamp', $tmp['mtime']);
+ session::set('class_location.inc:timestamp', $tmp['mtime']);
if (($this->filename != '') && ((filemtime($this->filename) != $this->last_modified) || $force)) {
@@ -270,14 +270,14 @@ class config
function get_credentials($creds)
{
if (isset($_SERVER['HTTP_FDKEY'])) {
- if (!session::global_is_set('HTTP_FDKEY_CACHE')) {
- session::global_set('HTTP_FDKEY_CACHE', array());
+ if (!session::is_set('HTTP_FDKEY_CACHE')) {
+ session::set('HTTP_FDKEY_CACHE', array());
}
$cache = session::global_get('HTTP_FDKEY_CACHE');
if (!isset($cache[$creds])) {
try {
$cache[$creds] = cred_decrypt($creds, $_SERVER['HTTP_FDKEY']);
- session::global_set('HTTP_FDKEY_CACHE', $cache);
+ session::set('HTTP_FDKEY_CACHE', $cache);
} catch (FusionDirectoryException $e) {
$msg = sprintf(
_('It seems you are trying to decode something which is not encoded : %s<br/>'."\n".
@@ -357,7 +357,7 @@ class config
$this->current = $this->data['LOCATIONS'][$name];
if (isset($this->current['INITIAL_BASE'])) {
- session::global_set('CurrentMainBase', $this->current['INITIAL_BASE']);
+ session::set('CurrentMainBase', $this->current['INITIAL_BASE']);
}
/* Sort referrals, if present */
@@ -398,7 +398,7 @@ class config
if (isset($this->data['MAIN']['DEBUGLEVEL'])) {
$debugLevel |= $this->data['MAIN']['DEBUGLEVEL'];
}
- session::global_set('DEBUGLEVEL', $debugLevel);
+ session::set('DEBUGLEVEL', $debugLevel);
IconTheme::loadThemes('themes');
diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index c6cd7497d99a5a414165c74a4ddddf7f3d7b6e54..de5e00ab23176cc1d3e1ccc3fb9c959e2de1b364 100644
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -1220,7 +1220,7 @@ class LDAP
$objectclasses = array();
/* Return the cached results. */
- if (class_available('session') && session::global_is_set('LDAP_CACHE::get_objectclasses') && !$force_reload) {
+ if (class_available('session') && session::is_set('LDAP_CACHE::get_objectclasses') && !$force_reload) {
$objectclasses = session::global_get('LDAP_CACHE::get_objectclasses');
return $objectclasses;
}
@@ -1293,7 +1293,7 @@ class LDAP
}
if (class_available('session')) {
- session::global_set('LDAP_CACHE::get_objectclasses', $objectclasses);
+ session::set('LDAP_CACHE::get_objectclasses', $objectclasses);
}
return $objectclasses;
@@ -1328,7 +1328,7 @@ class LDAP
*/
function log($string)
{
- if (session::global_is_set('config')) {
+ if (session::is_set('config')) {
$cfg = session::global_get('config');
if (isset($cfg->current['LDAPSTATS']) && preg_match('/true/i', $cfg->current['LDAPSTATS'])) {
syslog (LOG_INFO, $string);
diff --git a/include/class_listing.inc b/include/class_listing.inc
index b948254cf4d54174efe63ed72eb8b7edc977c887..28c6c6b094504a221882281691428bfece630e09 100644
--- a/include/class_listing.inc
+++ b/include/class_listing.inc
@@ -535,7 +535,7 @@ class listing
$refresh = FALSE;
if ($this->baseMode) {
$this->base = $this->baseSelector->getBase();
- session::global_set("CurrentMainBase", $this->base);
+ session::set("CurrentMainBase", $this->base);
$refresh = TRUE;
}
@@ -652,7 +652,7 @@ class listing
$this->base = $base;
if ($this->baseMode) {
$this->baseSelector->setBase($this->base);
- session::global_set('CurrentMainBase', $this->base);
+ session::set('CurrentMainBase', $this->base);
}
}
diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc
index 38c1d7615d5ab5d23682b3960efd3580f22a1fb5..488300e4a6eebc33bf125eae59afc2cb7c907301 100644
--- a/include/class_userinfo.inc
+++ b/include/class_userinfo.inc
@@ -107,7 +107,7 @@ class userinfo
public function reset_acl_cache()
{
/* Initialize ACL_CACHE */
- session::global_set('ACL_CACHE', array());
+ session::set('ACL_CACHE', array());
}
/*!
diff --git a/include/functions.inc b/include/functions.inc
index 70ec569ee8b9b0f84cecc6f949860128939c28c8..9bbaa0f0811ae767c39b531839cf869497612f9c 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -160,12 +160,12 @@ function plugin_available($plugin)
function load_plist ($ldap_available = TRUE)
{
global $config, $plist;
- if (!session::global_is_set('plist')) {
+ if (!session::is_set('plist')) {
/* Initially load all classes */
load_all_classes();
$plist = new pluglist();
- session::global_set('plist', $plist);
+ session::set('plist', $plist);
$config->loadPlist($plist);
if ($ldap_available) {
$config->get_departments();
@@ -560,8 +560,8 @@ function add_lock($object, $user)
/* Remember which entries were opened as read only, because we
don't need to remove any locks for them later.
*/
- if (!session::global_is_set('LOCK_CACHE')) {
- session::global_set('LOCK_CACHE', array(''));
+ if (!session::is_set('LOCK_CACHE')) {
+ session::set('LOCK_CACHE', array(''));
}
if (is_array($object)) {
foreach ($object as $obj) {
@@ -642,7 +642,7 @@ function del_lock ($object)
/* If this object was opened in read only mode then
skip removing the lock entry, there wasn't any lock created.
*/
- if (session::global_is_set('LOCK_CACHE')) {
+ if (session::is_set('LOCK_CACHE')) {
$cache = &session::global_get_ref('LOCK_CACHE');
if (isset($cache['READ_ONLY'][$object])) {
unset($cache['READ_ONLY'][$object]);
diff --git a/include/simpleplugin/attributes/class_BaseSelectorAttribute.inc b/include/simpleplugin/attributes/class_BaseSelectorAttribute.inc
index fa113df8d04c19ab863f28d80d3fa5e3c62fb1c5..805ddeca402bc453f83da76cb1e4ad7d1469ef03 100644
--- a/include/simpleplugin/attributes/class_BaseSelectorAttribute.inc
+++ b/include/simpleplugin/attributes/class_BaseSelectorAttribute.inc
@@ -61,7 +61,7 @@ class BaseSelectorAttribute extends Attribute
}
if ($this->plugin->dn == "new") {
$ui = get_userinfo();
- $this->setValue(dn2base(session::global_is_set("CurrentMainBase") ? "cn=dummy,".session::global_get("CurrentMainBase") : $ui->dn));
+ $this->setValue(dn2base(session::is_set("CurrentMainBase") ? "cn=dummy,".session::global_get("CurrentMainBase") : $ui->dn));
} else {
$this->setValue(dn2base($this->plugin->dn, $this->ou));
}
diff --git a/include/simpleplugin/class_simpleManagement.inc b/include/simpleplugin/class_simpleManagement.inc
index 678e579620ffcdc4d6ce43d0e5f0f75c3deef12e..6f85383473cc70e1e16bd6f2e245295d2342186f 100644
--- a/include/simpleplugin/class_simpleManagement.inc
+++ b/include/simpleplugin/class_simpleManagement.inc
@@ -235,7 +235,7 @@ class simpleManagement
}
// Build filter
- if (session::global_is_set(get_class($this).'_filter')) {
+ if (session::is_set(get_class($this).'_filter')) {
$filter = session::global_get(get_class($this).'_filter');
} else {
$filter = new filter($this->filterXMLPath);
@@ -557,7 +557,7 @@ class simpleManagement
// Update filter
if ($this->filter) {
$this->filter->update();
- session::global_set(get_class($this).'_filter', $this->filter);
+ session::set(get_class($this).'_filter', $this->filter);
session::set('autocomplete', $this->filter);
if (!$this->filter->isValid()) {
msg_dialog::display(_('Filter error'), _('The filter is incomplete!'), ERROR_DIALOG);
diff --git a/include/simpleplugin/class_simplePlugin.inc b/include/simpleplugin/class_simplePlugin.inc
index 20a94870e9dea6113b68928356ed946b66f5f48f..68ab7e3dc6d82db4caef75f28df0a69f19812e8e 100644
--- a/include/simpleplugin/class_simplePlugin.inc
+++ b/include/simpleplugin/class_simplePlugin.inc
@@ -204,7 +204,7 @@ class simplePlugin
if ($this->dn != 'new') {
/* Check if this entry was opened in read only mode */
if (isset($_POST['open_readonly'])) {
- if (session::global_is_set('LOCK_CACHE')) {
+ if (session::is_set('LOCK_CACHE')) {
$cache = session::get('LOCK_CACHE');
if (isset($cache['READ_ONLY'][$this->dn])) {
$this->read_only = TRUE;
diff --git a/include/simpleplugin/class_simpleTabs.inc b/include/simpleplugin/class_simpleTabs.inc
index e1d3e4538b23ea91510e4783601a0c8f9e13ea62..2b3367e8b1ae0175c6dbe0330b863ef2bc20c071 100644
--- a/include/simpleplugin/class_simpleTabs.inc
+++ b/include/simpleplugin/class_simpleTabs.inc
@@ -163,7 +163,7 @@ class simpleTabs
$baseobject = $this->getBaseObject();
if (isset($baseobject->base)) {
@DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $baseobject->base, 'Fixing base');
- if (session::global_is_set('CurrentMainBase')) {
+ if (session::is_set('CurrentMainBase')) {
$baseobject->base = dn2base('cn=dummy,'.session::global_get('CurrentMainBase'));
} else {
$baseobject->base = dn2base(get_userinfo()->dn);
diff --git a/plugins/admin/acl/class_aclAssignment.inc b/plugins/admin/acl/class_aclAssignment.inc
index a5e0eff820900bb00eb47bb8333b4e845115661a..a28f524208ef869f7258e15bc5ab2fee72322fb9 100644
--- a/plugins/admin/acl/class_aclAssignment.inc
+++ b/plugins/admin/acl/class_aclAssignment.inc
@@ -342,7 +342,7 @@ class aclAssignment extends simplePlugin
/* Refresh users ACLs */
$ui = get_userinfo();
$ui->loadACL();
- session::global_set('ui', $ui);
+ session::set('ui', $ui);
}
function post_save()
@@ -352,7 +352,7 @@ class aclAssignment extends simplePlugin
/* Refresh users ACLs */
$ui = get_userinfo();
$ui->loadACL();
- session::global_set('ui', $ui);
+ session::set('ui', $ui);
}
function foreignKeyUpdate ($field, $oldvalue, $newvalue, $source)
diff --git a/plugins/config/class_configInLdap.inc b/plugins/config/class_configInLdap.inc
index 5f19db7c00aafffa73fdb1d0f14ffebbdc1b7ef3..9b8f3ad7654ea109f6c041f24434970f485bb66c 100644
--- a/plugins/config/class_configInLdap.inc
+++ b/plugins/config/class_configInLdap.inc
@@ -79,7 +79,7 @@ class configInLdap extends simplePlugin
{
global $config;
$plugins = array();
- if (session::global_is_set('plist')) {
+ if (session::is_set('plist')) {
$plugins = array_keys(session::global_get('plist')->info);
}
sort($plugins);
diff --git a/setup/class_setupStepMigrate.inc b/setup/class_setupStepMigrate.inc
index 0ee9614cc86dd5b786c98323310a643e9b9725f9..d15e505a351bdb12f61397d4c97b3da45293a73e 100644
--- a/setup/class_setupStepMigrate.inc
+++ b/setup/class_setupStepMigrate.inc
@@ -842,7 +842,7 @@ class setupStepMigrate extends setupStep
function check_adminAccount_migrate_confirm(&$checkobj)
{
global $config;
- session::global_set('CurrentMainBase', $config->current['BASE']);
+ session::set('CurrentMainBase', $config->current['BASE']);
/* Creating role */
$ldap = $config->get_ldap_link();