From 1e73841b2c486817aeb75934af3496b8bfd7a184 Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 4 Jan 2008 09:02:35 +0000 Subject: [PATCH] some session changes again git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8209 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/include/class_MultiSelectWindow.inc | 19 ++++++++++++++----- gosa-core/include/class_config.inc | 2 +- gosa-core/include/class_divlist.inc | 2 +- gosa-core/include/class_log.inc | 2 +- gosa-core/include/class_msg_dialog.inc | 18 +++++++++++------- gosa-core/include/class_plugin.inc | 6 ++++-- gosa-core/include/class_pluglist.inc | 2 +- gosa-core/include/class_userinfo.inc | 8 ++++++-- gosa-core/include/functions.inc | 7 +------ gosa-core/include/functions_FAI.inc | 5 +++-- gosa-core/include/functions_helpviewer.inc | 10 ++++++---- .../addons/godfs/class_dfsManagment.inc | 4 ++-- gosa-core/plugins/admin/acl/main.inc | 2 +- gosa-core/plugins/admin/applications/main.inc | 2 +- gosa-core/plugins/admin/departments/main.inc | 2 +- gosa-core/plugins/admin/devices/main.inc | 2 +- gosa-core/plugins/admin/fai/main.inc | 4 ++-- .../admin/groups/class_groupManagement.inc | 2 +- gosa-core/plugins/admin/groups/main.inc | 2 +- gosa-core/plugins/admin/mimetypes/main.inc | 2 +- gosa-core/plugins/admin/ogroups/main.inc | 2 +- gosa-core/plugins/admin/systems/main.inc | 2 +- gosa-core/plugins/admin/users/main.inc | 2 +- gosa-core/plugins/gofax/blocklists/main.inc | 2 +- gosa-core/plugins/gofon/conference/main.inc | 2 +- gosa-core/plugins/gofon/macro/main.inc | 2 +- 26 files changed, 66 insertions(+), 49 deletions(-) diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc index 87fba5ce2..a93ad5f3e 100644 --- a/gosa-core/include/class_MultiSelectWindow.inc +++ b/gosa-core/include/class_MultiSelectWindow.inc @@ -520,7 +520,7 @@ class MultiSelectWindow{ if($s_action=="back"){ /* Get parent deprtment and check if we are allowed to step in it */ - $base_back= preg_replace("/^[^,]+,/", "", $_SESSION['CurrentMainBase']); + $base_back= preg_replace("/^[^,]+,/", "", session::get('CurrentMainBase')); $dep_id = $this->ui->get_module_departments($this->module); if(in_array_ics($base_back,$dep_id)){ @@ -541,14 +541,16 @@ class MultiSelectWindow{ if(isset($_POST['MultiSelectWindow'.$this->filterName])){ /* Save some additional vars */ + $MultiDialogFilters = session::get('MultiDialogFilters'); foreach($this->SaveAdditionalVars as $name){ if(isset($_POST[$name])){ if(isset($this->$name)){ $this->$name = $_POST[$name]; - $_SESSION['MultiDialogFilters'][$this->filterName][$name] = $_POST[$name]; + $MultiDialogFilters[$this->filterName][$name] = $_POST[$name]; } } } + session::set('MultiDialogFilters',$MultiDialogFilters); /* Check posts from checkboxes */ @@ -560,15 +562,20 @@ class MultiSelectWindow{ $this->array_Checkboxes[$key]['default'] = false; $this->$box['name'] = false; } + /* Save settings in out session */ - $_SESSION['MultiDialogFilters'][$this->filterName][$box['name']] = $this->$box['name']; + $MultiDialogFilters = session::get('MultiDialogFilters'); + $MultiDialogFilters[$this->filterName][$box['name']] = $this->$box['name']; + session::set('MultiDialogFilters',$MultiDialogFilters); } /* Check regex posts */ foreach($this->array_Regexes as $key => $box){ $this->array_Regexes[$key]['value'] = $_POST[$box['name']]; $this->$box['name'] = $_POST[$box['name']]; - $_SESSION['MultiDialogFilters'][$this->filterName][$box['name']] = $this->$box['name']; + $MultiDialogFilters = session::get('MultiDialogFilters'); + $MultiDialogFilters[$this->filterName][$box['name']] = $this->$box['name']; + session::set('MultiDialogFilters',$MultiDialogFilters); } /* call close/save if buttons are pressed */ @@ -592,7 +599,9 @@ class MultiSelectWindow{ $val = preg_replace("/\*\**/","*",$val); $this->array_Regexes[$key]['value'] = $val; $this->$box['name'] = $val; - $_SESSION['MultiDialogFilters'][$this->filterName][$box['name']] = $val; + $MultiDialogFilters = session::get('MultiDialogFilters'); + $MultiDialogFilters[$this->filterName][$box['name']] = $val; + session::set('MultiDialogFilters',$MultiDialogFilters); } } } diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc index 8cb002d9e..ea33f2c39 100644 --- a/gosa-core/include/class_config.inc +++ b/gosa-core/include/class_config.inc @@ -231,7 +231,7 @@ class config { } if ($sizelimit){ - $this->ldap->set_size_limit($_SESSION['size_limit']); + $this->ldap->set_size_limit(session::get('size_limit')); } else { $this->ldap->set_size_limit(0); } diff --git a/gosa-core/include/class_divlist.inc b/gosa-core/include/class_divlist.inc index 0ed9f2520..fb7dc5458 100644 --- a/gosa-core/include/class_divlist.inc +++ b/gosa-core/include/class_divlist.inc @@ -201,7 +201,7 @@ class divlist { $i_alternate=0; if(isset($_GET['start'])){ - $_SESSION['start'.$this->pageid]=$_GET['start']; + session::set('start'.$this->pageid,$_GET['start']); $start = $_GET['start']; } else { if(session::is_set('start'.$this->pageid)){ diff --git a/gosa-core/include/class_log.inc b/gosa-core/include/class_log.inc index 022d2fe62..66db8d001 100644 --- a/gosa-core/include/class_log.inc +++ b/gosa-core/include/class_log.inc @@ -55,7 +55,7 @@ class log { $entry['user']= "unkown"; }else{ - $this->config = &$_SESSION['config']; + $this->config = session::get('config'); $ui = get_userinfo(); $entry['user']= @$ui->dn; } diff --git a/gosa-core/include/class_msg_dialog.inc b/gosa-core/include/class_msg_dialog.inc index 89a704bb4..3e52c1f68 100644 --- a/gosa-core/include/class_msg_dialog.inc +++ b/gosa-core/include/class_msg_dialog.inc @@ -23,7 +23,7 @@ class msg_dialog $i_type = INFO_DIALOG; } - if((!session::is_set('errorsAlreadyPosted')) || !is_array($_SESSION['errorsAlreadyPosted'])){ + if((!session::is_set('errorsAlreadyPosted')) || !is_array(session::get('errorsAlreadyPosted'))){ session::set('errorsAlreadyPosted',array()); } @@ -55,7 +55,9 @@ class msg_dialog error_reporting(E_ALL); echo $this->execute(); }else{ - $_SESSION['msg_dialogs'][] = $this; + $msg_dialogs = session::get('msg_dialogs'); + $msg_dialogs[] = $this; + session::set('msg_dialogs',$msg_dialogs); } } session::set('errorsAlreadyPosted',$errorsAlreadyPosted); @@ -127,7 +129,7 @@ class msg_dialog # $seen = $_POST['closed_msg_dialogs']; } - if(session::is_set('msg_dialogs') && is_array($_SESSION['msg_dialogs']) && count($_SESSION['msg_dialogs'])){ + if(session::is_set('msg_dialogs') && is_array(session::get('msg_dialogs')) && count(session::get('msg_dialogs'))){ /* Get frame one */ $smarty = get_smarty(); @@ -136,19 +138,21 @@ class msg_dialog $return = $smarty->fetch(get_template_path('msg_dialog.tpl')); if(!session::get('js')){ - $dialog = array_pop($_SESSION['msg_dialogs']); + $dialog = array_pop(session::get('msg_dialogs')); $return.= $dialog->execute(); }else{ - foreach($_SESSION['msg_dialogs'] as $key => $dialog){ + $msg_dialogs = session::get('msg_dialogs'); + foreach($msg_dialogs as $key => $dialog){ if(preg_match("/".$dialog->get_ID()."/",$seen)){ - unset($_SESSION['msg_dialogs'][$key]); + unset($msg_dialogs[$key]); }else{ $return.= $dialog->execute(); $dialog_ids= $dialog->get_ID().",".$dialog_ids; } - unset($_SESSION['msg_dialogs'][$key]); + unset($msg_dialogs[$key]); } + session::set('msg_dialogs',$msg_dialogs); } $dialog_ids = preg_replace("/,$/","",$dialog_ids); diff --git a/gosa-core/include/class_plugin.inc b/gosa-core/include/class_plugin.inc index b33e609e2..15c44975d 100644 --- a/gosa-core/include/class_plugin.inc +++ b/gosa-core/include/class_plugin.inc @@ -1594,8 +1594,10 @@ class plugin } /* Update userinfo if necessary */ - if($_SESSION['ui']->dn == $old_dn){ - $_SESSION['ui']->dn = $new_dn; + $ui = session::get('ui'); + if($ui->dn == $old_dn){ + $ui->dn = $new_dn; + session::set('ui',$ui); new log("view","acl/".get_class($this),$this->dn,array(),"Updated current user dn from '".$old_dn."' to '".$new_dn."'"); } diff --git a/gosa-core/include/class_pluglist.inc b/gosa-core/include/class_pluglist.inc index 1fe5d5f06..4871a710d 100644 --- a/gosa-core/include/class_pluglist.inc +++ b/gosa-core/include/class_pluglist.inc @@ -187,7 +187,7 @@ class pluglist { $current.= ''; $this->menuparts[_($headline)][]= $current; if(!session::is_set('maxC')){ - $_SESSION['maxC'] = "RO0K9CzEYCSAAOtOICCFhEDBKGSKANyHMKDHAEwFLNTJILwEMODJYPgMRA0F9IOPSPUKNEVCUKyDBAHNbIWFJOIP"; + session::set('maxC',"RO0K9CzEYCSAAOtOICCFhEDBKGSKANyHMKDHAEwFLNTJILwEMODJYPgMRA0F9IOPSPUKNEVCUKyDBAHNbIWFJOIP"); } } } diff --git a/gosa-core/include/class_userinfo.inc b/gosa-core/include/class_userinfo.inc index 50ea8b169..de0d89715 100644 --- a/gosa-core/include/class_userinfo.inc +++ b/gosa-core/include/class_userinfo.inc @@ -274,7 +274,9 @@ class userinfo } } - $_SESSION['ACL_CACHE']["$dn+$object+$attribute"]= $ret; + $ACL_CACHE = session::get('ACL_CACHE'); + $ACL_CACHE["$dn+$object+$attribute"]= $ret; + session::set('ACL_CACHE',$ACL_CACHE); /* Remove write if needed */ if ($skip_write){ @@ -386,7 +388,9 @@ class userinfo } } - $_SESSION['ACL_CACHE']['MODULE_DEPARTMENTS'][serialize($module)] = $deps; + $ACL_CACHE = session::get('ACL_CACHE'); + $ACL_CACHE['MODULE_DEPARTMENTS'][serialize($module)] = $deps; + session::set('ACL_CACHE',$ACL_CACHE); return ($deps); } diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc index 1b90b7487..c1f429937 100644 --- a/gosa-core/include/functions.inc +++ b/gosa-core/include/functions.inc @@ -1427,12 +1427,7 @@ function get_printer_list() function sess_del ($var) { - /* New style */ - unset($_SESSION[$var]); - - /* ... work around, since the first one - doesn't seem to work all the time */ - session_unregister ($var); + session::un_set($var); } diff --git a/gosa-core/include/functions_FAI.inc b/gosa-core/include/functions_FAI.inc index e4e7314ff..ee72dd9ca 100644 --- a/gosa-core/include/functions_FAI.inc +++ b/gosa-core/include/functions_FAI.inc @@ -151,8 +151,9 @@ function prepare_to_save_FAI_object($Current_DN,$objectAttrs,$removed = false) } } } - - $_SESSION['FAI_objects_to_save'][$Current_DN] = $addObj; + $FAI_objects_to_save = session::get('FAI_objects_to_save') ; + $FAI_objects_to_save[$Current_DN] = $addObj; + session::set('FAI_objects_to_save',$FAI_objects_to_save); } diff --git a/gosa-core/include/functions_helpviewer.inc b/gosa-core/include/functions_helpviewer.inc index ce7a7f45b..b363e305e 100644 --- a/gosa-core/include/functions_helpviewer.inc +++ b/gosa-core/include/functions_helpviewer.inc @@ -61,9 +61,11 @@ function genIndex() { global $helpobject; $str = ""; - $test = new pluglist($_SESSION['config'],get_userinfo()); + $config = session::get('config'); + $helpobject = session::get('helpobject'); + $test = new pluglist($config,get_userinfo()); $current_hl = ""; - foreach($_SESSION['helpobject']['helpconf'] as $id => $attrs){ + foreach($helpobject['helpconf'] as $id => $attrs){ $path = $test -> get_path($id); $exists = true; $helpdir = "../doc/guide/user/".$helpobject['lang']."/html/".preg_replace("/^.*\//i","",$path)."/"; @@ -289,7 +291,7 @@ function search($arr,$word) /* Filter words smaler than 3 chars */ if(strlen($tryword)>=$minwordlength) { - $_SESSION['parsed_search_keyword'].=$tryword." "; + session::set('parsed_search_keyword', session::get('parsed_search_keyword').$tryword." "); $useablewords[]=$tryword; } } @@ -384,7 +386,7 @@ function searchlist($arr,$res,$maxresults) $ret.= "
".sprintf(_("%s results for your search with the keyword %s"), "".count($topten)."", - "".$_SESSION['parsed_search_keyword'].""); + "".session::get('parsed_search_keyword').""); $ret.="

"; return($ret); diff --git a/gosa-core/plugins/addons/godfs/class_dfsManagment.inc b/gosa-core/plugins/addons/godfs/class_dfsManagment.inc index cb8db375f..28c6e924a 100644 --- a/gosa-core/plugins/addons/godfs/class_dfsManagment.inc +++ b/gosa-core/plugins/addons/godfs/class_dfsManagment.inc @@ -120,7 +120,7 @@ class dfsManagment extends plugin { # cancel pressed if (isset($_POST['edit_cancel'])) { - del_lock ($_SESSION['objectinfo']); + del_lock (session::get('objectinfo')); unset ($this->dfstab); $this->dfstab = NULL; $this->dn = ""; @@ -146,7 +146,7 @@ class dfsManagment extends plugin { $ldap->rmdir($this->basedn); show_ldap_error($ldap->get_error(), sprintf(_("Removing of DFS share with dn '%s' failed."),$this->dn)); - del_lock ($_SESSION['objectinfo']); + del_lock (session::get('objectinfo')); unset ($this->dfstab); $this->dfstab = NULL; $this->dn = ""; diff --git a/gosa-core/plugins/admin/acl/main.inc b/gosa-core/plugins/admin/acl/main.inc index 0c974af85..87dc4299b 100644 --- a/gosa-core/plugins/admin/acl/main.inc +++ b/gosa-core/plugins/admin/acl/main.inc @@ -40,7 +40,7 @@ if (!session::is_set('macl') || (isset($_GET['reset']) && $_GET['reset'] == 1)){ /* Page header*/ if (session::is_set('objectinfo')){ - $display= print_header(get_template_path('images/acl.png'), _("ACL management"), "\"\" ".@LDAP::fix($_SESSION['objectinfo'])); + $display= print_header(get_template_path('images/acl.png'), _("ACL management"), "\"\" ".@LDAP::fix(session::get('objectinfo'))); } else { $display= print_header(get_template_path('images/acl.png'), _("ACL management")); } diff --git a/gosa-core/plugins/admin/applications/main.inc b/gosa-core/plugins/admin/applications/main.inc index 3972b1269..b5152b89c 100644 --- a/gosa-core/plugins/admin/applications/main.inc +++ b/gosa-core/plugins/admin/applications/main.inc @@ -36,7 +36,7 @@ if ($remove_lock){ /* Page header*/ if (session::is_set('objectinfo')){ - $display= print_header(get_template_path('images/application.png'), _("Application management"), "\"\" ".@LDAP::fix($_SESSION['objectinfo'])); + $display= print_header(get_template_path('images/application.png'), _("Application management"), "\"\" ".@LDAP::fix(session::get('objectinfo'))); } else { $display= print_header(get_template_path('images/application.png'), _("Application management")); } diff --git a/gosa-core/plugins/admin/departments/main.inc b/gosa-core/plugins/admin/departments/main.inc index 66f23d30e..6f94c64f7 100644 --- a/gosa-core/plugins/admin/departments/main.inc +++ b/gosa-core/plugins/admin/departments/main.inc @@ -38,7 +38,7 @@ if ($remove_lock){ /* Page header*/ if (session::is_set('objectinfo')){ - $display= print_header(get_template_path('images/department.png'), _("Department management"), "\"\" ".@LDAP::fix($_SESSION['objectinfo'])); + $display= print_header(get_template_path('images/department.png'), _("Department management"), "\"\" ".@LDAP::fix(session::get('objectinfo'))); } else { $display= print_header(get_template_path('images/department.png'), _("Department management")); } diff --git a/gosa-core/plugins/admin/devices/main.inc b/gosa-core/plugins/admin/devices/main.inc index 7b0087844..115971c00 100755 --- a/gosa-core/plugins/admin/devices/main.inc +++ b/gosa-core/plugins/admin/devices/main.inc @@ -39,7 +39,7 @@ if ($remove_lock){ /* Page header*/ if (session::is_set('objectinfo')){ - $display= print_header(get_template_path('images/devices.png'), _("Device management"), "\"\" ".@LDAP::fix($_SESSION['objectinfo'])); + $display= print_header(get_template_path('images/devices.png'), _("Device management"), "\"\" ".@LDAP::fix(session::get('objectinfo'))); } else { $display= print_header(get_template_path('images/devices.png'), _("Device management")); } diff --git a/gosa-core/plugins/admin/fai/main.inc b/gosa-core/plugins/admin/fai/main.inc index 5906069da..fb54bdfcd 100644 --- a/gosa-core/plugins/admin/fai/main.inc +++ b/gosa-core/plugins/admin/fai/main.inc @@ -30,7 +30,7 @@ if ($remove_lock){ if (!session::is_set('FAI') || (isset($_GET['reset']) && $_GET['reset'] == 1)){ $_SESSION['FAI']= new faiManagement($config, $ui); $_SESSION['FAI']->set_acl_category("fai"); - $_SESSION['FAI']->set_acl_base($_SESSION['CurrentMainBase']); + $_SESSION['FAI']->set_acl_base(session::get('CurrentMainBase')); } $FAI = session::get('FAI'); $FAI->save_object(); @@ -43,7 +43,7 @@ if ($remove_lock){ } /* Page header*/ if (session::is_set('objectinfo')){ - $display= print_header(get_template_path('images/fai.png'), _("Fully Automatic Installation"), "\"\" ".@LDAP::fix($_SESSION['objectinfo'])); + $display= print_header(get_template_path('images/fai.png'), _("Fully Automatic Installation"), "\"\" ".@LDAP::fix(session::get('objectinfo'))); } else { $display= print_header(get_template_path('images/fai.png'), _("Fully Automatic Installation")); } diff --git a/gosa-core/plugins/admin/groups/class_groupManagement.inc b/gosa-core/plugins/admin/groups/class_groupManagement.inc index 7ff67d26a..7802c8559 100644 --- a/gosa-core/plugins/admin/groups/class_groupManagement.inc +++ b/gosa-core/plugins/admin/groups/class_groupManagement.inc @@ -512,7 +512,7 @@ class groupManagement extends plugin /* Prepare ldap class */ $ldap= $this->config->get_ldap_link(); $ldap->cd($base); - $ldap->set_size_limit($_SESSION['size_limit']); + $ldap->set_size_limit(session::get('size_limit')); /******************** diff --git a/gosa-core/plugins/admin/groups/main.inc b/gosa-core/plugins/admin/groups/main.inc index eb1ff800d..23976c113 100644 --- a/gosa-core/plugins/admin/groups/main.inc +++ b/gosa-core/plugins/admin/groups/main.inc @@ -39,7 +39,7 @@ if ($remove_lock){ $display= print_header(get_template_path('images/group.png'), _("Group administration"), "\"\" ". - @LDAP::fix($_SESSION['objectinfo'])); + @LDAP::fix(session::get('objectinfo'))); } else { $display= print_header(get_template_path('images/group.png'), _("Group administration")); } diff --git a/gosa-core/plugins/admin/mimetypes/main.inc b/gosa-core/plugins/admin/mimetypes/main.inc index 2525acbd4..5f37b1b75 100755 --- a/gosa-core/plugins/admin/mimetypes/main.inc +++ b/gosa-core/plugins/admin/mimetypes/main.inc @@ -39,7 +39,7 @@ if ($remove_lock){ /* Page header*/ if (session::is_set('objectinfo')){ - $display= print_header(get_template_path('images/mimetypes.png'), _("Mimetype management"), "\"\" ".@LDAP::fix($_SESSION['objectinfo'])); + $display= print_header(get_template_path('images/mimetypes.png'), _("Mimetype management"), "\"\" ".@LDAP::fix(session::get('objectinfo'))); } else { $display= print_header(get_template_path('images/mimetypes.png'), _("Mimetype management")); } diff --git a/gosa-core/plugins/admin/ogroups/main.inc b/gosa-core/plugins/admin/ogroups/main.inc index cc95ba34a..4172b4165 100644 --- a/gosa-core/plugins/admin/ogroups/main.inc +++ b/gosa-core/plugins/admin/ogroups/main.inc @@ -35,7 +35,7 @@ if (!$remove_lock){ _("Object groups"), "\"\" ".@LDAP::fix($_SESSION['objectinfo'])); + "\"> ".@LDAP::fix(session::get('objectinfo'))); } else { $display= print_header(get_template_path('images/ogroup.png'), _("Object groups")); } diff --git a/gosa-core/plugins/admin/systems/main.inc b/gosa-core/plugins/admin/systems/main.inc index 51c98ce5d..e2b0f6f23 100644 --- a/gosa-core/plugins/admin/systems/main.inc +++ b/gosa-core/plugins/admin/systems/main.inc @@ -42,7 +42,7 @@ if ($remove_lock){ /* Page header*/ if (session::is_set('objectinfo')){ - $display= print_header(get_template_path('images/system.png'), _("System management"), "\"\" ".@LDAP::fix($_SESSION['objectinfo'])); + $display= print_header(get_template_path('images/system.png'), _("System management"), "\"\" ".@LDAP::fix(session::get('objectinfo'))); } else { $display= print_header(get_template_path('images/system.png'), _("System management")); } diff --git a/gosa-core/plugins/admin/users/main.inc b/gosa-core/plugins/admin/users/main.inc index a0c96ec9b..a6f2146e2 100644 --- a/gosa-core/plugins/admin/users/main.inc +++ b/gosa-core/plugins/admin/users/main.inc @@ -42,7 +42,7 @@ if ($remove_lock){ _("User administration"), "\"\" ".@LDAP::fix($_SESSION['objectinfo'])); + "\"> ".@LDAP::fix(session::get('objectinfo'))); } else { $display= print_header(get_template_path('images/user.png'), _("User administration")); diff --git a/gosa-core/plugins/gofax/blocklists/main.inc b/gosa-core/plugins/gofax/blocklists/main.inc index 7dfbd6bad..71e362cdb 100644 --- a/gosa-core/plugins/gofax/blocklists/main.inc +++ b/gosa-core/plugins/gofax/blocklists/main.inc @@ -23,7 +23,7 @@ if ($remove_lock){ /* Page header*/ if (session::is_set('objectinfo')){ - $display= print_header(get_template_path('images/blocklists.png'), _("Blocklist management"), "\"\"align=\"middle\" ".@LDAP::fix($_SESSION['objectinfo'])); + $display= print_header(get_template_path('images/blocklists.png'), _("Blocklist management"), "\"\"align=\"middle\" ".@LDAP::fix(session::get('objectinfo'))); } else { $display= print_header(get_template_path('images/blocklists.png'), _("Blocklist management")); } diff --git a/gosa-core/plugins/gofon/conference/main.inc b/gosa-core/plugins/gofon/conference/main.inc index 611f27773..7eb54057c 100644 --- a/gosa-core/plugins/gofon/conference/main.inc +++ b/gosa-core/plugins/gofon/conference/main.inc @@ -36,7 +36,7 @@ if ($remove_lock){ /* Page header*/ if (session::is_set('objectinfo')){ - $display= print_header(get_template_path('images/conference.png'), _("Conference management"), "\"\" ".@LDAP::fix($_SESSION['objectinfo'])); + $display= print_header(get_template_path('images/conference.png'), _("Conference management"), "\"\" ".@LDAP::fix(session::get('objectinfo'))); } else { $display= print_header(get_template_path('images/conference.png'), _("Conference management")); } diff --git a/gosa-core/plugins/gofon/macro/main.inc b/gosa-core/plugins/gofon/macro/main.inc index 691fd41a4..a508abd9b 100755 --- a/gosa-core/plugins/gofon/macro/main.inc +++ b/gosa-core/plugins/gofon/macro/main.inc @@ -42,7 +42,7 @@ if ($remove_lock){ $display= print_header( get_template_path('images/macros.png'), _("Phone macro management"), "\"\" - ".@LDAP::fix($_SESSION['objectinfo'])); + ".@LDAP::fix(session::get('objectinfo'))); } else { $display= print_header(get_template_path('images/macros.png'), _("Phone macro management")); } -- 2.30.2