diff --git a/contrib/smarty/plugins/function.filePath.php b/contrib/smarty/plugins/function.filePath.php
index 3d979e0a9b65f290c2430ad1096885e608ef829c..8aa87e513d88b3e47cf16b02c44abda1739d5e40 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)
{
- $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 92aa68d4bb5844651e600ae716d141ac67401081..c929e4f56d98bf73b3fdafd8df757e3f2133db20 100644
--- a/contrib/smarty/plugins/function.iconPath.php
+++ b/contrib/smarty/plugins/function.iconPath.php
@@ -19,7 +19,7 @@
*/
function smarty_function_iconPath($params, &$smarty)
{
- $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 f686a2ce8e3c8bc0d0316d13ad1edaff34c9a06d..c8f5437b2153aaae6a46ff4594787c19ca3b3430 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');
foreach ($config->department_info as $dn => $info) {
if (!isset($pathMapping[$dn])) {
continue;
@@ -71,8 +71,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')) {
@@ -80,5 +80,3 @@ if (isset($_GET['type']) && $_GET['type'] == "base") {
$filter->processAutocomplete();
}
}
-
-?>
diff --git a/html/class_passwordRecovery.inc b/html/class_passwordRecovery.inc
index 2f2c5d01ffe5c10f27dd7cd14fc8c2427413dce6..1b8c818d6975615428fe22976bea6de2734d095e 100644
--- a/html/class_passwordRecovery.inc
+++ b/html/class_passwordRecovery.inc
@@ -351,7 +351,7 @@ class passwordRecovery extends standAlonePage {
$smarty->assign('usePrototype', 'FALSE');
$smarty->append('js_files', 'include/pwdStrength.js');
$smarty->append('css_files', get_template_path('login.css'));
- $lang = session::global_get('lang');
+ $lang = session::get('lang');
$smarty->assign('lang', preg_replace('/_.*$/', '', $lang));
$smarty->assign('rtl', Language::isRTL($lang));
$smarty->assign('title', _('Password recovery'));
diff --git a/html/geticon.php b/html/geticon.php
index 7d41faf7c6b84a02d22d47e1ae6fc05a9768afaa..2e338e2882b88f3f7ee8d186f37fef53e190b9ac 100644
--- a/html/geticon.php
+++ b/html/geticon.php
@@ -29,7 +29,7 @@ session::set('errorsAlreadyPosted', array());
$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 1439c8dd8694b5f6b1076681f194c6a16ec20d20..16d9fdeb410d547ba2f2b9093cfb13ed82c151d8 100644
--- a/html/index.php
+++ b/html/index.php
@@ -35,7 +35,7 @@ header('X-Frame-Options: deny');
function displayLogin()
{
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);
/* Fill template with required values */
@@ -115,7 +115,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 655f3f7c27fb1e8a5e942fd894d712ac96b0b973..00a1e31005542560e65aef8bf28836f61d70fb7f 100644
--- a/html/main.php
+++ b/html/main.php
@@ -58,8 +58,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 != '')) {
@@ -70,13 +70,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
@@ -121,7 +121,7 @@ if (isset($global_check) && $config->get_cfg_value("forceglobals") == "TRUE") {
/* Check Plugin variable */
if (session::is_set('plugin_dir')) {
- $old_plugin_dir = session::global_get('plugin_dir');
+ $old_plugin_dir = session::get('plugin_dir');
} else {
$old_plugin_dir = "";
}
@@ -235,7 +235,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));
$smarty->assign ('must', '<span class="must">*</span>');
@@ -261,17 +261,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 31b31f9c91a3fc5f7459a6823500e8c77fb3c9e3..48f981613e1296014e84f7ee31b67ddeb86bdea5 100644
--- a/html/setup.php
+++ b/html/setup.php
@@ -76,7 +76,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)) {
@@ -96,7 +96,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 fake_userinfo();
@@ -109,7 +109,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 28c9191e21ba60a92f8d72c8b5cd82b712c8636f..69c8e7155ca1b253a5907cef432efd1ec09e8d33 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 9f086c3ad92b63edcc0d949b5b5fcbe0ca461d29..921532a76236518557b4a329411ed9ce8e2ef562 100644
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -97,7 +97,7 @@ class config
if we have installed or removed plugins. */
$tmp = stat(CACHE_DIR.'/'.CLASS_CACHE);
if (session::is_set('class_location.inc:timestamp')) {
- if ($tmp['mtime'] != session::global_get('class_location.inc:timestamp')) {
+ if ($tmp['mtime'] != session::get('class_location.inc:timestamp')) {
session::global_un_set('plist');
}
}
@@ -273,7 +273,7 @@ class config
if (!session::is_set('HTTP_FDKEY_CACHE')) {
session::set('HTTP_FDKEY_CACHE', array());
}
- $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 de5e00ab23176cc1d3e1ccc3fb9c959e2de1b364..0b18f481d05aace59007011e3adac3f758d8eb8c 100644
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -1221,7 +1221,7 @@ class LDAP
/* Return the cached results. */
if (class_available('session') && session::is_set('LDAP_CACHE::get_objectclasses') && !$force_reload) {
- $objectclasses = session::global_get('LDAP_CACHE::get_objectclasses');
+ $objectclasses = session::get('LDAP_CACHE::get_objectclasses');
return $objectclasses;
}
@@ -1329,7 +1329,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_listing.inc b/include/class_listing.inc
index 28c6c6b094504a221882281691428bfece630e09..2bd3d517869344d9cc2334c4c171acc4c4bb5226 100644
--- a/include/class_listing.inc
+++ b/include/class_listing.inc
@@ -87,7 +87,7 @@ class listing
// Set base for filter
if ($this->baseMode) {
- $this->base = session::global_get("CurrentMainBase");
+ $this->base = session::get("CurrentMainBase");
if ($this->base == NULL) {
$this->base = $config->current['BASE'];
}
diff --git a/include/class_pluglist.inc b/include/class_pluglist.inc
index 281ee55da02ca806905aa1b0026991f082835104..efadea48006ac2401de8ebf7ffd3504f7e8b2f42 100644
--- a/include/class_pluglist.inc
+++ b/include/class_pluglist.inc
@@ -494,7 +494,7 @@ class pluglist {
static function pluginInfos($cname)
{
- $plist = session::global_get('plist');
+ $plist = session::get('plist');
if ($plist) {
return $plist->info[$cname];
} else {
@@ -502,4 +502,3 @@ class pluglist {
}
}
}
-?>
diff --git a/include/class_session.inc b/include/class_session.inc
index 2e3f6623865e8c9d52afe6a3e5e8f299a6a3c4b8..ca01b13e297780bf9ba071bfde2aee548ce64d28 100644
--- a/include/class_session.inc
+++ b/include/class_session.inc
@@ -71,7 +71,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/functions.inc b/include/functions.inc
index 9bbaa0f0811ae767c39b531839cf869497612f9c..063bbb4dc00e208932079d9b282107c0575216aa 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -172,7 +172,7 @@ function load_plist ($ldap_available = TRUE)
$config->make_idepartments();
}
}
- return session::global_get('plist');
+ return session::get('plist');
}
/*!
@@ -203,7 +203,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;"/>'.
@@ -269,7 +269,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/simpleplugin/attributes/class_BaseSelectorAttribute.inc b/include/simpleplugin/attributes/class_BaseSelectorAttribute.inc
index 805ddeca402bc453f83da76cb1e4ad7d1469ef03..668edb68c8f55774e38e2212325b33de9c351cc3 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::is_set("CurrentMainBase") ? "cn=dummy,".session::global_get("CurrentMainBase") : $ui->dn));
+ $this->setValue(dn2base(session::is_set("CurrentMainBase") ? "cn=dummy,".session::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 6f85383473cc70e1e16bd6f2e245295d2342186f..9ef5549d543c71815e6eba206c17fef4c81f8933 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/include/simpleplugin/class_simpleTabs.inc b/include/simpleplugin/class_simpleTabs.inc
index 2b3367e8b1ae0175c6dbe0330b863ef2bc20c071..edc6049a3583d039cf5d1c0651661c4d998250c7 100644
--- a/include/simpleplugin/class_simpleTabs.inc
+++ b/include/simpleplugin/class_simpleTabs.inc
@@ -164,7 +164,7 @@ class simpleTabs
if (isset($baseobject->base)) {
@DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $baseobject->base, 'Fixing base');
if (session::is_set('CurrentMainBase')) {
- $baseobject->base = dn2base('cn=dummy,'.session::global_get('CurrentMainBase'));
+ $baseobject->base = dn2base('cn=dummy,'.session::get('CurrentMainBase'));
} else {
$baseobject->base = dn2base(get_userinfo()->dn);
}
diff --git a/plugins/admin/aclrole/class_aclEditionDialog.inc b/plugins/admin/aclrole/class_aclEditionDialog.inc
index 56ae1bcba569aaf8608503bf9114c5ee5b525e52..9f7801390d6a6a4809236834ec78e7f5dcabae07 100644
--- a/plugins/admin/aclrole/class_aclEditionDialog.inc
+++ b/plugins/admin/aclrole/class_aclEditionDialog.inc
@@ -271,7 +271,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 9b8f3ad7654ea109f6c041f24434970f485bb66c..c8e19353719f40add818effb02692929997d8179 100644
--- a/plugins/config/class_configInLdap.inc
+++ b/plugins/config/class_configInLdap.inc
@@ -80,7 +80,7 @@ class configInLdap extends simplePlugin
global $config;
$plugins = array();
if (session::is_set('plist')) {
- $plugins = array_keys(session::global_get('plist')->info);
+ $plugins = array_keys(session::get('plist')->info);
}
sort($plugins);
return array(
@@ -486,7 +486,7 @@ class configInLdap extends simplePlugin
array_values($groupsAndRoles)
);
$menuPlugins = array();
- $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'])) {
@@ -589,7 +589,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)) {