From 54703a9b788754b473bf689deb9c1694ae27acae Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 4 Jan 2008 07:46:35 +0000 Subject: [PATCH] Some additional isset($_SESSION) modifications git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8205 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/include/class_MultiSelectWindow.inc | 2 +- gosa-core/include/class_msg_dialog.inc | 2 +- gosa-core/include/class_pluglist.inc | 2 +- gosa-core/plugins/addons/godfs/main.inc | 4 ++-- .../plugins/admin/applications/class_applicationGeneric.inc | 2 +- gosa-core/plugins/admin/applications/main.inc | 4 ++-- .../plugins/admin/departments/class_departmentGeneric.inc | 2 +- gosa-core/plugins/admin/devices/class_deviceGeneric.inc | 2 +- gosa-core/plugins/admin/devices/main.inc | 4 ++-- gosa-core/plugins/admin/fai/class_askClassName.inc | 2 +- gosa-core/plugins/admin/fai/class_divListFai.inc | 2 +- gosa-core/plugins/admin/fai/class_faiPackageEntry.inc | 2 +- gosa-core/plugins/admin/fai/main.inc | 4 ++-- gosa-core/plugins/admin/groups/class_groupGeneric.inc | 2 +- gosa-core/plugins/admin/groups/main.inc | 4 ++-- gosa-core/plugins/admin/mimetypes/class_mimetypeGeneric.inc | 2 +- gosa-core/plugins/admin/mimetypes/main.inc | 4 ++-- gosa-core/plugins/admin/ogroups/class_ogroup.inc | 2 +- gosa-core/plugins/admin/systems/class_systemManagement.inc | 6 +++--- .../admin/systems/ppd/class_printerPPDSelectionDialog.inc | 2 +- .../systems/services/glpi/class_glpiAttachmentPool.inc | 2 +- .../systems/services/glpi/class_glpiDeviceManagement.inc | 2 +- .../systems/services/glpi/class_glpiPrinterCartridges.inc | 2 +- gosa-core/plugins/admin/users/main.inc | 4 ++-- .../plugins/gofax/blocklists/class_blocklistGeneric.inc | 4 ++-- gosa-core/plugins/gofax/faxaccount/main.inc | 2 +- .../gofon/conference/class_phoneConferenceGeneric.inc | 2 +- gosa-core/plugins/gofon/macro/class_gofonMacro.inc | 2 +- gosa-core/plugins/gofon/macro/main.inc | 4 ++-- gosa-core/plugins/gofon/phoneaccount/main.inc | 2 +- gosa-core/plugins/personal/mail/main.inc | 2 +- gosa-core/plugins/personal/nagios/main.inc | 2 +- gosa-core/plugins/personal/posix/main.inc | 2 +- gosa-core/plugins/personal/samba/main.inc | 2 +- gosa-core/plugins/personal/scalix/main.inc | 2 +- 35 files changed, 46 insertions(+), 46 deletions(-) diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc index 3b8761790..bbdc5920d 100644 --- 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 4293414ca..efd6cab05 100644 --- a/gosa-core/include/class_msg_dialog.inc +++ b/gosa-core/include/class_msg_dialog.inc @@ -23,7 +23,7 @@ class msg_dialog $i_type = INFO_DIALOG; } - if((!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 1337de824..34f30c8fc 100644 --- a/gosa-core/include/class_pluglist.inc +++ b/gosa-core/include/class_pluglist.inc @@ -186,7 +186,7 @@ class pluglist { } $current.= ''; $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 1bd11d47c..30b434da3 100644 --- a/gosa-core/plugins/addons/godfs/main.inc +++ b/gosa-core/plugins/addons/godfs/main.inc @@ -1,6 +1,6 @@ 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 a8fb6bf24..95e5145a1 100644 --- 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 9d2b4d373..7d29cd261 100644 --- 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 668da2f7a..adfd4f9a8 100644 --- 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 a7e6df15c..47be298a5 100644 --- 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 86769df39..7cd562153 100755 --- 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 64d246695..db7a62bf4 100644 --- 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 602283d83..03803ff32 100644 --- 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 947493501..792533f6d 100644 --- 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 d9ccd1069..d17e55122 100644 --- 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 133cf5650..e5ab07827 100644 --- 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 f8f82c586..742f76891 100644 --- 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 c9eac57ab..05f868070 100644 --- 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 edfe3d9b3..92506d1f1 100755 --- 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 ffc8674db..e1de54451 100644 --- 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 58c0d0fc3..8b2bcc94b 100644 --- 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 d4f5d16b8..450da9347 100644 --- 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 7e5897a43..d315cebf8 100644 --- 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 619e8015f..af5d400d3 100644 --- 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 68413a064..25df1dffc 100644 --- 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 e7dd66372..cbb3883e6 100644 --- 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 bbb194262..b2c739642 100644 --- 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 605e17f47..26cdd6e1b 100644 --- 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 4f8d0d9d8..1ca4820aa 100644 --- 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 1dbb4ee22..fe6775c2f 100755 --- 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 402ca2e7c..e0422fa4d 100755 --- 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 06d7f6ccf..fd5f7d994 100644 --- 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 492639f32..8c63ae181 100644 --- 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 e554b0e8e..3bc236915 100644 --- 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 86d01d3b0..44c8c401f 100644 --- 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 e97e1ca7e..be3354ce3 100644 --- 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 bb2e1fd44..abfd65a45 100644 --- 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); -- 2.30.2