Replaced session read processes

	=$_SESSION[''];
with
	=session::get('')

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

diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc
index e32eb158cb00390dd1ff911032af806a121030cf..87fba5ce27c5f4686de6c02a0b01e17640867879 100644 (file)
--- a/gosa-core/include/class_MultiSelectWindow.inc
+++ b/gosa-core/include/class_MultiSelectWindow.inc
@@ -114,7 +114,7 @@ class MultiSelectWindow{
                $this->CloseButtonString        = _("Close");
                $this->filterName                       = $filterName;
     $this->ui = get_userinfo();
-               $this->selectedBase = $_SESSION['CurrentMainBase'];
+               $this->selectedBase  = session::get('CurrentMainBase');
 
     /* Check default values for SaveAdditionalVars */
     $MultiDialogFilters = session::get('MultiDialogFilters');
@@ -660,7 +660,7 @@ class MultiSelectWindow{
                        if(!session::is_set('CurrentMainBase')){
                                session::set('CurrentMainBase',$this->config->current['BASE']);
                        }
-                       $base = $_SESSION['CurrentMainBase'];
+                       $base  = session::get('CurrentMainBase');
                }
 
                /* Create ldap obj and switch into base*/

diff --git a/gosa-core/include/class_acl.inc b/gosa-core/include/class_acl.inc
index a9d7bc85dfd0803b1ff5012009c2a61393425faf..07b84b3d34ce9b1ba4393ad704fba2d9e4f9d7be 100644 (file)
--- a/gosa-core/include/class_acl.inc
+++ b/gosa-core/include/class_acl.inc
@@ -631,7 +631,7 @@ class acl extends plugin
       $currentAcl= $this->aclContents[$key];
 
       /* Object header */
-      if($_SESSION['js']) {
+      if(session::get('js')) {
         if(isset($_SERVER['HTTP_USER_AGENT']) && preg_match("/gecko/i",$_SERVER['HTTP_USER_AGENT'])) {
           $display.= "\n<table style='width:100%;border:1px solid #A0A0A0' cellspacing=0 cellpadding=2>".
                      "\n  <tr>".
@@ -689,7 +689,7 @@ class acl extends plugin
       $cnt= 1;
       $splist= $plist[preg_replace('%^.*/%', '', $key)]['plProvidedAcls'];
       asort($splist);
-      if($_SESSION['js']) {
+      if(session::get('js')) {
         if(isset($_SERVER['HTTP_USER_AGENT']) && preg_match("/gecko/i",$_SERVER['HTTP_USER_AGENT'])) {
           $display.= "\n  <tr id='tr_".preg_replace("/[^a-z0-9]/i","_",$name)."' style='vertical-align:top;height:0px;'>".
                      "\n    <td colspan=".$cols.">".
@@ -739,7 +739,7 @@ class acl extends plugin
        $display.= str_repeat("\n    <td style='border-top:1px solid #A0A0A0; width:".(int)(100/$cols)."%'>&nbsp;</td>", $cols-$cnt); 
       }
 
-      if($_SESSION['js']) {
+      if(session::get('js')) {
         if(isset($_SERVER['HTTP_USER_AGENT']) && (preg_match("/gecko/i",$_SERVER['HTTP_USER_AGENT'])) || (preg_match("/ie/i",$_SERVER['HTTP_USER_AGENT']))) {
           $display.= "\n        </table>".
                      "\n      </div>".

diff --git a/gosa-core/include/class_ldap.inc b/gosa-core/include/class_ldap.inc
index 11e3fc88448ef0ce0e96febafa81c01d286ed073..310aae104a2e7463a0dcce63e07d628c642bd8b8 100644 (file)
--- a/gosa-core/include/class_ldap.inc
+++ b/gosa-core/include/class_ldap.inc
@@ -1363,7 +1363,7 @@ class LDAP{
   function log($string)
   {
     if (session::is_set('config')){
-      $cfg= $_SESSION['config'];
+      $cfg = session::get('config');
       if (isset($cfg->current['LDAPSTATS']) && preg_match('/true/i', $cfg->current['LDAPSTATS'])){
         syslog (LOG_INFO, $string);
       }

diff --git a/gosa-core/include/class_msg_dialog.inc b/gosa-core/include/class_msg_dialog.inc
index 8c3851808731614a261902ac7e8cfbc7eb0c68f0..89a704bb4f54df4cd8084de64225991b32cedeea 100644 (file)
--- a/gosa-core/include/class_msg_dialog.inc
+++ b/gosa-core/include/class_msg_dialog.inc
@@ -100,7 +100,7 @@ class msg_dialog
                        $smarty->assign("s_Title",$this->s_Title);
                        $smarty->assign("i_ID",$this->i_ID);
                        $smarty->assign("frame",false);
-                       $smarty->assign("JS",$_SESSION['js']);
+                       $smarty->assign("JS",session::get('js'));
                        $smarty->assign("IE",preg_match("/MSIE/", $_SERVER['HTTP_USER_AGENT']));
                        return($smarty->fetch(get_template_path('msg_dialog.tpl')));
                }
@@ -135,7 +135,7 @@ class msg_dialog
                        $smarty->assign("IE",preg_match("/MSIE/", $_SERVER['HTTP_USER_AGENT']));
                        $return = $smarty->fetch(get_template_path('msg_dialog.tpl'));
 
-                       if(!$_SESSION['js']){
+                       if(!session::get('js')){
                                $dialog = array_pop($_SESSION['msg_dialogs']);
                                $return.= $dialog->execute();
                        }else{

diff --git a/gosa-core/include/class_pluglist.inc b/gosa-core/include/class_pluglist.inc
index 34f30c8fc3ec357c9887e4e83e664bbbbb6d3bda..1fe5d5f06b40c41dd235582617a843b064fa9945 100644 (file)
--- a/gosa-core/include/class_pluglist.inc
+++ b/gosa-core/include/class_pluglist.inc
@@ -169,7 +169,7 @@ class pluglist {
 
                                                $entries= $entries."<p class=\"menuitem\" ".
                                                        "onClick='return question(\""._("You are currently editing a database entry. Do you want to dismiss the changes?")."\", \"$href\");'>";
-                                               if($_SESSION['js']){
+                                               if(session::get('js')){
                                                        $entries.= _($plHeadline)."</p>\n";
                                                } else {
                                                        $entries.= "<a class=\"menuitem\" ".
@@ -179,7 +179,7 @@ class pluglist {
 
                                                /* Generate icon entry with description */
                                                $current= '<table summary=\"\" class="menuitem" onClick=\'location.href="'.$href.'"\'><tr><td style="background-color:#F0F0F0;"><a href="'.$href.'"><img alt=\"\" border=0 src="'.$image.'"></a></td><td style="width:100%; vertical-align:top; text-align:justify; padding-left:10px;">';
-                                               if($_SESSION['js']){
+                                               if(session::get('js')){
                                                        $current.= '<b>'._($plHeadline).'</b><br>'._($plDescription);
                                                } else {
                                                        $current.= '<a href="'.$href.'"><b>'._($plHeadline).'</b></a><br><a href="'.$href.'">'._($plDescription).'</a>';
@@ -287,7 +287,7 @@ class pluglist {
                                                }
                                                $entries= $entries."<td class=\"iconmenu\" style=\"width:20%;\" onClick='location.href=\"".$href."\"'".
                                                        ">";
-                                                       if($_SESSION['js']){
+                                                       if(session::get('js')){
                                                                $entries.= "<img $isize border=0 align=middle src=\"$image".
                                                                        "\" alt=\"*\">&nbsp;".
                                                                        _($plHeadline);

diff --git a/gosa-core/include/class_sambaMungedDial.inc b/gosa-core/include/class_sambaMungedDial.inc
index 03a5b8c30f4528e4b334c824bcde186664d7c30e..9f0c0b42de8f3962979e70ee532864e060e88fcb 100644 (file)
--- a/gosa-core/include/class_sambaMungedDial.inc
+++ b/gosa-core/include/class_sambaMungedDial.inc
@@ -302,7 +302,7 @@ class sambaMungedDial
   function getOnDemandFlags ()
   {
        $result= array();
-       if ($_SESSION["js"]){
+       if (session::get("js")){
                foreach ($this->timeParams as $value) {
                        if (!isset($this->ctx[$value]) || (isset($this->ctx[$value]) && $this->ctx[$value] == 0)) {
                                $result[$value."Mode"]= "disabled";

diff --git a/gosa-core/include/class_tabs.inc b/gosa-core/include/class_tabs.inc
index aa70a46262944de6fd532aa4bea0eec0d1a6241b..4d5c69512fb5e7abb48a9cbd389b5dcdf97d06d5 100644 (file)
--- a/gosa-core/include/class_tabs.inc
+++ b/gosa-core/include/class_tabs.inc
@@ -179,7 +179,7 @@ class tabs
         $notify= "";
       }
 
-      if ($_SESSION['js']==FALSE){     
+      if (session::get('js')==FALSE){  
         $display.= "<div ".$notify." class=\"$style[$index]\"><input type=\"submit\" name=\"$class\"".
           " class=\"$style[$index]\" value=\"$title\"";
       } else {                  

diff --git a/gosa-core/include/php_setup.inc b/gosa-core/include/php_setup.inc
index 92789b2f4f16a6ee80ba277227dc03110d461cac..f50097ec8c81ca59108e7cd5cc5f747edaf566db 100644 (file)
--- a/gosa-core/include/php_setup.inc
+++ b/gosa-core/include/php_setup.inc
@@ -79,7 +79,7 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
                                 "*** PHP error information ***\n\n");
       }
     
-    if (session::is_set('js') && $_SESSION['js']==FALSE){
+    if (session::is_set('js') && session::get('js')==FALSE){
       $error_collector= "<div>";
     } else {
       $error_collector= "

diff --git a/gosa-core/plugins/addons/godfs/main.inc b/gosa-core/plugins/addons/godfs/main.inc
index 30b434da32e7a35efb1ab4da89b41e8233c0f565..6e15fe929f03e5395d30594e1594beb798b2726d 100644 (file)
--- a/gosa-core/plugins/addons/godfs/main.inc
+++ b/gosa-core/plugins/addons/godfs/main.inc
@@ -1,7 +1,7 @@
 <?php
    if ($remove_lock) {
      if (session::is_set('dfsManagment')) {
-       $dfsManagment = $_SESSION['dfsManagment'];
+       $dfsManagment  = session::get('dfsManagment');
        $dfsManagment->remove_lock();
        del_lock($ui->dn);
        sess_del('dfsManagment');
@@ -12,7 +12,7 @@
         (isset($_GET['reset']) && $_GET['reset'] == 1)) {
        $_SESSION['dfsManagment'] = new dfsManagment($config, $_SESSION['ui']);
      }
-     $dfsManagment = $_SESSION['dfsManagment'];
+     $dfsManagment  = session::get('dfsManagment');
      $output = $dfsManagment->execute();
 
      # do we have to reset

diff --git a/gosa-core/plugins/addons/gotomasses/class_goto_task.inc b/gosa-core/plugins/addons/gotomasses/class_goto_task.inc
index d53a4c2b498cbd723dea39c22b1cbecf49b46105..8964def485ece43d7807c7844d105488408ac53b 100644 (file)
--- a/gosa-core/plugins/addons/gotomasses/class_goto_task.inc
+++ b/gosa-core/plugins/addons/gotomasses/class_goto_task.inc
@@ -253,7 +253,7 @@ class goto_task extends plugin
     $smarty->assign("configure_dns", $this->configure_dns);
 
     $tmp = $this->get_array_values();
-    $smarty->assign("JS"      , $_SESSION['js']);
+    $smarty->assign("JS"      , session::get('js'));
     $smarty->assign("Minutes" , $tmp['Minute']);
     $smarty->assign("Hours"   , $tmp['Hour']);
     $smarty->assign("Days"    , $tmp['Day']);

diff --git a/gosa-core/plugins/addons/gotomasses/main.inc b/gosa-core/plugins/addons/gotomasses/main.inc
index 4e06270fea521599b5d099dfc11db0e18b147887..f83100d1573ff69f96d6d59931553f8358255090 100644 (file)
--- a/gosa-core/plugins/addons/gotomasses/main.inc
+++ b/gosa-core/plugins/addons/gotomasses/main.inc
@@ -38,7 +38,7 @@ if (!$remove_lock){
        
        
        }
-       $gotomasses= $_SESSION['gotomasses'];
+       $gotomasses = session::get('gotomasses');
 
        /* Execute formular */
        $display= $gotomasses->save_object();

diff --git a/gosa-core/plugins/addons/ldapmanager/main.inc b/gosa-core/plugins/addons/ldapmanager/main.inc
index 87cd43179ef65360a6612ed021d5d7b44c4b08f1..bef58098eb7ecf53daa7f1bac1557f1471eac1d0 100644 (file)
--- a/gosa-core/plugins/addons/ldapmanager/main.inc
+++ b/gosa-core/plugins/addons/ldapmanager/main.inc
@@ -24,7 +24,7 @@ if (!$remove_lock){
                $_SESSION['ldif']= new ldif ($config);
                $_SESSION['ldif']->set_acl_category("logview");
        }
-       $ldif= $_SESSION['ldif'];
+       $ldif = session::get('ldif');
 
        /* Execute formular */
        $display= $ldif->execute ();

diff --git a/gosa-core/plugins/addons/logview/main.inc b/gosa-core/plugins/addons/logview/main.inc
index 218d7ad0a025efcd3b5dec4365f2143a8a1bab68..7cea93586407fd6942678ec224b38c977b213100 100644 (file)
--- a/gosa-core/plugins/addons/logview/main.inc
+++ b/gosa-core/plugins/addons/logview/main.inc
@@ -23,7 +23,7 @@ if (!$remove_lock){
        if (!session::is_set('log_tabs') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
                $_SESSION['log_tabs']= new log_tabs($config, $config->data['TABS']['LOGTABS'],"");
        }
-       $log_tabs= $_SESSION['log_tabs'];
+       $log_tabs = session::get('log_tabs');
 
        /* Execute formular */
 #      $display= $log_tabs->save_object();

diff --git a/gosa-core/plugins/addons/mailqueue/main.inc b/gosa-core/plugins/addons/mailqueue/main.inc
index 4962d5db63ee957f5314697624c9d8637041b254..eba85f1daaae1f25f8bd3e8c185b94a6d9178888 100644 (file)
--- a/gosa-core/plugins/addons/mailqueue/main.inc
+++ b/gosa-core/plugins/addons/mailqueue/main.inc
@@ -31,7 +31,7 @@ if (!$remove_lock){
                        $_SESSION['mailqueue']->set_acl_base($ui->dn);
                }
        }
-       $mailqueue= $_SESSION['mailqueue'];
+       $mailqueue = session::get('mailqueue');
 
        /* Execute formular */
        $mailqueue->save_object();

diff --git a/gosa-core/plugins/addons/notifications/main.inc b/gosa-core/plugins/addons/notifications/main.inc
index b2e0a0339f01daa760f3ed7b9887b65b337b7a36..00c0cdae454618b83596b60ee75361143a111f2a 100644 (file)
--- a/gosa-core/plugins/addons/notifications/main.inc
+++ b/gosa-core/plugins/addons/notifications/main.inc
@@ -31,7 +31,7 @@ if (!$remove_lock){
                         $_SESSION['msgplug']->set_acl_base($ui->dn);
                 }
         }
-       $msgplug= $_SESSION['msgplug'];
+       $msgplug = session::get('msgplug');
 
        /* save changes back to object */
        if (isset ($_POST['target'])){

diff --git a/gosa-core/plugins/admin/acl/class_aclRole.inc b/gosa-core/plugins/admin/acl/class_aclRole.inc
index 16c7e44737d83da46fcef82d26e37af4c103cef2..545c0ea730aeb95288b4b92b564ea37060cb1362 100644 (file)
--- a/gosa-core/plugins/admin/acl/class_aclRole.inc
+++ b/gosa-core/plugins/admin/acl/class_aclRole.inc
@@ -39,7 +39,7 @@ class aclrole extends acl
     plugin::plugin($config, $dn);
 
     if($this->dn == "new"){
-      $this->base = $_SESSION['CurrentMainBase'];
+      $this->base  = session::get('CurrentMainBase');
     }else{
       $this->base = preg_replace("/^[^,]+,[^,]+,/","",$this->dn);
       new log("view","aclroles/".get_class($this),$this->dn);

diff --git a/gosa-core/plugins/admin/acl/main.inc b/gosa-core/plugins/admin/acl/main.inc
index 3383a010efa15d25d5531b890e7bbb0767f8646f..0c974af859e04690c87f3493547d6e8e9139ab8b 100644 (file)
--- a/gosa-core/plugins/admin/acl/main.inc
+++ b/gosa-core/plugins/admin/acl/main.inc
@@ -20,7 +20,7 @@
 
 if ($remove_lock){
         if(session::is_set('macl')){
-                $macl= $_SESSION['macl'];
+                $macl = session::get('macl');
                 $macl->remove_lock();
                 del_lock ($ui->dn);
                 sess_del ('macl');
@@ -32,7 +32,7 @@ if ($remove_lock){
 if (!session::is_set('macl') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
        $_SESSION['macl']= new aclManagement($config, $ui);
        }
-       $macl= $_SESSION['macl'];
+       $macl = session::get('macl');
        
        /* Show and save dialog */
        $macl->save_object();

diff --git a/gosa-core/plugins/admin/applications/class_applicationGeneric.inc b/gosa-core/plugins/admin/applications/class_applicationGeneric.inc
index 6427dbd8d3f2e4a6cfa7db6cdf0932fcf95a9c7c..e150b0622353db5b2c97d050c8228287df6a280e 100644 (file)
--- a/gosa-core/plugins/admin/applications/class_applicationGeneric.inc
+++ b/gosa-core/plugins/admin/applications/class_applicationGeneric.inc
@@ -58,7 +58,7 @@ class application extends plugin
 
     if ($this->dn == "new"){
       if(session::is_set('CurrentMainBase')){
-        $this->base= $_SESSION['CurrentMainBase'];
+        $this->base = session::get('CurrentMainBase');
       }else{
         $ui= get_userinfo();
         $this->base= dn2base($ui->dn);

diff --git a/gosa-core/plugins/admin/applications/main.inc b/gosa-core/plugins/admin/applications/main.inc
index 7d29cd2611a2a6ed5f638fac262fae36212c2ff8..3972b12693078d674e6675cf83f4407609ba3a15 100644 (file)
--- a/gosa-core/plugins/admin/applications/main.inc
+++ b/gosa-core/plugins/admin/applications/main.inc
@@ -20,7 +20,7 @@
 
 if ($remove_lock){
         if(session::is_set('applicationManagement')){
-                $applicationManagement= $_SESSION['applicationManagement'];
+                $applicationManagement = session::get('applicationManagement');
                 $applicationManagement->remove_lock();
                 del_lock ($ui->dn);
                 sess_del ('applicationManagement');
@@ -30,7 +30,7 @@ if ($remove_lock){
        if (!session::is_set('applicationManagement') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
                $_SESSION['applicationManagement']= new applicationManagement ($config, $_SESSION['ui']);
        }
-       $applicationManagement= $_SESSION['applicationManagement'];
+       $applicationManagement = session::get('applicationManagement');
        $applicationManagement->save_object();
        $output= $applicationManagement->execute();
 

diff --git a/gosa-core/plugins/admin/departments/class_departmentGeneric.inc b/gosa-core/plugins/admin/departments/class_departmentGeneric.inc
index adfd4f9a8c3b6c6984a31c2a1edf00383f75810d..429b454f23f2751892d9633f1387ca5ba988f664 100644 (file)
--- a/gosa-core/plugins/admin/departments/class_departmentGeneric.inc
+++ b/gosa-core/plugins/admin/departments/class_departmentGeneric.inc
@@ -75,7 +75,7 @@ class department extends plugin
                if ($this->dn == "new"){
                        $ui= get_userinfo();
                        if(session::is_set('CurrentMainBase')){
-                               $this->base= $_SESSION['CurrentMainBase'];
+                               $this->base = session::get('CurrentMainBase');
                        }else{
                                $this->base= dn2base($ui->dn);
                        }

diff --git a/gosa-core/plugins/admin/departments/main.inc b/gosa-core/plugins/admin/departments/main.inc
index f0dbab6b2ca084fd40921fe86eb2322af0df5173..66f23d30eb25e28f83ffd302869019cafd100acf 100644 (file)
--- a/gosa-core/plugins/admin/departments/main.inc
+++ b/gosa-core/plugins/admin/departments/main.inc
@@ -20,7 +20,7 @@
 
 if ($remove_lock){
         if(session::is_set('department')){
-                $department= $_SESSION['department'];
+                $department = session::get('department');
                 $department->remove_lock();
                 del_lock ($ui->dn);
                 sess_del ('department');
@@ -30,7 +30,7 @@ if ($remove_lock){
        if (!session::is_set('department') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
                $_SESSION['department']= new departmentManagement($config, $ui);
        }
-       $department= $_SESSION['department'];
+       $department = session::get('department');
        
        /* Show and save dialog */
        $department->save_object();

diff --git a/gosa-core/plugins/admin/devices/class_deviceGeneric.inc b/gosa-core/plugins/admin/devices/class_deviceGeneric.inc
index 47be298a508b24971ec9a16459174ea0a5fb971a..1415be066c50b79fd1565b37da23ec1a62bbd17d 100644 (file)
--- a/gosa-core/plugins/admin/devices/class_deviceGeneric.inc
+++ b/gosa-core/plugins/admin/devices/class_deviceGeneric.inc
@@ -38,7 +38,7 @@ class deviceGeneric extends plugin
     /* Set Base */
     if ($this->dn == "new"){
       if(session::is_set('CurrentMainBase')){
-        $this->base= $_SESSION['CurrentMainBase'];
+        $this->base = session::get('CurrentMainBase');
       }else{
         $ui= get_userinfo();
         $this->base= dn2base($ui->dn);

diff --git a/gosa-core/plugins/admin/devices/main.inc b/gosa-core/plugins/admin/devices/main.inc
index 7cd5621538832450a8b55e2cdfd4bdae0c7eb415..7b0087844f0c9cf01b30068c9cdfe606cb8b7b23 100755 (executable)
--- a/gosa-core/plugins/admin/devices/main.inc
+++ b/gosa-core/plugins/admin/devices/main.inc
@@ -20,7 +20,7 @@
 
 if ($remove_lock){
                if(session::is_set('DeviceManagement')){
-                               $DeviceManagement= $_SESSION['DeviceManagement'];
+                               $DeviceManagement = session::get('DeviceManagement');
                                $DeviceManagement->remove_lock();
                                del_lock ($ui->dn);
                                sess_del ('DeviceManagement');
@@ -33,7 +33,7 @@ if ($remove_lock){
                }
 
                /* Get object */
-               $DeviceManagement= $_SESSION['DeviceManagement'];
+               $DeviceManagement = session::get('DeviceManagement');
                $DeviceManagement->save_object();
                $output= $DeviceManagement->execute();
 

diff --git a/gosa-core/plugins/admin/fai/class_askClassName.inc b/gosa-core/plugins/admin/fai/class_askClassName.inc
index db7a62bf47e387dbb0e0d4afd92dab6ac4083028..de9c2a5341129ee502221e03e0e37765a9b2c83e 100644 (file)
--- a/gosa-core/plugins/admin/fai/class_askClassName.inc
+++ b/gosa-core/plugins/admin/fai/class_askClassName.inc
@@ -39,7 +39,7 @@ class askClassName extends plugin
     /* The faifilter contais 
      * The base for all fai objects 
      */
-    $faifilter = $_SESSION['faifilter'];
+    $faifilter  = session::get('faifilter');
 
     /* First search for every ou, in given fai base
      * With a second search detect all object that belong to the different ous. 

diff --git a/gosa-core/plugins/admin/fai/class_divListFai.inc b/gosa-core/plugins/admin/fai/class_divListFai.inc
index 03803ff322a20486fa7d8b77b96f9376c3a513cf..5399a29f1a2a2fb83d6683fe472144d0a60733d1 100644 (file)
--- a/gosa-core/plugins/admin/fai/class_divListFai.inc
+++ b/gosa-core/plugins/admin/fai/class_divListFai.inc
@@ -37,7 +37,7 @@ class divListFai extends MultiSelectWindow
     if(!session::is_set('CurrentMainBase')){
       session::set('CurrentMainBase',$this->config->current['BASE']);
     }
-    $this->selectedBase = $_SESSION['CurrentMainBase'];
+    $this->selectedBase  = session::get('CurrentMainBase');
 
     /* Set list strings */
     $this->SetTitle(_("List of FAI classes"));

diff --git a/gosa-core/plugins/admin/fai/class_faiHook.inc b/gosa-core/plugins/admin/fai/class_faiHook.inc
index d7cba42ea97cb24f7a82137ba218d4029b3dba55..7e6b1c70517fdddda21aa7e26f59b67a23135328 100644 (file)
--- a/gosa-core/plugins/admin/fai/class_faiHook.inc
+++ b/gosa-core/plugins/admin/fai/class_faiHook.inc
@@ -119,7 +119,7 @@ class faiHook extends plugin
   {
     if($dn == "new"){
       if($this->dn == "new"){
-        $dn= $_SESSION['CurrentMainBase'];
+        $dn = session::get('CurrentMainBase');
       }else{
         $dn = $this->dn;
       }

diff --git a/gosa-core/plugins/admin/fai/class_faiManagement.inc b/gosa-core/plugins/admin/fai/class_faiManagement.inc
index 005a6ea273967d74a88b1f4fcc62d083ebd148d7..07189b177ee2ffbaf75f6d1eb47e2dc9d0b219da 100644 (file)
--- a/gosa-core/plugins/admin/fai/class_faiManagement.inc
+++ b/gosa-core/plugins/admin/fai/class_faiManagement.inc
@@ -531,7 +531,7 @@ class faiManagement extends plugin
         $this->dispNewBranch = false;
         $this->dispNewFreeze = false;
         $base = $_SESSION['LASTPOST']['base'];
-        $_POST = $_SESSION['LASTPOST'];      
+        $_POST  = session::get('LASTPOST');      
         $name = $_POST['BranchName'];
 
         $type = $_SESSION['LASTPOST']['type'];
@@ -879,7 +879,7 @@ class faiManagement extends plugin
     $ret = array("/"=>"main");
     $ldap = $this->config->get_ldap_link();
     if(!$base){
-      $base= $_SESSION['CurrentMainBase'];
+      $base = session::get('CurrentMainBase');
     }
     $tmp = get_all_releases_from_base($base,true);
     foreach($tmp as $dn => $name){

diff --git a/gosa-core/plugins/admin/fai/class_faiPackageEntry.inc b/gosa-core/plugins/admin/fai/class_faiPackageEntry.inc
index 792533f6db403166f240510a359b36cc2375ddd5..3670a3af0f7252d11073f8e6fa4bfc40f7f83c0e 100644 (file)
--- a/gosa-core/plugins/admin/fai/class_faiPackageEntry.inc
+++ b/gosa-core/plugins/admin/fai/class_faiPackageEntry.inc
@@ -28,7 +28,7 @@ class faiPackageEntry extends plugin
     $this->pkgs=$pkgs;
 
     if(session::is_set('searchStrPKG')){
-      $this->searchStrPKG=$_SESSION['searchStrPKG'];
+      $this->searchStrPKG = session::get('searchStrPKG');
     }
     $this->selected=$selected;
 

diff --git a/gosa-core/plugins/admin/fai/class_faiPartitionTable.inc b/gosa-core/plugins/admin/fai/class_faiPartitionTable.inc
index e7ab5a9b053d604770e33eedd319f9c67ba2b364..960b73e02b4b6c2e8247c8e4ff2fa3b3523537e1 100644 (file)
--- a/gosa-core/plugins/admin/fai/class_faiPartitionTable.inc
+++ b/gosa-core/plugins/admin/fai/class_faiPartitionTable.inc
@@ -109,7 +109,7 @@ class faiPartitionTable extends plugin
   {
     if($dn == "new"){
       if($this->dn == "new"){
-        $dn= $_SESSION['CurrentMainBase'];
+        $dn = session::get('CurrentMainBase');
       }else{
         $dn = $this->dn;
       }

diff --git a/gosa-core/plugins/admin/fai/class_faiProfile.inc b/gosa-core/plugins/admin/fai/class_faiProfile.inc
index 6c1fea191132cfbb0ac637c109a0531d82e92756..048e29348efd191c88c7a8bf6458e3a0e01924ca 100644 (file)
--- a/gosa-core/plugins/admin/fai/class_faiProfile.inc
+++ b/gosa-core/plugins/admin/fai/class_faiProfile.inc
@@ -65,7 +65,7 @@ class faiProfile extends plugin
     }
     
     /* Get ldap connection */ 
-    $base = $_SESSION['CurrentMainBase'];
+    $base  = session::get('CurrentMainBase');
     $ldap->cd($base);
     $sort = array();
 
@@ -129,7 +129,7 @@ class faiProfile extends plugin
   {
     if($dn == "new"){
       if($this->dn == "new"){
-        $dn= $_SESSION['CurrentMainBase'];
+        $dn = session::get('CurrentMainBase');
       }else{
         $dn = $this->dn;
       }
@@ -407,7 +407,7 @@ class faiProfile extends plugin
 
     $base = $_SESSION['faifilter']['branch'];
     if($base == "main"){
-      $base =$_SESSION['CurrentMainBase'];
+      $base  = session::get('CurrentMainBase');
     }
     $base = get_ou('faiprofileou').$base;
   

diff --git a/gosa-core/plugins/admin/fai/class_faiProfileEntry.inc b/gosa-core/plugins/admin/fai/class_faiProfileEntry.inc
index 7819137a3470d7e38d03ab28b5b55f8a260bb048..f0fe7f06ad15de1ec45416875e51307e713e6daa 100644 (file)
--- a/gosa-core/plugins/admin/fai/class_faiProfileEntry.inc
+++ b/gosa-core/plugins/admin/fai/class_faiProfileEntry.inc
@@ -105,7 +105,7 @@ class faiProfileEntry extends plugin
     $smarty     = get_smarty();
     $display = "";
 
-    $SUBfaifilter = $_SESSION['SUBfaifilter'];
+    $SUBfaifilter  = session::get('SUBfaifilter');
 
     /* If someone used the apply button, update searchfilter */
     if(isset($_POST['Sregex'])){

diff --git a/gosa-core/plugins/admin/fai/class_faiTemplate.inc b/gosa-core/plugins/admin/fai/class_faiTemplate.inc
index d35648a8e0c5c953a469c894a6e5943ad03c4e9c..89e0b2d06f1a84d07981dbb1f9c3be760884f5df 100644 (file)
--- a/gosa-core/plugins/admin/fai/class_faiTemplate.inc
+++ b/gosa-core/plugins/admin/fai/class_faiTemplate.inc
@@ -351,7 +351,7 @@ class faiTemplate extends plugin
   {
     if($dn == "new"){
       if($this->dn == "new"){
-        $dn= $_SESSION['CurrentMainBase'];
+        $dn = session::get('CurrentMainBase');
       }else{
         $dn = $this->dn;
       }

diff --git a/gosa-core/plugins/admin/fai/class_faiTemplateEntry.inc b/gosa-core/plugins/admin/fai/class_faiTemplateEntry.inc
index bef885e00fd700ea73a5894d116efcdc3cb06773..44621681f29f2e2eef70e8f66969685804965332 100644 (file)
--- a/gosa-core/plugins/admin/fai/class_faiTemplateEntry.inc
+++ b/gosa-core/plugins/admin/fai/class_faiTemplateEntry.inc
@@ -60,7 +60,7 @@ class faiTemplateEntry extends plugin
     if(!empty($this->dn) && $this->dn != "new"){
       $ldap = $this->config->get_ldap_link();
       session::set('binary',$ldap->get_attribute($this->dn,"FAItemplateFile"));
-      $this->FAItemplateFile = $_SESSION['binary'];
+      $this->FAItemplateFile  = session::get('binary');
     }
     
     $this->FAImode= sprintf("%0.4s", $this->FAImode)." ";

diff --git a/gosa-core/plugins/admin/fai/class_faiVariable.inc b/gosa-core/plugins/admin/fai/class_faiVariable.inc
index a3cbe09dc904083db53c7b25bd5f1ec4bc6b9ae0..f21ab7cdc1e13fe0580147fb1fd24e75e38f598d 100644 (file)
--- a/gosa-core/plugins/admin/fai/class_faiVariable.inc
+++ b/gosa-core/plugins/admin/fai/class_faiVariable.inc
@@ -95,7 +95,7 @@ class faiVariable extends plugin
   {
     if($dn == "new"){
       if($this->dn == "new"){
-        $dn= $_SESSION['CurrentMainBase'];
+        $dn = session::get('CurrentMainBase');
       }else{
         $dn = $this->dn;
       }

diff --git a/gosa-core/plugins/admin/fai/main.inc b/gosa-core/plugins/admin/fai/main.inc
index d17e55122e9f05260a4da9feff071a1ca0402194..5906069da84edd9140496a0600d51810e6fb5e27 100644 (file)
--- a/gosa-core/plugins/admin/fai/main.inc
+++ b/gosa-core/plugins/admin/fai/main.inc
@@ -20,7 +20,7 @@
 
 if ($remove_lock){
         if(session::is_set('FAI')){
-                $FAI= $_SESSION['FAI'];
+                $FAI = session::get('FAI');
                 $FAI->remove_lock();
                 del_lock ($ui->dn);
                 sess_del ('FAI');
@@ -32,7 +32,7 @@ if ($remove_lock){
                $_SESSION['FAI']->set_acl_category("fai");
                $_SESSION['FAI']->set_acl_base($_SESSION['CurrentMainBase']);
        }
-       $FAI= $_SESSION['FAI'];
+       $FAI = session::get('FAI');
        $FAI->save_object();
        $output= $FAI->execute();
 

diff --git a/gosa-core/plugins/admin/groups/class_groupGeneric.inc b/gosa-core/plugins/admin/groups/class_groupGeneric.inc
index e5ab07827468eb81059dd3513697314b657aeb90..9da0acb1eaf55fa253a94ad37f7732ee9279f445 100644 (file)
--- a/gosa-core/plugins/admin/groups/class_groupGeneric.inc
+++ b/gosa-core/plugins/admin/groups/class_groupGeneric.inc
@@ -160,7 +160,7 @@ class group extends plugin
   
     if ($this->dn == "new"){
       if(session::is_set('CurrentMainBase')){
-        $this->base= $_SESSION['CurrentMainBase'];
+        $this->base = session::get('CurrentMainBase');
       }else{
         $ui= get_userinfo();
         $this->base= dn2base($ui->dn);

diff --git a/gosa-core/plugins/admin/groups/class_groupMail.inc b/gosa-core/plugins/admin/groups/class_groupMail.inc
index be6f7b3fef6fd9406e70aa0d047fa76b237c840d..43baee578b017526dc5c95d05e2c79bd39154a0f 100644 (file)
--- a/gosa-core/plugins/admin/groups/class_groupMail.inc
+++ b/gosa-core/plugins/admin/groups/class_groupMail.inc
@@ -326,7 +326,7 @@ class mailgroup extends plugin
       $smarty->assign($name."ACL",$this->getacl($name));
     }
 
-    if ($_SESSION['js']==FALSE){
+    if (session::get('js')==FALSE){
       $smarty->assign("javascript", "false");
     } else {
       $smarty->assign("javascript", "true");
@@ -656,7 +656,7 @@ class mailgroup extends plugin
     if(isset($this->config->current['MAILMETHOD'])&&preg_match("/olab/i",$this->config->current['MAILMETHOD'])){
 
       $smarty->assign("kolab", TRUE);
-      $smarty->assign("JS",$_SESSION['js']);
+      $smarty->assign("JS",session::get('js'));
       $smarty->assign("kolabFolderType_Types",    array (   ''      => _('Unspecified'),  'mail' => _('Mails'),
                                                             'task'  => _('Tasks') ,       'journal' => _('Journals'),
                                                             'calendar' => _('Calendar'),       'contact' => _('Contacts'), 

diff --git a/gosa-core/plugins/admin/groups/main.inc b/gosa-core/plugins/admin/groups/main.inc
index 742f768911f5c7f0d81634216efa2a65d97eca58..eb1ff800d8510edd53aee0ac04bc858493177d06 100644 (file)
--- a/gosa-core/plugins/admin/groups/main.inc
+++ b/gosa-core/plugins/admin/groups/main.inc
@@ -20,7 +20,7 @@
 
 if ($remove_lock){
   if(session::is_set('groupManagement')){
-    $groupManagement= $_SESSION['groupManagement'];
+    $groupManagement = session::get('groupManagement');
     $groupManagement->remove_lock();
     del_lock ($ui->dn);
     sess_del ('groupManagement');
@@ -30,7 +30,7 @@ if ($remove_lock){
   if (!session::is_set('groupManagement') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
     $_SESSION['groupManagement']= new groupManagement ($config, $_SESSION['ui']);
   }
-  $groupManagement= $_SESSION['groupManagement'];
+  $groupManagement = session::get('groupManagement');
   $groupManagement->save_object();
   $output= $groupManagement->execute();
 

diff --git a/gosa-core/plugins/admin/mimetypes/main.inc b/gosa-core/plugins/admin/mimetypes/main.inc
index 92506d1f18afe7b7f77ea60023f5b4372157a01e..2525acbd400a889ca2ee5242191bcf5ff5e971dc 100755 (executable)
--- a/gosa-core/plugins/admin/mimetypes/main.inc
+++ b/gosa-core/plugins/admin/mimetypes/main.inc
@@ -20,7 +20,7 @@
 
 if ($remove_lock){
                if(session::is_set('MimeTypeManagement')){
-                               $MimeTypeManagement= $_SESSION['MimeTypeManagement'];
+                               $MimeTypeManagement = session::get('MimeTypeManagement');
                                $MimeTypeManagement->remove_lock();
                                del_lock ($ui->dn);
                                sess_del ('MimeTypeManagement');
@@ -33,7 +33,7 @@ if ($remove_lock){
                }
 
                /* Get object */
-               $MimeTypeManagement= $_SESSION['MimeTypeManagement'];
+               $MimeTypeManagement = session::get('MimeTypeManagement');
                $MimeTypeManagement->save_object();
                $output= $MimeTypeManagement->execute();
 

diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
index e1de54451c27a93b4db5490a72aa5b85ac128003..65019ac6cf73c00cce62228109ce1a2baca5e272 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
@@ -85,12 +85,12 @@ class ogroup extends plugin
     register_global("ogfilter", $ogfilter);
   
     if(session::is_set('CurrentMainBase')){
-     $this->base = $_SESSION['CurrentMainBase'];
+     $this->base  = session::get('CurrentMainBase');
     }
 
     /* Set base */
     if ($this->dn == "new"){
-      $this->base= $_SESSION['CurrentMainBase'];
+      $this->base = session::get('CurrentMainBase');
     } else {
       $this->base= preg_replace("/^[^,]+,".get_groups_ou()."/","",$this->dn);
     }

diff --git a/gosa-core/plugins/admin/ogroups/main.inc b/gosa-core/plugins/admin/ogroups/main.inc
index 701087ab9bbc811c780118ed02f19e13bc7b69f4..cc95ba34a1953a7f7754e40e955f9d1fbe4b1a50 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/main.inc
+++ b/gosa-core/plugins/admin/ogroups/main.inc
@@ -23,7 +23,7 @@ if (!$remove_lock){
   if (!session::is_set('ogroup') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
     $_SESSION['ogroup']= new ogroupManagement ($config);
   }
-  $ogroup= $_SESSION['ogroup'];
+  $ogroup = session::get('ogroup');
 
   /* Execute formular */
   $ogroup->save_object();

diff --git a/gosa-core/plugins/admin/systems/class_printGeneric.inc b/gosa-core/plugins/admin/systems/class_printGeneric.inc
index 6761f2f880715ac0f17e00d0c4f1c020d91de03f..f289b4dc0c7a5f42d820cf4b128657a677b5746c 100644 (file)
--- a/gosa-core/plugins/admin/systems/class_printGeneric.inc
+++ b/gosa-core/plugins/admin/systems/class_printGeneric.inc
@@ -107,7 +107,7 @@ class printgeneric extends plugin
 
       if(!isset($this->config->idepartments[$this->base])){
         print_red(_("Can't extract a valid base out of object dn, setting base to '%s'."),$_SESSION['CurrentMainBase']);
-        $this->base = $_SESSION['CurrentMainBase'];
+        $this->base  = session::get('CurrentMainBase');
       }
     }
 

diff --git a/gosa-core/plugins/admin/systems/class_systemManagement.inc b/gosa-core/plugins/admin/systems/class_systemManagement.inc
index bcbd9b5f17239f56988ff6d9d7ff723bc778649a..7d052d2072926e95546f0e8e7440f79d7b5c97c4 100644 (file)
--- a/gosa-core/plugins/admin/systems/class_systemManagement.inc
+++ b/gosa-core/plugins/admin/systems/class_systemManagement.inc
@@ -755,7 +755,7 @@ class systems extends plugin
          */
 
         if(session::is_set('SelectedSystemType')){
-          $SelectedSystemType= $_SESSION['SelectedSystemType'];
+          $SelectedSystemType = session::get('SelectedSystemType');
           if($SelectedSystemType['ogroup'] != "none"){
             $og = new ogroup($this->config,$SelectedSystemType['ogroup']);
             if($og){

diff --git a/gosa-core/plugins/admin/systems/class_terminalStartup.inc b/gosa-core/plugins/admin/systems/class_terminalStartup.inc
index 6e71b242ed26913eebc5280ac962ba39d9e3b75c..b03aa140bb2794e7c1b94dd24a0b90a7d3db60e2 100644 (file)
--- a/gosa-core/plugins/admin/systems/class_terminalStartup.inc
+++ b/gosa-core/plugins/admin/systems/class_terminalStartup.inc
@@ -315,7 +315,7 @@ class termstartup extends plugin
     $smarty->assign("gotoLdapServers",    $SelectBoxLdapServer->DrawList());
     $smarty->assign("gotoLdapServerList", $list);
     $smarty->assign("gotoLdap_inherit",   $this->gotoLdap_inherit);
-    $smarty->assign("JS",  $_SESSION['js']);
+    $smarty->assign("JS",  session::get('js'));
 
     foreach (array("gotoModules" ) as $val){
       $smarty->assign("$val", $this->$val);

diff --git a/gosa-core/plugins/admin/systems/class_workstationStartup.inc b/gosa-core/plugins/admin/systems/class_workstationStartup.inc
index 457acc4f4920a091f38f8eac992c694e53bb5e65..aec2da2aea7418e95e9ce8d790c080692df0f6ce 100644 (file)
--- a/gosa-core/plugins/admin/systems/class_workstationStartup.inc
+++ b/gosa-core/plugins/admin/systems/class_workstationStartup.inc
@@ -810,7 +810,7 @@ class workstartup extends plugin
     $smarty->assign("gotoLdapServers",    $SelectBoxLdapServer->DrawList());
     $smarty->assign("gotoLdapServerList", $list);
     $smarty->assign("gotoLdap_inherit",   $this->gotoLdap_inherit);
-    $smarty->assign("JS",  $_SESSION['js']);
+    $smarty->assign("JS",  session::get('js'));
 
     foreach (array("gotoModules", "gotoAutoFs", "gotoFilesystem") as $val){
       $smarty->assign("$val", $this->$val);

diff --git a/gosa-core/plugins/admin/systems/main.inc b/gosa-core/plugins/admin/systems/main.inc
index 2e6e2edc36fa62a4f7e299bec340aaeecae36139..51c98ce5dbb0a1fbb6c18a3facc3e8b486e992f0 100644 (file)
--- a/gosa-core/plugins/admin/systems/main.inc
+++ b/gosa-core/plugins/admin/systems/main.inc
@@ -20,7 +20,7 @@
 
 if ($remove_lock){
         if(session::is_set('systems')){
-                $systems= $_SESSION['systems'];
+                $systems = session::get('systems');
                 $systems->remove_lock();
                 del_lock ($ui->dn);
                 sess_del ('systems');
@@ -30,7 +30,7 @@ if ($remove_lock){
        if (!session::is_set('systems') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
                $_SESSION['systems']= new systems($config, $ui);
        }
-       $systems= $_SESSION['systems'];
+       $systems = session::get('systems');
        $systems->save_object();
        $output= $systems->execute();
 

diff --git a/gosa-core/plugins/admin/systems/services/glpi/class_glpiDeviceManagement.inc b/gosa-core/plugins/admin/systems/services/glpi/class_glpiDeviceManagement.inc
index af5d400d3a866e0543dd972ea5ded4d8f2641342..fbb710f2d13779a041e47a5c87b40ae47185e249 100644 (file)
--- a/gosa-core/plugins/admin/systems/services/glpi/class_glpiDeviceManagement.inc
+++ b/gosa-core/plugins/admin/systems/services/glpi/class_glpiDeviceManagement.inc
@@ -250,7 +250,7 @@ class glpiDeviceManagement extends plugin
       src='images/fai_template.png' title='"._("New misc device")."' alt='"._("OC")."' name='new_pci'> ".
       "</div>";
     
-    $filter= $_SESSION['glpiDeviceRegex'];
+    $filter = session::get('glpiDeviceRegex');
     $smarty->assign("devicehead", $listhead);
     $smarty->assign("devices", $divlist->DrawList());
     $smarty->assign("search_image", get_template_path('images/search.png'));

diff --git a/gosa-core/plugins/admin/systems/services/glpi/class_glpiPrinterCartridges.inc b/gosa-core/plugins/admin/systems/services/glpi/class_glpiPrinterCartridges.inc
index 25df1dffc682dadcff40312878fdee60b9f2a812..cd011125b28283624cb4f2cdec9d0abd664c15e1 100644 (file)
--- a/gosa-core/plugins/admin/systems/services/glpi/class_glpiPrinterCartridges.inc
+++ b/gosa-core/plugins/admin/systems/services/glpi/class_glpiPrinterCartridges.inc
@@ -43,7 +43,7 @@ class glpiPrinterCartridges extends plugin
     plugin::execute();
     $display ="";
     $smarty = get_smarty();
-    $filter = $_SESSION['glpiCartridgeRegex'];
+    $filter  = session::get('glpiCartridgeRegex');
 
     /* Filter settings, remove double* */
     if(isset($_GET['search'])){
@@ -212,7 +212,7 @@ class glpiPrinterCartridges extends plugin
       "</div>";
 
     /* Tell smarty some vars */
-    $filter= $_SESSION['glpiCartridgeRegex'];
+    $filter = session::get('glpiCartridgeRegex');
     $smarty->assign("devicehead", $listhead);
     $smarty->assign("devices", $divlist->DrawList());
     $smarty->assign("search_image", get_template_path('images/search.png'));

diff --git a/gosa-core/plugins/admin/systems/services/glpi/class_glpiSelectUser.inc b/gosa-core/plugins/admin/systems/services/glpi/class_glpiSelectUser.inc
index 1356557e4cbb9e80b8fbaaa398e02df567d47c7e..5b0ec6708d18ffe0eb12ed3f61d76bafd430a2b1 100644 (file)
--- a/gosa-core/plugins/admin/systems/services/glpi/class_glpiSelectUser.inc
+++ b/gosa-core/plugins/admin/systems/services/glpi/class_glpiSelectUser.inc
@@ -43,7 +43,7 @@ class glpiSelectUser extends plugin
       $_SESSION['glpi_user_filter']['base'] = $_POST['depselect'];
     }
 
-    $filter = $_SESSION['glpi_user_filter'];
+    $filter  = session::get('glpi_user_filter');
 
     /* Filter settings, remove double* */
     if(isset($_GET['search'])){
@@ -186,7 +186,7 @@ class glpiSelectUser extends plugin
       "</div>";
 
 
-    $filter= $_SESSION['glpi_user_filter'];
+    $filter = session::get('glpi_user_filter');
     $smarty->assign("usershead", $listhead);
     $smarty->assign("users", $divlist->DrawList());
     $smarty->assign("search_image", get_template_path('images/search.png'));
@@ -215,7 +215,7 @@ class glpiSelectUser extends plugin
   function reload()
   {
 
-    $filter= $_SESSION['glpi_user_filter'];
+    $filter = session::get('glpi_user_filter');
 
     $base = $filter['base'];
     $regex= $filter['users_regex'];

diff --git a/gosa-core/plugins/admin/systems/tabs_server.inc b/gosa-core/plugins/admin/systems/tabs_server.inc
index ea674e9de7f5fac96c95518eee5244e1495f04eb..5ee27ab39b803db21d29de0f36be65ceaea69ffa 100644 (file)
--- a/gosa-core/plugins/admin/systems/tabs_server.inc
+++ b/gosa-core/plugins/admin/systems/tabs_server.inc
@@ -56,7 +56,7 @@ class servtabs extends tabs
     tabs::save(FALSE);
 
     /* Reload server settings after saving */
-    $config= $_SESSION['config'];
+    $config = session::get('config');
     $config->load_servers();
     session::set('config',$config);
 

diff --git a/gosa-core/plugins/admin/users/main.inc b/gosa-core/plugins/admin/users/main.inc
index cbb3883e6568a5671cf514fa6fa998a31e1557b4..a0c96ec9b462dbcc2141d5a5711ef86b0de6ebb3 100644 (file)
--- a/gosa-core/plugins/admin/users/main.inc
+++ b/gosa-core/plugins/admin/users/main.inc
@@ -20,7 +20,7 @@
 
 if ($remove_lock){
   if(session::is_set('userManagement')){
-    $userManagement= $_SESSION['userManagement'];
+    $userManagement = session::get('userManagement');
     $userManagement->remove_lock();
     del_lock ($ui->dn);
     sess_del ('userManagement');
@@ -32,7 +32,7 @@ if ($remove_lock){
     $_SESSION['userManagement']= new userManagement ($config, $_SESSION['ui']);
     $_SESSION['userManagement']->set_acl_category("users");
   }
-  $userManagement= $_SESSION['userManagement'];
+  $userManagement = session::get('userManagement');
   $userManagement->save_object();
   $output= $userManagement->execute();
 

diff --git a/gosa-core/plugins/gofax/blocklists/class_blocklistGeneric.inc b/gosa-core/plugins/gofax/blocklists/class_blocklistGeneric.inc
index b2c7396420f9e4170521df7529affdd75b337571..15c4c00caf1dc9856c56497e5f9d869554775a96 100644 (file)
--- a/gosa-core/plugins/gofax/blocklists/class_blocklistGeneric.inc
+++ b/gosa-core/plugins/gofax/blocklists/class_blocklistGeneric.inc
@@ -55,7 +55,7 @@ class blocklistGeneric extends plugin
     /* Set base */
     if ($this->dn == "new"){
       if(session::is_set('CurrentMainBase')){
-        $this->base= $_SESSION['CurrentMainBase'];
+        $this->base = session::get('CurrentMainBase');
       }else{
         $ui= get_userinfo();
         $this->base= dn2base($ui->dn);
@@ -333,7 +333,7 @@ class blocklistGeneric extends plugin
     /* Set base */
     if ($this->dn == "new"){
       if(session::is_set('CurrentMainBase')){
-        $this->base= $_SESSION['CurrentMainBase'];
+        $this->base = session::get('CurrentMainBase');
       }else{
         $ui= get_userinfo();
         $this->base= dn2base($ui->dn);

diff --git a/gosa-core/plugins/gofax/blocklists/class_blocklistManagement.inc b/gosa-core/plugins/gofax/blocklists/class_blocklistManagement.inc
index 2476c807b5bca6fa038abcf682dd18739b01fd1a..8c68cc421d4009eade7820eb09042bc1e95a6aa2 100644 (file)
--- a/gosa-core/plugins/gofax/blocklists/class_blocklistManagement.inc
+++ b/gosa-core/plugins/gofax/blocklists/class_blocklistManagement.inc
@@ -16,7 +16,7 @@ class blocklist extends plugin
     $this->ui     = $ui;
     $this->dn     = "";
     $this->config = &$config;
-    $this->base = $_SESSION['CurrentMainBase']; 
+    $this->base  = session::get('CurrentMainBase'); 
     $this->DivListBlocklist = new divListBlocklist($this->config,$this);
 
     /* Initialize copy&paste queue */

diff --git a/gosa-core/plugins/gofax/blocklists/main.inc b/gosa-core/plugins/gofax/blocklists/main.inc
index 74b4739bab87bdfd93e32d06b3edca3e42a1edbe..7dfbd6badbaf27162626c9efcffa7cf041452244 100644 (file)
--- a/gosa-core/plugins/gofax/blocklists/main.inc
+++ b/gosa-core/plugins/gofax/blocklists/main.inc
@@ -1,7 +1,7 @@
 <?php
 if ($remove_lock){
         if(session::is_set('blocklist')){
-                $blocklist= $_SESSION['blocklist'];
+                $blocklist = session::get('blocklist');
                 del_lock ($ui->dn);
                 sess_del ('blocklist');
         }
@@ -11,7 +11,7 @@ if ($remove_lock){
                $_SESSION['blocklist']= new blocklist($config, $ui);
                $_SESSION['blocklist']->set_acl_category("gofaxlist");
        }
-       $blocklist= $_SESSION['blocklist'];
+       $blocklist = session::get('blocklist');
        $blocklist->save_object();
        $output= $blocklist->execute();
 

diff --git a/gosa-core/plugins/gofax/faxaccount/main.inc b/gosa-core/plugins/gofax/faxaccount/main.inc
index 9c3389f4a13b3791064058fdc8e575349833c095..a9d45caeed6e9a8a268cfe98aff9e7075ea17912 100644 (file)
--- a/gosa-core/plugins/gofax/faxaccount/main.inc
+++ b/gosa-core/plugins/gofax/faxaccount/main.inc
@@ -21,7 +21,7 @@ if (!$remove_lock){
                $_SESSION['gofaxAccount']->set_acl_category("users");
 
        }
-       $gofaxAccount= $_SESSION['gofaxAccount'];
+       $gofaxAccount = session::get('gofaxAccount');
 
        /* save changes back to object */
        if (session::is_set('edit')){

diff --git a/gosa-core/plugins/gofax/faxreports/main.inc b/gosa-core/plugins/gofax/faxreports/main.inc
index b2421c97967218266b44c5e8b2d2980a26dad723..58ca227c2c9a1286e771efb4ef8b48e4138308ad 100644 (file)
--- a/gosa-core/plugins/gofax/faxreports/main.inc
+++ b/gosa-core/plugins/gofax/faxreports/main.inc
@@ -5,7 +5,7 @@ if (!$remove_lock){
        if (!session::is_set('faxreport') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
                $_SESSION['faxreport']= new faxreport ($config, $ui);
        }
-       $faxreport= $_SESSION['faxreport'];
+       $faxreport = session::get('faxreport');
 
        /* Execute formular */
        $faxreport->save_object();

diff --git a/gosa-core/plugins/gofon/conference/class_phoneConferenceGeneric.inc b/gosa-core/plugins/gofon/conference/class_phoneConferenceGeneric.inc
index 1ca4820aaf5db0b94948b4bb90088339471d126b..51194a30ba44a1fcaa733be9d0b7cb3a8447b143 100644 (file)
--- a/gosa-core/plugins/gofon/conference/class_phoneConferenceGeneric.inc
+++ b/gosa-core/plugins/gofon/conference/class_phoneConferenceGeneric.inc
@@ -113,7 +113,7 @@ class conference extends plugin
     if ($this->dn == "new"){
       $ui= get_userinfo();
       if(session::is_set('CurrentMainBase')){
-        $this->base = $_SESSION['CurrentMainBase'];
+        $this->base  = session::get('CurrentMainBase');
       }else{
         $this->base= dn2base($ui->dn);
       }
@@ -234,7 +234,7 @@ class conference extends plugin
     $smarty->assign("base_select"  ,$this->base);
 
 
-    if($_SESSION['js']==1){
+    if(session::get('js')==1){
       if($this->goFonConferenceOption_P != "P"){
         $smarty->assign("goFonPINACL", $this->getacl("goFonPIN",TRUE));
         $smarty->assign("goFonPIN","");

diff --git a/gosa-core/plugins/gofon/conference/main.inc b/gosa-core/plugins/gofon/conference/main.inc
index b6496a4b4fe0e65f731ff587dd90608cc1f70f98..611f27773d3f4a397a9015de410455c4be994c23 100644 (file)
--- a/gosa-core/plugins/gofon/conference/main.inc
+++ b/gosa-core/plugins/gofon/conference/main.inc
@@ -20,7 +20,7 @@
 
 if ($remove_lock){
         if(session::is_set('conference')){
-                $conference= $_SESSION['conference'];
+                $conference = session::get('conference');
                 $conference->remove_lock();
                 del_lock ($ui->dn);
                 sess_del ('conference');
@@ -30,7 +30,7 @@ if ($remove_lock){
        if (!session::is_set('conference') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
                $_SESSION['conference']= new phoneConferenceManagment($config, $ui);
        }
-       $conference= $_SESSION['conference'];
+       $conference = session::get('conference');
        $conference->save_object();
        $output= $conference->execute();
 

diff --git a/gosa-core/plugins/gofon/fonreports/main.inc b/gosa-core/plugins/gofon/fonreports/main.inc
index f6defcac495fb66b6646119ab1c21c415f9ef969..54abef0fc07d4f0e84a91422da32724ddc097c61 100644 (file)
--- a/gosa-core/plugins/gofon/fonreports/main.inc
+++ b/gosa-core/plugins/gofon/fonreports/main.inc
@@ -5,7 +5,7 @@ if (!$remove_lock){
        if (!session::is_set('fonreport') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
                $_SESSION['fonreport']= new fonreport ($config, $ui);
        }
-       $fonreport= $_SESSION['fonreport'];
+       $fonreport = session::get('fonreport');
 
        /* Execute formular */
        $fonreport->save_object();

diff --git a/gosa-core/plugins/gofon/macro/class_gofonMacro.inc b/gosa-core/plugins/gofon/macro/class_gofonMacro.inc
index fe6775c2fa5a7999075b290163865b7cbaead82a..1b5992cc532ed16db19a32c8d3fc6b2f571ea7fd 100755 (executable)
--- a/gosa-core/plugins/gofon/macro/class_gofonMacro.inc
+++ b/gosa-core/plugins/gofon/macro/class_gofonMacro.inc
@@ -61,7 +61,7 @@ class macro extends plugin
     /* Edit or new one ?*/
     if ($this->dn == "new"){
       if(session::is_set('CurrentMainBase')){
-        $this->base = $_SESSION['CurrentMainBase'];
+        $this->base  = session::get('CurrentMainBase');
       }else{
         $ui= get_userinfo();
         $this->base= dn2base($ui->dn);

diff --git a/gosa-core/plugins/gofon/macro/main.inc b/gosa-core/plugins/gofon/macro/main.inc
index e0422fa4dd389ea9486118c864b383e9fe2ae03e..691fd41a465e9dff94902017119427d536c53714 100755 (executable)
--- a/gosa-core/plugins/gofon/macro/main.inc
+++ b/gosa-core/plugins/gofon/macro/main.inc
@@ -20,7 +20,7 @@
 
 if ($remove_lock){
   if(session::is_set('macroManagement')){
-    $macroManagment= $_SESSION['macroManagment'];
+    $macroManagment = session::get('macroManagment');
     $macroManagment->remove_lock();
     del_lock ($ui->dn);
     sess_del ('macroManagment');
@@ -33,7 +33,7 @@ if ($remove_lock){
   }
 
   /* Get object */
-  $macroManagment= $_SESSION['macroManagment'];
+  $macroManagment = session::get('macroManagment');
   $macroManagment->save_object();
   $output= $macroManagment->execute();
 

diff --git a/gosa-core/plugins/gofon/phoneaccount/main.inc b/gosa-core/plugins/gofon/phoneaccount/main.inc
index 90c44943a0e587493ca6cc03f3213a345c792c23..fbc3f65af96c184200a48f8bc6ebda557a6a7311 100644 (file)
--- a/gosa-core/plugins/gofon/phoneaccount/main.inc
+++ b/gosa-core/plugins/gofon/phoneaccount/main.inc
@@ -36,7 +36,7 @@ if (!$remove_lock){
                $_SESSION['phoneAccount']->set_acl_base($ui->dn);
                $_SESSION['phoneAccount']->set_acl_category("users");
        }
-       $phoneAccount= $_SESSION['phoneAccount'];
+       $phoneAccount = session::get('phoneAccount');
 
        /* save changes back to object */
        if (session::is_set('edit')){

diff --git a/gosa-core/plugins/personal/connectivity/class_proxyAccount.inc b/gosa-core/plugins/personal/connectivity/class_proxyAccount.inc
index 3fa7d6d1b64f724e487e94734f22dca7d283f450..1df34586367e03f4c4336562705d6d84de0185ae 100644 (file)
--- a/gosa-core/plugins/personal/connectivity/class_proxyAccount.inc
+++ b/gosa-core/plugins/personal/connectivity/class_proxyAccount.inc
@@ -61,7 +61,7 @@ class proxyAccount extends plugin
         $smarty->assign($val."state", "");
       } else {
         $smarty->assign("filter$val", "");
-        if($_SESSION['js']==1){
+        if(session::get('js')==1){
           $smarty->assign($val."state", "disabled");
         }else{
           $smarty->assign($val."state", "");

diff --git a/gosa-core/plugins/personal/connectivity/class_pureftpdAccount.inc b/gosa-core/plugins/personal/connectivity/class_pureftpdAccount.inc
index 04474ae70c2a14552ec19d0bd6eb8d2e138284ce..dbcf2eba24da61a133f432f098598ae81b81e998 100644 (file)
--- a/gosa-core/plugins/personal/connectivity/class_pureftpdAccount.inc
+++ b/gosa-core/plugins/personal/connectivity/class_pureftpdAccount.inc
@@ -92,7 +92,7 @@ class pureftpdAccount extends plugin
         $smarty->assign("fstate", "");
       } else {
         $smarty->assign("pureftpdState", "");
-        if($_SESSION['js']==1){
+        if(session::get('js')==1){
           if($this->acl!="#none#")
             $smarty->assign("fstate", "disabled");
         }else{

diff --git a/gosa-core/plugins/personal/connectivity/main.inc b/gosa-core/plugins/personal/connectivity/main.inc
index 8f72a142a58d7fec9df88779b892282d6a4412a7..585a4628b33cbeb504e3c3a829be459598742c28 100644 (file)
--- a/gosa-core/plugins/personal/connectivity/main.inc
+++ b/gosa-core/plugins/personal/connectivity/main.inc
@@ -42,7 +42,7 @@ if (!$remove_lock){
       $_SESSION['connectivity']->plugin[$name]->set_acl_base($ui->dn);
     }
   }
-  $connectivity= $_SESSION['connectivity'];
+  $connectivity = session::get('connectivity');
 
   /* save changes back to object */
   if (session::is_set('edit')){

diff --git a/gosa-core/plugins/personal/environment/class_hotplugDialog.inc b/gosa-core/plugins/personal/environment/class_hotplugDialog.inc
index 2e772481d68d933dae335a02ea3a33a182632270..b3a20f8946e77eaece72c5f379abde401b6b6aea 100644 (file)
--- a/gosa-core/plugins/personal/environment/class_hotplugDialog.inc
+++ b/gosa-core/plugins/personal/environment/class_hotplugDialog.inc
@@ -19,7 +19,7 @@ class hotplugDialog extends plugin
   {
     $this->skipThese  = $skipThese;
     $this->config     = $config;
-    $this->depselect  = $_SESSION['CurrentMainBase'];
+    $this->depselect   = session::get('CurrentMainBase');
   }
 
   function execute()

diff --git a/gosa-core/plugins/personal/environment/main.inc b/gosa-core/plugins/personal/environment/main.inc
index cb2fb6b4dcf1bb8139c8b8122a8bc56da3ad0470..415e49124b17b21a22b88b6ee707f09fc7545b80 100644 (file)
--- a/gosa-core/plugins/personal/environment/main.inc
+++ b/gosa-core/plugins/personal/environment/main.inc
@@ -34,7 +34,7 @@ if (!$remove_lock){
     $_SESSION['environment']->set_acl_category('users');
     $_SESSION['environment']->set_acl_base($ui->dn);
   }
-  $environment= $_SESSION['environment'];
+  $environment = session::get('environment');
 
   /* save changes back to object */
   if (session::is_set('edit')){

diff --git a/gosa-core/plugins/personal/generic/main.inc b/gosa-core/plugins/personal/generic/main.inc
index 8d72c9fd1e157aac336c7d8a5ca723c6bfbeea23..752bffafe47acee81e2e6c3baac8dcd82e330c53 100644 (file)
--- a/gosa-core/plugins/personal/generic/main.inc
+++ b/gosa-core/plugins/personal/generic/main.inc
@@ -38,7 +38,7 @@ if (!$remove_lock){
     $_SESSION['user']->set_acl_base($ui->dn);
     $_SESSION['user']->set_acl_category("users");
   }
-  $user= $_SESSION['user'];
+  $user = session::get('user');
 
   /* save changes back to object */
   if (session::is_set('edit')){

diff --git a/gosa-core/plugins/personal/mail/main.inc b/gosa-core/plugins/personal/mail/main.inc
index e92e3b0ce23b063d69e52d85d0d0fa6eb2f7a64c..267dbb1f4f7286079cc8492c950ca18e326dc323 100644 (file)
--- a/gosa-core/plugins/personal/mail/main.inc
+++ b/gosa-core/plugins/personal/mail/main.inc
@@ -36,7 +36,7 @@ if (!$remove_lock){
     $_SESSION['mailAccount']->set_acl_base($ui->dn);
     $_SESSION['mailAccount']->set_acl_category("users");
   }
-  $mailAccount= $_SESSION['mailAccount'];
+  $mailAccount = session::get('mailAccount');
 
   /* save changes back to object */
   if (session::is_set('edit')){

diff --git a/gosa-core/plugins/personal/nagios/main.inc b/gosa-core/plugins/personal/nagios/main.inc
index 3d30664cb70f2eaa97b7f435a35bb14085953c25..6b486e3d56dc1bd645e06dd3ae837642e97b32cf 100644 (file)
--- a/gosa-core/plugins/personal/nagios/main.inc
+++ b/gosa-core/plugins/personal/nagios/main.inc
@@ -37,7 +37,7 @@ if (!$remove_lock){
     $_SESSION['nagiosAccount']->set_acl_base($ui->dn);
     $_SESSION['nagiosAccount']->set_acl_category("users");
   }
-  $nagiosAccount= $_SESSION['nagiosAccount'];
+  $nagiosAccount = session::get('nagiosAccount');
 
   /* save changes back to object */
   if (session::is_set('edit')){

diff --git a/gosa-core/plugins/personal/netatalk/class_netatalk.inc b/gosa-core/plugins/personal/netatalk/class_netatalk.inc
index 919e4f2dc8374924f0ae6ed62457858d8382a9c9..60794fab8e46a173c8d970aa0491dfe97e645eb3 100644 (file)
--- a/gosa-core/plugins/personal/netatalk/class_netatalk.inc
+++ b/gosa-core/plugins/personal/netatalk/class_netatalk.inc
@@ -115,7 +115,7 @@ class netatalk extends plugin {
     $ldap = $this->config->get_ldap_link();
 
     if($this->dn === "new" || $this->dn === NULL) {
-      $base = $_SESSION['CurrentMainBase'];
+      $base  = session::get('CurrentMainBase');
     } else {
       $base = preg_replace("/^[^,]+,".normalizePreg(get_people_ou())."/","",$this->dn);
     }

diff --git a/gosa-core/plugins/personal/netatalk/main.inc b/gosa-core/plugins/personal/netatalk/main.inc
index 2fca342da07d70cdab94639589e5fc997b114ca7..6e2585920c27b7dc065851ba82916f7e61ee54c5 100644 (file)
--- a/gosa-core/plugins/personal/netatalk/main.inc
+++ b/gosa-core/plugins/personal/netatalk/main.inc
@@ -34,7 +34,7 @@ if (!$remove_lock) {
     $_SESSION['netatalk']->set_acl_base($ui->dn);
     $_SESSION['netatalk']->set_acl_category("users");
   }
-  $netatalk = $_SESSION['netatalk'];
+  $netatalk  = session::get('netatalk');
 
   /* save changes back to object */
   if (session::is_set('edit')) {

diff --git a/gosa-core/plugins/personal/password/main.inc b/gosa-core/plugins/personal/password/main.inc
index bbc68fb0289626729b64baab24fadd770805231c..cfdc8f69ba53644efc4286e979e5836583bc9889 100644 (file)
--- a/gosa-core/plugins/personal/password/main.inc
+++ b/gosa-core/plugins/personal/password/main.inc
@@ -36,7 +36,7 @@ if (!$remove_lock){
   if (!session::is_set('password') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
     $_SESSION['password']= new password ($config, $ui->dn);
   }
-  $password= $_SESSION['password'];
+  $password = session::get('password');
 
   /* Execute formular */
   $display.= $password->execute ();

diff --git a/gosa-core/plugins/personal/posix/class_posixAccount.inc b/gosa-core/plugins/personal/posix/class_posixAccount.inc
index 911718e96d5820b5345b2e30f7a18795574da211..a12c53c52cf97bbe523f47fdcd1f42969d4a45dc 100644 (file)
--- a/gosa-core/plugins/personal/posix/class_posixAccount.inc
+++ b/gosa-core/plugins/personal/posix/class_posixAccount.inc
@@ -527,11 +527,11 @@ class posixAccount extends plugin
     /* Checkboxes */
     if ($this->force_ids == 1){
       $smarty->assign("force_ids", "checked");
-      if ($_SESSION['js']){
+      if (session::get('js')){
         $smarty->assign("forceMode", "");
       }
     } else {
-      if ($_SESSION['js']){
+      if (session::get('js')){
         $smarty->assign("forceMode", "disabled");
       }
       $smarty->assign("force_ids", "");
@@ -557,7 +557,7 @@ class posixAccount extends plugin
         $smarty->assign("use_".$val,FALSE);
       }
 
-      if(($_SESSION["js"])&&(($val=="uidNumber")||($val=="gidNumber")))
+      if((session::get("js"))&&(($val=="uidNumber")||($val=="gidNumber")))
       {
         $smarty->assign("$val"."ACL",$this->getacl($val,$SkipWrite));
         $smarty->assign("$val", $this->$val);
@@ -1284,7 +1284,7 @@ class posixAccount extends plugin
   function reload()
   {
     /* Set base for all searches */
-    $base     = $_SESSION['CurrentMainBase'];
+    $base      = session::get('CurrentMainBase');
     $base     = $base;
     $ldap     = $this->config->get_ldap_link();    
     $attrs    =  array("cn", "description", "gidNumber");
@@ -1364,11 +1364,11 @@ class posixAccount extends plugin
     if(!$this->is_account) return("");
     if ($this->force_ids == 1){
       $force_ids = "checked";
-      if ($_SESSION['js']){
+      if (session::get('js')){
         $forceMode = "";
       }
     } else {
-      if ($_SESSION['js']){
+      if (session::get('js')){
         if($this->acl != "#none#")
           $forceMode ="disabled";
       }

diff --git a/gosa-core/plugins/personal/posix/main.inc b/gosa-core/plugins/personal/posix/main.inc
index 571e88ba006ac2b407660365d84f3f2ac2956e32..a83757c31940f4f7c737a0cf857d561cc076be3a 100644 (file)
--- a/gosa-core/plugins/personal/posix/main.inc
+++ b/gosa-core/plugins/personal/posix/main.inc
@@ -37,7 +37,7 @@ if (!$remove_lock){
     $_SESSION['posixAccount']->set_acl_base($ui->dn);
     $_SESSION['posixAccount']->set_acl_category("users");
   }
-  $posixAccount= $_SESSION['posixAccount'];
+  $posixAccount = session::get('posixAccount');
 
   /* save changes back to object */
   if (session::is_set('edit')){

diff --git a/gosa-core/plugins/personal/samba/class_sambaAccount.inc b/gosa-core/plugins/personal/samba/class_sambaAccount.inc
index bb814dad4822221ffc09d93d95d29e2c90eb46d5..b6be2b8f6c2120008e3b3a3261ad8db1d9b40f5e 100644 (file)
--- a/gosa-core/plugins/personal/samba/class_sambaAccount.inc
+++ b/gosa-core/plugins/personal/samba/class_sambaAccount.inc
@@ -552,7 +552,7 @@ class sambaAccount extends plugin
       $smarty->assign("brokenconnmode", $this->mungedObject->getBrokenConn());
       $smarty->assign("reconnmode", $this->mungedObject->getReConn());
 
-      if($_SESSION['js']){
+      if(session::get('js')){
         /* Set form elements to disabled/enable state */
         $smarty->assign("tsloginstate", $this->mungedObject->getTsLogin()?"":"disabled");
 

diff --git a/gosa-core/plugins/personal/samba/main.inc b/gosa-core/plugins/personal/samba/main.inc
index 83e44cf208743ad8df2b7100bf9d64b64b3ef602..e37c8128b4a81d81371ae666b1538a08d629e179 100644 (file)
--- a/gosa-core/plugins/personal/samba/main.inc
+++ b/gosa-core/plugins/personal/samba/main.inc
@@ -37,7 +37,7 @@ if (!$remove_lock){
     $_SESSION['sambaAccount']->set_acl_base($ui->dn);
     $_SESSION['sambaAccount']->set_acl_category("users");
   }
-  $sambaAccount= $_SESSION['sambaAccount'];
+  $sambaAccount = session::get('sambaAccount');
 
   /* save changes back to object */
   if (session::is_set('edit')){

diff --git a/gosa-core/plugins/personal/scalix/main.inc b/gosa-core/plugins/personal/scalix/main.inc
index 3b913efe3722ae48c3535a55c4ef46e09e76d69e..d0532a257e10e00b5fc3db658d7a6cefc306cbe8 100644 (file)
--- a/gosa-core/plugins/personal/scalix/main.inc
+++ b/gosa-core/plugins/personal/scalix/main.inc
@@ -35,7 +35,7 @@ if (!$remove_lock){
     $_SESSION['scalixAccount']->set_acl_base($ui->dn);
     $_SESSION['scalixAccount']->set_acl_category("users");
   }
-  $scalixAccount= $_SESSION['scalixAccount'];
+  $scalixAccount = session::get('scalixAccount');
 
   /* save changes back to object */
   if (session::is_set('edit')){

diff --git a/gosa-core/setup/class_setup.inc b/gosa-core/setup/class_setup.inc
index 753751c52537d7e43e28845244038b07f8eea244..e16bc546a4e44e9544b1553d203a054c1dd60eec 100644 (file)
--- a/gosa-core/setup/class_setup.inc
+++ b/gosa-core/setup/class_setup.inc
@@ -198,7 +198,7 @@ class setup
         $s = "<img src='images/empty.png' alt=' ' class='center'>&nbsp;";
       }
 
-      if($_SESSION['js']){
+      if(session::get('js')){
 
         $str .="<div >";
     

diff --git a/gosa-core/setup/main.inc b/gosa-core/setup/main.inc
index 3abe6ccef592c35f45b93fa526018c2da3170650..b30822bc65d5bfbf133eb9e48629a58fbf1e3a6e 100644 (file)
--- a/gosa-core/setup/main.inc
+++ b/gosa-core/setup/main.inc
@@ -22,7 +22,7 @@
 if (!session::is_set('setup') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
   $_SESSION['setup']= new setup ();
 }
-$setup= $_SESSION['setup'];
+$setup = session::get('setup');
 
 /* Execute formular */
 $setup->save_object();