From fa4578dfe9abd2a2ba281984132c68ff45b13ba5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Wed, 28 Aug 2019 10:59:23 +0200
Subject: [PATCH] :tractor: fix(session) Remove ref from session::get
And convert global_get calls to get
issue #6024
---
contrib/smarty/plugins/function.filePath.php | 2 +-
contrib/smarty/plugins/function.iconPath.php | 2 +-
html/autocomplete.php | 6 +++---
html/geticon.php | 2 +-
html/index.php | 2 +-
html/main.php | 18 +++++++++---------
html/setup.php | 6 +++---
include/class_Language.inc | 4 ++--
include/class_config.inc | 4 ++--
include/class_ldap.inc | 4 ++--
include/class_pluglist.inc | 4 ++--
include/class_session.inc | 2 +-
include/class_standAlonePage.inc | 6 +++---
include/functions.inc | 4 ++--
include/login/class_LoginPost.inc | 2 +-
.../simpleplugin/class_simpleManagement.inc | 2 +-
.../admin/aclrole/class_aclEditionDialog.inc | 2 +-
plugins/config/class_configInLdap.inc | 4 ++--
plugins/config/class_hooksConfig.inc | 2 +-
19 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/contrib/smarty/plugins/function.filePath.php b/contrib/smarty/plugins/function.filePath.php
index d2e9176db..875f4d1f5 100644
--- a/contrib/smarty/plugins/function.filePath.php
+++ b/contrib/smarty/plugins/function.filePath.php
@@ -19,7 +19,7 @@
*/
function smarty_function_filePath ($params, Smarty_Internal_Template $smarty)
{
- $config = session::global_get('config');
+ $config = session::get('config');
$default_theme = 'breezy';
/* Set theme */
diff --git a/contrib/smarty/plugins/function.iconPath.php b/contrib/smarty/plugins/function.iconPath.php
index 08ee40127..42ce6ec82 100644
--- a/contrib/smarty/plugins/function.iconPath.php
+++ b/contrib/smarty/plugins/function.iconPath.php
@@ -19,7 +19,7 @@
*/
function smarty_function_iconPath ($params)
{
- $config = session::global_get('config');
+ $config = session::get('config');
/* Set theme */
$theme = IconTheme::$default_theme;
diff --git a/html/autocomplete.php b/html/autocomplete.php
index 899b0f3a0..38c75383f 100644
--- a/html/autocomplete.php
+++ b/html/autocomplete.php
@@ -44,7 +44,7 @@ if (isset($_GET['type']) && $_GET['type'] == "base") {
$pathMapping = session::get("pathMapping");
$search = preg_replace('/"/', '"', current($_POST));
- $config = session::global_get('config');
+ $config = session::get('config');
$departmentInfo = $config->getDepartmentInfo();
foreach ($departmentInfo as $dn => $info) {
if (!isset($pathMapping[$dn])) {
@@ -70,8 +70,8 @@ if (isset($_GET['type']) && $_GET['type'] == "base") {
}
}
} else {
- $ui = session::global_get('ui');
- $config = session::global_get('config');
+ $ui = session::get('ui');
+ $config = session::get('config');
/* Is there a filter object arround? */
if (session::is_set('autocomplete')) {
diff --git a/html/geticon.php b/html/geticon.php
index a547e05bf..f66c32d2f 100644
--- a/html/geticon.php
+++ b/html/geticon.php
@@ -29,7 +29,7 @@ reset_errors();
$theme = '';
if (session::is_set('config')) {
- $config = session::global_get('config');
+ $config = session::get('config');
$theme = $config->get_cfg_value('theme');
} else {
header("cache-control: no-cache");
diff --git a/html/index.php b/html/index.php
index cab372fba..738c5dda0 100644
--- a/html/index.php
+++ b/html/index.php
@@ -41,7 +41,7 @@ session::start();
if (isset($_REQUEST['signout']) && $_REQUEST['signout']) {
if (session::is_set('connected')) {
- $config = session::global_get('config');
+ $config = session::get('config');
if ($config->get_cfg_value('casActivated') == 'TRUE') {
require_once('CAS.php');
/* Move FD autoload after CAS autoload */
diff --git a/html/main.php b/html/main.php
index 289db16f3..ddcef8e14 100644
--- a/html/main.php
+++ b/html/main.php
@@ -53,8 +53,8 @@ if (!session::is_set('connected')) {
CSRFProtection::check();
-$ui = session::global_get('ui');
-$config = session::global_get('config');
+$ui = session::get('ui');
+$config = session::get('config');
/* If SSL is forced, just forward to the SSL enabled site */
if (($config->get_cfg_value('forcessl') == 'TRUE') && ($ssl != '')) {
@@ -65,13 +65,13 @@ if (($config->get_cfg_value('forcessl') == 'TRUE') && ($ssl != '')) {
timezone::setDefaultTimezoneFromConfig();
/* Check for invalid sessions */
-if (session::global_get('_LAST_PAGE_REQUEST') != '') {
+if (session::get('_LAST_PAGE_REQUEST') != '') {
/* check FusionDirectory.conf for defined session lifetime */
$max_life = $config->get_cfg_value('sessionLifetime', 60 * 60 * 2);
if ($max_life > 0) {
/* get time difference between last page reload */
- $request_time = (time() - session::global_get('_LAST_PAGE_REQUEST'));
+ $request_time = (time() - session::get('_LAST_PAGE_REQUEST'));
/* If page wasn't reloaded for more than max_life seconds
* kill session
@@ -99,7 +99,7 @@ pluglist::load();
/* Check previous plugin index */
if (session::is_set('plugin_index')) {
- $old_plugin_index = session::global_get('plugin_index');
+ $old_plugin_index = session::get('plugin_index');
} else {
$old_plugin_index = '';
}
@@ -177,7 +177,7 @@ if (isset($_GET['reset'])) {
/* show web frontend */
$smarty->assign("date", date("l, dS F Y H:i:s O"));
-$lang = session::global_get('lang');
+$lang = session::get('lang');
$smarty->assign('lang', preg_replace('/_.*$/', '', $lang));
$smarty->assign('rtl', Language::isRTL($lang));
if (isset($plugin_index)) {
@@ -202,17 +202,17 @@ if (($_SERVER['REQUEST_METHOD'] == 'POST')
/* Set old Post data */
if (session::is_set('LOCK_VARS_USED_GET')) {
- foreach (session::global_get('LOCK_VARS_USED_GET') as $name => $value) {
+ foreach (session::get('LOCK_VARS_USED_GET') as $name => $value) {
$_GET[$name] = $value;
}
}
if (session::is_set('LOCK_VARS_USED_POST')) {
- foreach (session::global_get('LOCK_VARS_USED_POST') as $name => $value) {
+ foreach (session::get('LOCK_VARS_USED_POST') as $name => $value) {
$_POST[$name] = $value;
}
}
if (session::is_set('LOCK_VARS_USED_REQUEST')) {
- foreach (session::global_get('LOCK_VARS_USED_REQUEST') as $name => $value) {
+ foreach (session::get('LOCK_VARS_USED_REQUEST') as $name => $value) {
$_REQUEST[$name] = $value;
}
}
diff --git a/html/setup.php b/html/setup.php
index 32381f2c6..3d367f81c 100644
--- a/html/setup.php
+++ b/html/setup.php
@@ -75,7 +75,7 @@ if (isset($_POST['lang_selected']) && $_POST['lang_selected'] != '') {
$lang .= '.UTF-8';
}
} elseif (session::is_set('lang')) {
- $lang = session::global_get('lang');
+ $lang = session::get('lang');
/* Append .UTF-8 to language string if necessary */
if (!preg_match('/utf(-)?8$/i', $lang)) {
@@ -95,7 +95,7 @@ if (!session::is_set('config')) {
$config = new config('');
session::set('config', $config);
}
-$config = session::global_get('config');
+$config = session::get('config');
IconTheme::loadThemes('themes');
/* Fake user bypassing acl system */
$ui = new userinfoNoAuth('setup');
@@ -107,7 +107,7 @@ $focus .= 'next_msg_dialog();';
$focus .= '</script>';
/* show web frontend */
-$setup = session::global_get('setup');
+$setup = session::get('setup');
$smarty->assign('date', date('l, dS F Y H:i:s O'));
$smarty->assign('headline', $setup->get_header_text());
diff --git a/include/class_Language.inc b/include/class_Language.inc
index 1a2f1eea1..f6e7b304b 100644
--- a/include/class_Language.inc
+++ b/include/class_Language.inc
@@ -66,11 +66,11 @@ class Language
$ret = FALSE;
/* Reset plist cache if language changed */
- if ((!session::is_set('lang')) || (session::global_get('lang') != $lang)) {
+ if ((!session::is_set('lang')) || (session::get('lang') != $lang)) {
$ret = TRUE;
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');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, session::get('lang'), 'Plist already loaded with language');
}
session::global_un_set('plist');
session::set('lang', $lang);
diff --git a/include/class_config.inc b/include/class_config.inc
index 3f24a6820..0c9d2d748 100644
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -96,7 +96,7 @@ class config
if we have installed or removed plugins. */
$tmp = stat(CACHE_DIR.'/'.CLASS_CACHE);
if (session::is_set('class_location.inc:timestamp')
- && ($tmp['mtime'] != session::global_get('class_location.inc:timestamp'))) {
+ && ($tmp['mtime'] != session::get('class_location.inc:timestamp'))) {
session::global_un_set('plist');
}
session::set('class_location.inc:timestamp', $tmp['mtime']);
@@ -268,7 +268,7 @@ class config
if (!session::is_set('HTTP_FDKEY_CACHE')) {
session::set('HTTP_FDKEY_CACHE', []);
}
- $cache = session::global_get('HTTP_FDKEY_CACHE');
+ $cache = session::get('HTTP_FDKEY_CACHE');
if (!isset($cache[$creds])) {
try {
$cache[$creds] = cred_decrypt($creds, $_SERVER['HTTP_FDKEY']);
diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index 976f1a6e0..0af3d2ede 100644
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -1338,7 +1338,7 @@ class LDAP
{
/* Return the cached results. */
if (class_available('session') && session::is_set('LDAP_CACHE::get_objectclasses') && !$force_reload) {
- return session::global_get('LDAP_CACHE::get_objectclasses');
+ return session::get('LDAP_CACHE::get_objectclasses');
}
// Get base to look for schema
@@ -1444,7 +1444,7 @@ class LDAP
function log ($string)
{
if (session::is_set('config')) {
- $cfg = session::global_get('config');
+ $cfg = session::get('config');
if (isset($cfg->current['LDAPSTATS']) && preg_match('/true/i', $cfg->current['LDAPSTATS'])) {
syslog(LOG_INFO, $string);
}
diff --git a/include/class_pluglist.inc b/include/class_pluglist.inc
index 96d22ccef..986c8b9fe 100644
--- a/include/class_pluglist.inc
+++ b/include/class_pluglist.inc
@@ -504,7 +504,7 @@ class pluglist
static function pluginInfos ($cname)
{
- $plist = session::global_get('plist');
+ $plist = session::get('plist');
if ($plist) {
if (!isset($plist->info[$cname])) {
throw new UnknownClassException($cname);
@@ -530,7 +530,7 @@ class pluglist
$config->loadPlist($plist);
$config->resetDepartmentCache();
} else {
- $plist = session::global_get('plist');
+ $plist = session::get('plist');
}
return $plist;
diff --git a/include/class_session.inc b/include/class_session.inc
index 1bf211901..b32c6e591 100644
--- a/include/class_session.inc
+++ b/include/class_session.inc
@@ -72,7 +72,7 @@ class session
*
* \param string $name Name of the session
*/
- public static function &get ($name)
+ public static function get ($name)
{
return $_SESSION[$name];
}
diff --git a/include/class_standAlonePage.inc b/include/class_standAlonePage.inc
index 1acc9e580..3aa4551c3 100644
--- a/include/class_standAlonePage.inc
+++ b/include/class_standAlonePage.inc
@@ -99,8 +99,8 @@ class standAlonePage
CSRFProtection::check();
- $ui = session::global_get('ui');
- $config = session::global_get('config');
+ $ui = session::get('ui');
+ $config = session::get('config');
timezone::setDefaultTimezoneFromConfig();
@@ -160,7 +160,7 @@ class standAlonePage
$smarty->assign('revision', FD_VERSION);
$smarty->assign('year', date('Y'));
- $lang = session::global_get('lang');
+ $lang = session::get('lang');
$smarty->assign('lang', preg_replace('/_.*$/', '', $lang));
$smarty->assign('rtl', Language::isRTL($lang));
$smarty->assign('usePrototype', 'FALSE');
diff --git a/include/functions.inc b/include/functions.inc
index 1ba90e993..ba060772d 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -176,7 +176,7 @@ function DEBUG ($level, $line, $function, $file, $data, $info = '')
if (($_SERVER['REQUEST_METHOD'] == 'POST') && preg_match('/index.php$/', $_SERVER['REQUEST_URI'])) {
return;
}
- if (session::global_get('DEBUGLEVEL') & $level) {
+ if (session::get('DEBUGLEVEL') & $level) {
if ($first) {
echo '<div id="debug-handling" class="notice">'.
'<img src="geticon.php?context=status&icon=dialog-information&size=22" alt="Information" style="vertical-align:middle;margin-right:.2em;"/>'.
@@ -242,7 +242,7 @@ function get_template_path ($filename = '', $plugin = FALSE, $path = '')
/* Return plugin dir or root directory? */
if ($plugin) {
if ($path == '') {
- $path = session::global_get('plugin_dir');
+ $path = session::get('plugin_dir');
$nf = preg_replace('!^'.$BASE_DIR.'/!', '', preg_replace('/^\.\.\//', '', $path));
} else {
$nf = preg_replace('!^'.$BASE_DIR.'/!', '', $path);
diff --git a/include/login/class_LoginPost.inc b/include/login/class_LoginPost.inc
index 46261ad74..2376ef180 100644
--- a/include/login/class_LoginPost.inc
+++ b/include/login/class_LoginPost.inc
@@ -67,7 +67,7 @@ class LoginPost extends LoginMethod
{
global $smarty,$message,$config,$ssl,$error_collector,$error_collector_mailto;
- $lang = session::global_get('lang');
+ $lang = session::get('lang');
error_reporting(E_ALL | E_STRICT);
diff --git a/include/simpleplugin/class_simpleManagement.inc b/include/simpleplugin/class_simpleManagement.inc
index af3951818..43384657e 100644
--- a/include/simpleplugin/class_simpleManagement.inc
+++ b/include/simpleplugin/class_simpleManagement.inc
@@ -236,7 +236,7 @@ class simpleManagement
// Build filter
if (session::is_set(get_class($this).'_filter')) {
- $filter = session::global_get(get_class($this).'_filter');
+ $filter = session::get(get_class($this).'_filter');
} else {
$filter = new filter($this->filterXMLPath);
$filter->setObjectStorage($this->storagePoints);
diff --git a/plugins/admin/aclrole/class_aclEditionDialog.inc b/plugins/admin/aclrole/class_aclEditionDialog.inc
index 68a90d89e..aad8aa9e9 100644
--- a/plugins/admin/aclrole/class_aclEditionDialog.inc
+++ b/plugins/admin/aclrole/class_aclEditionDialog.inc
@@ -270,7 +270,7 @@ class ACLEditionDialog extends GenericDialog
{
$display = '<input type="hidden" name="acl_dummy_0_0_0" value="1"/>';
$cols = 3;
- $tmp = session::global_get('plist');
+ $tmp = session::get('plist');
$plist = $tmp->info;
asort($plist);
diff --git a/plugins/config/class_configInLdap.inc b/plugins/config/class_configInLdap.inc
index bb403ba6a..8b6eccade 100644
--- a/plugins/config/class_configInLdap.inc
+++ b/plugins/config/class_configInLdap.inc
@@ -417,7 +417,7 @@ class configInLdap extends simplePlugin
array_values($groupsAndRoles)
);
$menuPlugins = [];
- $plist = session::global_get('plist');
+ $plist = session::get('plist');
foreach ($config->data['SECTIONS'] as $section => $section_infos) {
foreach ($config->data['MENU'][$section] as $info) {
if (isset($info['CLASS'])) {
@@ -538,7 +538,7 @@ class configInLdap extends simplePlugin
static function get_themes ()
{
$themesdir = '../ihtml/themes/';
- $themes = array_keys(session::global_get(IconTheme::$session_var));
+ $themes = array_keys(session::get(IconTheme::$session_var));
if ($dir = opendir("$themesdir")) {
while (($file = readdir($dir)) !== FALSE) {
if (is_dir("$themesdir/$file") && !preg_match("/^\./", $file)) {
diff --git a/plugins/config/class_hooksConfig.inc b/plugins/config/class_hooksConfig.inc
index d62c1c1fa..f26934968 100644
--- a/plugins/config/class_hooksConfig.inc
+++ b/plugins/config/class_hooksConfig.inc
@@ -39,7 +39,7 @@ class hooksConfig extends simplePlugin
$plugins = [];
if (session::is_set('plist')) {
- $plugins = array_keys(session::global_get('plist')->info);
+ $plugins = array_keys(session::get('plist')->info);
}
sort($plugins);
--
GitLab