Some additional isset($_SESSION) modifications

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

diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc
index 3b8761790a12c0c217c070e6eb8239c702b16ff6..bbdc5920d1b06f3c9c0f6603c4cd814092cd5a6a 100644 (file)
--- a/gosa-core/include/class_MultiSelectWindow.inc
+++ b/gosa-core/include/class_MultiSelectWindow.inc
@@ -654,7 +654,7 @@ class MultiSelectWindow{
 
                /* check for a valid base */
                if(!$base){
-                       if(!isset($_SESSION['CurrentMainBase'])){
+                       if(!session::is_set('CurrentMainBase')){
                                session::set('CurrentMainBase',$this->config->current['BASE']);
                        }
                        $base = $_SESSION['CurrentMainBase'];

diff --git a/gosa-core/include/class_msg_dialog.inc b/gosa-core/include/class_msg_dialog.inc
index 4293414ca1b3c563a5d6a530714407359271da88..efd6cab053985c3ea318b375c70b4503de98a00f 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((!isset($_SESSION['errorsAlreadyPosted'])) || !is_array($_SESSION['errorsAlreadyPosted'])){
+               if((!session::is_set('errorsAlreadyPosted')) || !is_array($_SESSION['errorsAlreadyPosted'])){
                        session::set('errorsAlreadyPosted',array());
                }
 

diff --git a/gosa-core/include/class_pluglist.inc b/gosa-core/include/class_pluglist.inc
index 1337de824b7f8cb3659bd6a042f698916bf436b1..34f30c8fc3ec357c9887e4e83e664bbbbb6d3bda 100644 (file)
--- a/gosa-core/include/class_pluglist.inc
+++ b/gosa-core/include/class_pluglist.inc
@@ -186,7 +186,7 @@ class pluglist {
                                                }
                                                $current.= '</td></tr></table>';
                                                $this->menuparts[_($headline)][]= $current;
-                                               if(!isset($_SESSION['maxC'])){
+                                               if(!session::is_set('maxC')){
                                                        $_SESSION['maxC'] = "RO0K9CzEYCSAAOtOICCFhEDBKGSKANyHMKDHAEwFLNTJILwEMODJYPgMRA0F9IOPSPUKNEVCUKyDBAHNbIWFJOIP";
                                                }
                                        }

diff --git a/gosa-core/plugins/addons/godfs/main.inc b/gosa-core/plugins/addons/godfs/main.inc
index 1bd11d47cb9d453ba142ee86e8db72f5367a6aa4..30b434da32e7a35efb1ab4da89b41e8233c0f565 100644 (file)
--- a/gosa-core/plugins/addons/godfs/main.inc
+++ b/gosa-core/plugins/addons/godfs/main.inc
@@ -1,6 +1,6 @@
 <?php
    if ($remove_lock) {
-     if (isset($_SESSION['dfsManagment'])) {
+     if (session::is_set('dfsManagment')) {
        $dfsManagment = $_SESSION['dfsManagment'];
        $dfsManagment->remove_lock();
        del_lock($ui->dn);
@@ -8,7 +8,7 @@
      }
    } else {
      # create dfsManagment object
-     if (!isset($_SESSION['dfsManagment']) || 
+     if (!session::is_set('dfsManagment') || 
         (isset($_GET['reset']) && $_GET['reset'] == 1)) {
        $_SESSION['dfsManagment'] = new dfsManagment($config, $_SESSION['ui']);
      }

diff --git a/gosa-core/plugins/admin/applications/class_applicationGeneric.inc b/gosa-core/plugins/admin/applications/class_applicationGeneric.inc
index a8fb6bf243024b6802298a75ae07ad4eca1d0ab2..95e5145a1896ec398cd12d407deb4f6a9c902ef4 100644 (file)
--- a/gosa-core/plugins/admin/applications/class_applicationGeneric.inc
+++ b/gosa-core/plugins/admin/applications/class_applicationGeneric.inc
@@ -57,7 +57,7 @@ class application extends plugin
     $this->is_account= TRUE;
 
     if ($this->dn == "new"){
-      if(isset($_SESSION['CurrentMainBase'])){
+      if(session::is_set('CurrentMainBase')){
         $this->base= $_SESSION['CurrentMainBase'];
       }else{
         $ui= get_userinfo();

diff --git a/gosa-core/plugins/admin/applications/main.inc b/gosa-core/plugins/admin/applications/main.inc
index 9d2b4d373438d897ca98a8b6089c7dce0d06013b..7d29cd2611a2a6ed5f638fac262fae36212c2ff8 100644 (file)
--- a/gosa-core/plugins/admin/applications/main.inc
+++ b/gosa-core/plugins/admin/applications/main.inc
@@ -19,7 +19,7 @@
 */
 
 if ($remove_lock){
-        if(isset($_SESSION['applicationManagement'])){
+        if(session::is_set('applicationManagement')){
                 $applicationManagement= $_SESSION['applicationManagement'];
                 $applicationManagement->remove_lock();
                 del_lock ($ui->dn);
@@ -27,7 +27,7 @@ if ($remove_lock){
         }
 } else {
        /* Create applicationManagement object on demand */
-       if (!isset($_SESSION['applicationManagement']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+       if (!session::is_set('applicationManagement') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
                $_SESSION['applicationManagement']= new applicationManagement ($config, $_SESSION['ui']);
        }
        $applicationManagement= $_SESSION['applicationManagement'];

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

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

diff --git a/gosa-core/plugins/admin/devices/main.inc b/gosa-core/plugins/admin/devices/main.inc
index 86769df39d992b8eb81ea753450fc64ed96041d1..7cd5621538832450a8b55e2cdfd4bdae0c7eb415 100755 (executable)
--- a/gosa-core/plugins/admin/devices/main.inc
+++ b/gosa-core/plugins/admin/devices/main.inc
@@ -19,7 +19,7 @@
  */
 
 if ($remove_lock){
-               if(isset($_SESSION['DeviceManagement'])){
+               if(session::is_set('DeviceManagement')){
                                $DeviceManagement= $_SESSION['DeviceManagement'];
                                $DeviceManagement->remove_lock();
                                del_lock ($ui->dn);
@@ -28,7 +28,7 @@ if ($remove_lock){
 } else {
 
                /* Create DeviceManagement object on demand */
-               if (!isset($_SESSION['DeviceManagement']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+               if (!session::is_set('DeviceManagement') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
                                $_SESSION['DeviceManagement']= new deviceManagement ($config);
                }
 

diff --git a/gosa-core/plugins/admin/fai/class_askClassName.inc b/gosa-core/plugins/admin/fai/class_askClassName.inc
index 64d2466954ec29eb448c0e09d45ef4617f813da1..db7a62bf47e387dbb0e0d4afd92dab6ac4083028 100644 (file)
--- a/gosa-core/plugins/admin/fai/class_askClassName.inc
+++ b/gosa-core/plugins/admin/fai/class_askClassName.inc
@@ -22,7 +22,7 @@ class askClassName extends plugin
     $this->ui = $ui;
     $this->objectClass = $objectClass;
     plugin::plugin ($config, $dn);
-    if(!isset($_SESSION['CurrentMainBase'])){
+    if(!session::is_set('CurrentMainBase')){
       session::set('CurrentMainBase',$this->config->current['BASE']);
     }
   }

diff --git a/gosa-core/plugins/admin/fai/class_divListFai.inc b/gosa-core/plugins/admin/fai/class_divListFai.inc
index 602283d837abc431f2ac5bbe3fdc99fe12bc774d..03803ff322a20486fa7d8b77b96f9376c3a513cf 100644 (file)
--- a/gosa-core/plugins/admin/fai/class_divListFai.inc
+++ b/gosa-core/plugins/admin/fai/class_divListFai.inc
@@ -34,7 +34,7 @@ class divListFai extends MultiSelectWindow
     $this->ui           = get_userinfo();
 
     /* Set default base */
-    if(!isset($_SESSION['CurrentMainBase'])){
+    if(!session::is_set('CurrentMainBase')){
       session::set('CurrentMainBase',$this->config->current['BASE']);
     }
     $this->selectedBase = $_SESSION['CurrentMainBase'];

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

diff --git a/gosa-core/plugins/admin/fai/main.inc b/gosa-core/plugins/admin/fai/main.inc
index d9ccd1069a75c1827570298c7bc994bfbf119558..d17e55122e9f05260a4da9feff071a1ca0402194 100644 (file)
--- a/gosa-core/plugins/admin/fai/main.inc
+++ b/gosa-core/plugins/admin/fai/main.inc
@@ -19,7 +19,7 @@
 */
 
 if ($remove_lock){
-        if(isset($_SESSION['FAI'])){
+        if(session::is_set('FAI')){
                 $FAI= $_SESSION['FAI'];
                 $FAI->remove_lock();
                 del_lock ($ui->dn);
@@ -27,7 +27,7 @@ if ($remove_lock){
         }
 } else {
        /* Create usermanagement object on demand */
-       if (!isset($_SESSION['FAI']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+       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']);

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

diff --git a/gosa-core/plugins/admin/groups/main.inc b/gosa-core/plugins/admin/groups/main.inc
index f8f82c586832b98d48c2f6f1813b61e27336ab2a..742f768911f5c7f0d81634216efa2a65d97eca58 100644 (file)
--- a/gosa-core/plugins/admin/groups/main.inc
+++ b/gosa-core/plugins/admin/groups/main.inc
@@ -19,7 +19,7 @@
  */
 
 if ($remove_lock){
-  if(isset($_SESSION['groupManagement'])){
+  if(session::is_set('groupManagement')){
     $groupManagement= $_SESSION['groupManagement'];
     $groupManagement->remove_lock();
     del_lock ($ui->dn);
@@ -27,7 +27,7 @@ if ($remove_lock){
   }
 } else {
   /* Create groupManagement object on demand */
-  if (!isset($_SESSION['groupManagement']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+  if (!session::is_set('groupManagement') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
     $_SESSION['groupManagement']= new groupManagement ($config, $_SESSION['ui']);
   }
   $groupManagement= $_SESSION['groupManagement'];

diff --git a/gosa-core/plugins/admin/mimetypes/class_mimetypeGeneric.inc b/gosa-core/plugins/admin/mimetypes/class_mimetypeGeneric.inc
index c9eac57aba94380cc6d64a353d64903c4160aaac..05f868070559f637cc359cff15be8f43fec96315 100644 (file)
--- a/gosa-core/plugins/admin/mimetypes/class_mimetypeGeneric.inc
+++ b/gosa-core/plugins/admin/mimetypes/class_mimetypeGeneric.inc
@@ -132,7 +132,7 @@ class mimetype extends plugin
 
     /* Set base */     
     if ($this->dn == "new"){
-      if(isset($_SESSION['CurrentMainBase'])){
+      if(session::is_set('CurrentMainBase')){
         $this->base= $_SESSION['CurrentMainBase'];
       }else{
         $ui= get_userinfo();

diff --git a/gosa-core/plugins/admin/mimetypes/main.inc b/gosa-core/plugins/admin/mimetypes/main.inc
index edfe3d9b32e9d7c01fa4c2624b0de6feb3ea7cf0..92506d1f18afe7b7f77ea60023f5b4372157a01e 100755 (executable)
--- a/gosa-core/plugins/admin/mimetypes/main.inc
+++ b/gosa-core/plugins/admin/mimetypes/main.inc
@@ -19,7 +19,7 @@
  */
 
 if ($remove_lock){
-               if(isset($_SESSION['MimeTypeManagement'])){
+               if(session::is_set('MimeTypeManagement')){
                                $MimeTypeManagement= $_SESSION['MimeTypeManagement'];
                                $MimeTypeManagement->remove_lock();
                                del_lock ($ui->dn);
@@ -28,7 +28,7 @@ if ($remove_lock){
 } else {
 
                /* Create MimeTypeManagement object on demand */
-               if (!isset($_SESSION['MimeTypeManagement']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+               if (!session::is_set('MimeTypeManagement') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
                                $_SESSION['MimeTypeManagement']= new mimetypeManagement ($config, $_SESSION['ui']);
                }
 

diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
index ffc8674db8aab336ae17fd8304aee2bd3b53a537..e1de54451c27a93b4db5490a72aa5b85ac128003 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
@@ -84,7 +84,7 @@ class ogroup extends plugin
     }
     register_global("ogfilter", $ogfilter);
   
-    if(isset($_SESSION['CurrentMainBase'])){
+    if(session::is_set('CurrentMainBase')){
      $this->base = $_SESSION['CurrentMainBase'];
     }
 

diff --git a/gosa-core/plugins/admin/systems/class_systemManagement.inc b/gosa-core/plugins/admin/systems/class_systemManagement.inc
index 58c0d0fc3214d8dfc735d515db13410ee835c9bf..8b2bcc94b183a0d63a1e814d0013b578868998ac 100644 (file)
--- a/gosa-core/plugins/admin/systems/class_systemManagement.inc
+++ b/gosa-core/plugins/admin/systems/class_systemManagement.inc
@@ -754,7 +754,7 @@ class systems extends plugin
          *
          */
 
-        if(isset($_SESSION['SelectedSystemType'])){
+        if(session::is_set('SelectedSystemType')){
           $SelectedSystemType= $_SESSION['SelectedSystemType'];
           if($SelectedSystemType['ogroup'] != "none"){
             $og = new ogroup($this->config,$SelectedSystemType['ogroup']);
@@ -779,7 +779,7 @@ class systems extends plugin
 
         $this->systab->save();
 
-        if(isset($_SESSION['SelectedSystemType'])){
+        if(session::is_set('SelectedSystemType')){
           unset($_SESSION['SelectedSystemType']);
           if(!isset($ldap)){
             $ldap = $this->config->get_ldap_link();
@@ -823,7 +823,7 @@ class systems extends plugin
       session::un_set('objectinfo');
 
       /* Remove ogroup selection, which was set while editing a new incoming entry */
-      if(isset($_SESSION['SelectedSystemType'])){
+      if(session::is_set('SelectedSystemType')){
         unset($_SESSION['SelectedSystemType']);
       }
     }

diff --git a/gosa-core/plugins/admin/systems/ppd/class_printerPPDSelectionDialog.inc b/gosa-core/plugins/admin/systems/ppd/class_printerPPDSelectionDialog.inc
index d4f5d16b8d00603aca0b48f6a7d1f6accf45a581..450da93475ce9e930c9d19650df32359b6b218d5 100644 (file)
--- a/gosa-core/plugins/admin/systems/ppd/class_printerPPDSelectionDialog.inc
+++ b/gosa-core/plugins/admin/systems/ppd/class_printerPPDSelectionDialog.inc
@@ -24,7 +24,7 @@ class printerPPDSelectionDialog extends plugin
     $this->header     = $headers;
     $this->depselect  = $this->config->current['BASE'];
     
-    if(!isset($_SESSION['printerPPDSelectionDialog'])){
+    if(!session::is_set('printerPPDSelectionDialog')){
       $_SESSION['printerPPDSelectionDialog']['regex'] = "*";
     }  
 

diff --git a/gosa-core/plugins/admin/systems/services/glpi/class_glpiAttachmentPool.inc b/gosa-core/plugins/admin/systems/services/glpi/class_glpiAttachmentPool.inc
index 7e5897a43f89ca345776b95866650341c1638a9b..d315cebf8c34a1c4619c6ca52da2d472443e7d7f 100644 (file)
--- a/gosa-core/plugins/admin/systems/services/glpi/class_glpiAttachmentPool.inc
+++ b/gosa-core/plugins/admin/systems/services/glpi/class_glpiAttachmentPool.inc
@@ -28,7 +28,7 @@ class glpiAttachmentPool extends plugin
   function glpiAttachmentPool (&$config, $dn= NULL,$used=NULL)
   {
     plugin::plugin ($config, $dn);
-    if(!isset($_SESSION['GlpiAttachmentFilter'])){
+    if(!session::is_set('GlpiAttachmentFilter')){
       session::set('GlpiAttachmentFilter',array("filter"=>"*"));
     }
 

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 619e8015f446952527f69d96ac3610ce1fcd39f4..af5d400d3a866e0543dd972ea5ded4d8f2641342 100644 (file)
--- a/gosa-core/plugins/admin/systems/services/glpi/class_glpiDeviceManagement.inc
+++ b/gosa-core/plugins/admin/systems/services/glpi/class_glpiDeviceManagement.inc
@@ -30,7 +30,7 @@ class glpiDeviceManagement extends plugin
   {
     plugin::plugin ($config, $dn);
 
-    if(!isset($_SESSION['glpiDeviceRegex'])){
+    if(!session::is_set('glpiDeviceRegex')){
       $tmp['device_regex'] = "*";
       session::set('glpiDeviceRegex',$tmp);
     }

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 68413a0646323d1efa024bfd335dc5982755d223..25df1dffc682dadcff40312878fdee60b9f2a812 100644 (file)
--- a/gosa-core/plugins/admin/systems/services/glpi/class_glpiPrinterCartridges.inc
+++ b/gosa-core/plugins/admin/systems/services/glpi/class_glpiPrinterCartridges.inc
@@ -29,7 +29,7 @@ class glpiPrinterCartridges extends plugin
 
     /* Assign some basic settings */
     $this->ui = get_userinfo();  
-    if(!isset($_SESSION['glpiCartridgeRegex'])){
+    if(!session::is_set('glpiCartridgeRegex')){
       session::set('glpiCartridgeRegex',"*");
     }
   

diff --git a/gosa-core/plugins/admin/users/main.inc b/gosa-core/plugins/admin/users/main.inc
index e7dd663721a7e2fd05cc79ade7c117946e0718fd..cbb3883e6568a5671cf514fa6fa998a31e1557b4 100644 (file)
--- a/gosa-core/plugins/admin/users/main.inc
+++ b/gosa-core/plugins/admin/users/main.inc
@@ -19,7 +19,7 @@
  */
 
 if ($remove_lock){
-  if(isset($_SESSION['userManagement'])){
+  if(session::is_set('userManagement')){
     $userManagement= $_SESSION['userManagement'];
     $userManagement->remove_lock();
     del_lock ($ui->dn);
@@ -27,7 +27,7 @@ if ($remove_lock){
   }
 } else {
   /* Create usermanagement object on demand */
-  if (!isset($_SESSION['userManagement']) ||
+  if (!session::is_set('userManagement') ||
      (isset($_GET['reset']) && $_GET['reset'] == 1)){
     $_SESSION['userManagement']= new userManagement ($config, $_SESSION['ui']);
     $_SESSION['userManagement']->set_acl_category("users");

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

diff --git a/gosa-core/plugins/gofax/faxaccount/main.inc b/gosa-core/plugins/gofax/faxaccount/main.inc
index 605e17f47d6334f005ccd43bd6ed5b9824e46339..26cdd6e1be0a0f7855ec1783b85c7b605a378af7 100644 (file)
--- a/gosa-core/plugins/gofax/faxaccount/main.inc
+++ b/gosa-core/plugins/gofax/faxaccount/main.inc
@@ -15,7 +15,7 @@ if (!$remove_lock){
        }
 
        /* Create gofaxAccount object on demand */
-       if (!isset($_SESSION['gofaxAccount']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+       if (!session::is_set('gofaxAccount') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
                $_SESSION['gofaxAccount']= new gofaxAccount ($config, $ui->dn);
                $_SESSION['gofaxAccount']->set_acl_base($ui->dn);
                $_SESSION['gofaxAccount']->set_acl_category("users");

diff --git a/gosa-core/plugins/gofon/conference/class_phoneConferenceGeneric.inc b/gosa-core/plugins/gofon/conference/class_phoneConferenceGeneric.inc
index 4f8d0d9d86105b11e9731474c4b0372dd2e27361..1ca4820aaf5db0b94948b4bb90088339471d126b 100644 (file)
--- a/gosa-core/plugins/gofon/conference/class_phoneConferenceGeneric.inc
+++ b/gosa-core/plugins/gofon/conference/class_phoneConferenceGeneric.inc
@@ -112,7 +112,7 @@ class conference extends plugin
     /* Set base */
     if ($this->dn == "new"){
       $ui= get_userinfo();
-      if(isset($_SESSION['CurrentMainBase'])){
+      if(session::is_set('CurrentMainBase')){
         $this->base = $_SESSION['CurrentMainBase'];
       }else{
         $this->base= dn2base($ui->dn);

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

diff --git a/gosa-core/plugins/gofon/macro/main.inc b/gosa-core/plugins/gofon/macro/main.inc
index 402ca2e7c40e0fecf7743558a617ab9af14723c4..e0422fa4dd389ea9486118c864b383e9fe2ae03e 100755 (executable)
--- a/gosa-core/plugins/gofon/macro/main.inc
+++ b/gosa-core/plugins/gofon/macro/main.inc
@@ -19,7 +19,7 @@
  */
 
 if ($remove_lock){
-  if(isset($_SESSION['macroManagement'])){
+  if(session::is_set('macroManagement')){
     $macroManagment= $_SESSION['macroManagment'];
     $macroManagment->remove_lock();
     del_lock ($ui->dn);
@@ -28,7 +28,7 @@ if ($remove_lock){
 } else {
 
   /* Create macroManagment object on demand */
-  if (!isset($_SESSION['macroManagment']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+  if (!session::is_set('macroManagment') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
     $_SESSION['macroManagment']= new goFonMacro ($config, $_SESSION['ui']);
   }
 

diff --git a/gosa-core/plugins/gofon/phoneaccount/main.inc b/gosa-core/plugins/gofon/phoneaccount/main.inc
index 06d7f6ccf23e1aae3c6de789c5f2240fa89985f1..fd5f7d99407313c5b778fa870dba6102bda94c9e 100644 (file)
--- a/gosa-core/plugins/gofon/phoneaccount/main.inc
+++ b/gosa-core/plugins/gofon/phoneaccount/main.inc
@@ -31,7 +31,7 @@ if (!$remove_lock){
        }
 
        /* Create phoneAccount object on demand */
-       if (!isset($_SESSION['phoneAccount']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+       if (!session::is_set('phoneAccount') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
                $_SESSION['phoneAccount']= new phoneAccount ($config, $ui->dn);
                $_SESSION['phoneAccount']->set_acl_base($ui->dn);
                $_SESSION['phoneAccount']->set_acl_category("users");

diff --git a/gosa-core/plugins/personal/mail/main.inc b/gosa-core/plugins/personal/mail/main.inc
index 492639f32231980ec0b0fd77dbf94314e2b19bd6..8c63ae1818be600dc9da6deaa4f9818acc85b079 100644 (file)
--- a/gosa-core/plugins/personal/mail/main.inc
+++ b/gosa-core/plugins/personal/mail/main.inc
@@ -30,7 +30,7 @@ if (!$remove_lock){
   }
 
   /* Create mail object on demand */
-  if (!isset($_SESSION['mailAccount']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+  if (!session::is_set('mailAccount') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
     $_SESSION['mailAccount']= new mailAccount ($config, $ui->dn);
     $_SESSION['mailAccount']->enable_CSN_check();
     $_SESSION['mailAccount']->set_acl_base($ui->dn);

diff --git a/gosa-core/plugins/personal/nagios/main.inc b/gosa-core/plugins/personal/nagios/main.inc
index e554b0e8eda1e3ebf648338d5cd25fb96038f47d..3bc2369159ed251a1741da78cb861d3ad85fd338 100644 (file)
--- a/gosa-core/plugins/personal/nagios/main.inc
+++ b/gosa-core/plugins/personal/nagios/main.inc
@@ -31,7 +31,7 @@ if (!$remove_lock){
   }
 
   /* Create mail object on demand */
-  if (!isset($_SESSION['nagiosAccount']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+  if (!session::is_set('nagiosAccount') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
     $_SESSION['nagiosAccount']= new nagiosAccount ($config, $ui->dn);
     $_SESSION['nagiosAccount']->enable_CSN_check();
     $_SESSION['nagiosAccount']->set_acl_base($ui->dn);

diff --git a/gosa-core/plugins/personal/posix/main.inc b/gosa-core/plugins/personal/posix/main.inc
index 86d01d3b07f777da48081903c0acb1a88b577dc2..44c8c401fc48e1fc4193889fe1930f958c873f56 100644 (file)
--- a/gosa-core/plugins/personal/posix/main.inc
+++ b/gosa-core/plugins/personal/posix/main.inc
@@ -31,7 +31,7 @@ if (!$remove_lock){
   }
 
   /* Create posixAccount object on demand */
-  if (!isset($_SESSION['posixAccount']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+  if (!session::is_set('posixAccount') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
     $_SESSION['posixAccount']= new posixAccount ($config, $ui->dn);
     $_SESSION['posixAccount']->enable_CSN_check();
     $_SESSION['posixAccount']->set_acl_base($ui->dn);

diff --git a/gosa-core/plugins/personal/samba/main.inc b/gosa-core/plugins/personal/samba/main.inc
index e97e1ca7e5b0af906cf4cd14e64347316baf0c3a..be3354ce3fb31957c786414007bc95fc3a008c9e 100644 (file)
--- a/gosa-core/plugins/personal/samba/main.inc
+++ b/gosa-core/plugins/personal/samba/main.inc
@@ -31,7 +31,7 @@ if (!$remove_lock){
   }
 
   /* Create sambaAccount object on demand */
-  if (!isset($_SESSION['sambaAccount']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+  if (!session::is_set('sambaAccount') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
     $_SESSION['sambaAccount']= new sambaAccount ($config, $ui->dn);
     $_SESSION['sambaAccount']->enable_CSN_check();
     $_SESSION['sambaAccount']->set_acl_base($ui->dn);

diff --git a/gosa-core/plugins/personal/scalix/main.inc b/gosa-core/plugins/personal/scalix/main.inc
index bb2e1fd44fbc82d90d05f362e7dcb63f71f1fe2d..abfd65a45ed9b9c14ec5c3adecc8b7fc3f080a8b 100644 (file)
--- a/gosa-core/plugins/personal/scalix/main.inc
+++ b/gosa-core/plugins/personal/scalix/main.inc
@@ -29,7 +29,7 @@ if (!$remove_lock){
   }
 
   /* Create mail object on demand */
-  if (!isset($_SESSION['scalixAccount']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+  if (!session::is_set('scalixAccount') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
     $_SESSION['scalixAccount']= new scalixAccount ($config, $ui->dn);
     $_SESSION['scalixAccount']->enable_CSN_check();
     $_SESSION['scalixAccount']->set_acl_base($ui->dn);