some session changes again

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8209 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc
index 87fba5ce27c5f4686de6c02a0b01e17640867879..a93ad5f3e439694709eda299f0ef9e83fc18a338 100644 (file)
--- 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 8cb002d9e1a42462dcc7841e463d8e0437c4ebc9..ea33f2c39705b1f509607bd12a75cb17c925c097 100644 (file)
--- 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 0ed9f25200afa28bed8467350f5112db5b31f1e5..fb7dc54588ad07c904bbf141e148490ed846beba 100644 (file)
--- 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 022d2fe6281b41c2c3bdc8ca9575eb192fa16bf5..66db8d0019d3012038a4e42ee27f409dee8b78f0 100644 (file)
--- 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 89a704bb4f54df4cd8084de64225991b32cedeea..3e52c1f68718b3e8be990a513cde1de95d2ac269 100644 (file)
--- 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 b33e609e29fa9432d76d589c2661ca09ed6c9f7f..15c44975d6581257d48ea8953aa5c2949dbed299 100644 (file)
--- 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 1fe5d5f06b40c41dd235582617a843b064fa9945..4871a710dc9c96111d7a014aa41b1ba73b6be622 100644 (file)
--- a/gosa-core/include/class_pluglist.inc
+++ b/gosa-core/include/class_pluglist.inc
@@ -187,7 +187,7 @@ class pluglist {
                                                $current.= '</td></tr></table>';
                                                $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 50ea8b169a3d524816c8340bacaa73f4a4784541..de0d89715c2a9209eef6a6e2d74a08abee6f88a6 100644 (file)
--- 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 1b90b74878b16d9c177a629149a73fb3858df299..c1f429937b914d39243b1e65aeed646d3f5cb3e7 100644 (file)
--- 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 e4e7314ff440b78b0bb53dc696112c57144c6ba8..ee72dd9ca0bd3f4473ae22e97d3059554349616f 100644 (file)
--- 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 ce7a7f45b485edf093939e5a2d4687ac4665b8f0..b363e305e3c75d680422d306d4b0fefd3e736b2c 100644 (file)
--- 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.= "<br>
               ".sprintf(_("%s results for your search with the keyword %s"), 
                             "<b>".count($topten)."</b>", 
-                            "<b>".$_SESSION['parsed_search_keyword']."</b>");
+                            "<b>".session::get('parsed_search_keyword')."</b>");
   $ret.="<br>
         <br>";
   return($ret);

diff --git a/gosa-core/plugins/addons/godfs/class_dfsManagment.inc b/gosa-core/plugins/addons/godfs/class_dfsManagment.inc
index cb8db375fca49e28f17ab75acdb8f4df2e151943..28c6e924a23ae277f1ad019d298e96520dbe81be 100644 (file)
--- 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 0c974af859e04690c87f3493547d6e8e9139ab8b..87dc4299bfe3e8f84775c62294912fc42fca1f0d 100644 (file)
--- 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"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@LDAP::fix($_SESSION['objectinfo']));
+               $display= print_header(get_template_path('images/acl.png'), _("ACL management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@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 3972b12693078d674e6675cf83f4407609ba3a15..b5152b89c6d9084ad4d647d0e48efb6d11d94538 100644 (file)
--- 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"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@LDAP::fix($_SESSION['objectinfo']));
+               $display= print_header(get_template_path('images/application.png'), _("Application management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@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 66f23d30eb25e28f83ffd302869019cafd100acf..6f94c64f73bc9150deae8630036b7c1e4e999a17 100644 (file)
--- 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"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@LDAP::fix($_SESSION['objectinfo']));
+               $display= print_header(get_template_path('images/department.png'), _("Department management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@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 7b0087844f0c9cf01b30068c9cdfe606cb8b7b23..115971c008110795a9ff48e148f458f548d51b02 100755 (executable)
--- 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"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@LDAP::fix($_SESSION['objectinfo']));
+                               $display= print_header(get_template_path('images/devices.png'), _("Device management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@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 5906069da84edd9140496a0600d51810e6fb5e27..fb54bdfcdd6e38433c99f9a8c2b82952870a8b96 100644 (file)
--- 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"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@LDAP::fix($_SESSION['objectinfo']));
+               $display= print_header(get_template_path('images/fai.png'), _("Fully Automatic Installation"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@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 7ff67d26a29291468213e0d1c5a0693a453b2744..7802c8559701ef0a2a2b38259934904df1383773 100644 (file)
--- 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 eb1ff800d8510edd53aee0ac04bc858493177d06..23976c113607bad8b61f5f043046d9aa716949c3 100644 (file)
--- 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"), "<img alt=\"\" align=\"middle\" src=\"".
                             get_template_path('images/closedlock.png')."\"> ".
-                            @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 2525acbd400a889ca2ee5242191bcf5ff5e971dc..5f37b1b757f88e9929200b37dbec1110845e6879 100755 (executable)
--- 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"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@LDAP::fix($_SESSION['objectinfo']));
+                               $display= print_header(get_template_path('images/mimetypes.png'), _("Mimetype management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@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 cc95ba34a1953a7f7754e40e955f9d1fbe4b1a50..4172b4165a8c67ed07ebc891d550fe64f2784bfb 100644 (file)
--- 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"),
                           "<img alt=\"\" align=\"middle\" src=\"".
                           get_template_path('images/closedlock.png').
-                          "\"> ".@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 51c98ce5dbb0a1fbb6c18a3facc3e8b486e992f0..e2b0f6f230676fb1c8918e2878454dc8e4464185 100644 (file)
--- 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"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@LDAP::fix($_SESSION['objectinfo']));
+               $display= print_header(get_template_path('images/system.png'), _("System management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@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 a0c96ec9b462dbcc2141d5a5711ef86b0de6ebb3..a6f2146e20ac4758be0cc6414ee7081aa9cb6d93 100644 (file)
--- 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"),
                            "<img alt=\"\" class=\"center\" src=\"".
                            get_template_path('images/closedlock.png').
-                           "\"> ".@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 7dfbd6badbaf27162626c9efcffa7cf041452244..71e362cdbf8a7665b8e32aee8ca8fd9140365f8b 100644 (file)
--- 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"), "<img alt=\"\"align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@LDAP::fix($_SESSION['objectinfo']));
+               $display= print_header(get_template_path('images/blocklists.png'), _("Blocklist management"), "<img alt=\"\"align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@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 611f27773d3f4a397a9015de410455c4be994c23..7eb54057ccaf1da11c57bd9bd868db4e3a7c7a26 100644 (file)
--- 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"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@LDAP::fix($_SESSION['objectinfo']));
+               $display= print_header(get_template_path('images/conference.png'), _("Conference management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@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 691fd41a465e9dff94902017119427d536c53714..a508abd9b5f5e0bd58edea9af19c8a40acd3c468 100755 (executable)
--- 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"), 
                             "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> 
-                            ".@LDAP::fix($_SESSION['objectinfo']));
+                            ".@LDAP::fix(session::get('objectinfo')));
   } else {
     $display= print_header(get_template_path('images/macros.png'), _("Phone macro management"));
   }