From: hickert Date: Fri, 4 Jan 2008 07:01:20 +0000 (+0000) Subject: Modified unset($_SESSION['...']) to session::unset(...) X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1e8f2011f6156e8d446113adcfa37f311cba1f6e;p=gosa.git Modified unset($_SESSION['...']) to session::unset(...) git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8203 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc index 68b073dee..3ad4fd81c 100644 --- a/gosa-core/include/class_config.inc +++ b/gosa-core/include/class_config.inc @@ -81,10 +81,10 @@ class config { xml_set_element_handler($this->parser, "tag_open", "tag_close"); $this->parse($this->filename); if(session::is_set('plist')){ - unset($_SESSION['plist']); + session::un_set('plist'); } if(session::is_set('plug')){ - unset($_SESSION['plug']); + session::un_set('plug'); } if(isset($_GET['plug'])){ unset($_GET['plug']); diff --git a/gosa-core/include/functions_helpviewer.inc b/gosa-core/include/functions_helpviewer.inc index c04b8ac95..2f2e9c814 100644 --- a/gosa-core/include/functions_helpviewer.inc +++ b/gosa-core/include/functions_helpviewer.inc @@ -270,7 +270,7 @@ function search($arr,$word) $useablewords =array(); // Temporary searchword handling $tryword = ""; // Temporary searchword handling $result['global']['maxhit'] = 0; - unset($_SESSION['lastresults']); + session::un_set('lastresults'); unset($_SESSION['parsed_search_keyword']); $_SESSION['parsed_search_keyword']=""; diff --git a/gosa-core/plugins/addons/godfs/class_dfsManagment.inc b/gosa-core/plugins/addons/godfs/class_dfsManagment.inc index 913b2707e..4144eac58 100644 --- a/gosa-core/plugins/addons/godfs/class_dfsManagment.inc +++ b/gosa-core/plugins/addons/godfs/class_dfsManagment.inc @@ -124,7 +124,7 @@ class dfsManagment extends plugin { unset ($this->dfstab); $this->dfstab = NULL; $this->dn = ""; - unset($_SESSION['objectinfo']); + session::un_set('objectinfo'); } # delete pressed @@ -150,7 +150,7 @@ class dfsManagment extends plugin { unset ($this->dfstab); $this->dfstab = NULL; $this->dn = ""; - unset($_SESSION['objectinfo']); + session::un_set('objectinfo'); } # generate main page no tabs diff --git a/gosa-core/plugins/admin/acl/class_aclManagement.inc b/gosa-core/plugins/admin/acl/class_aclManagement.inc index 7a1b2ab2b..7e77a07c7 100644 --- a/gosa-core/plugins/admin/acl/class_aclManagement.inc +++ b/gosa-core/plugins/admin/acl/class_aclManagement.inc @@ -204,7 +204,7 @@ class aclManagement extends plugin ********************/ if(isset($_POST['delete_lock'])){ del_lock ($this->dn); - unset($_SESSION['objectinfo']); + session::un_set('objectinfo'); } /* Reset all relevant data, if we get a _cancel request */ @@ -214,7 +214,7 @@ class aclManagement extends plugin unset ($this->acltabs); } $this->acltabs= NULL; - unset ($_SESSION['objectinfo']); + session::un_set('objectinfo'); } @@ -387,7 +387,7 @@ class aclManagement extends plugin unset ($this->acltabs); $this->acltabs= NULL; - unset ($_SESSION['objectinfo']); + session::un_set('objectinfo'); } } else { /* Ok. There seem to be errors regarding to the tab data, diff --git a/gosa-core/plugins/admin/applications/class_applicationManagement.inc b/gosa-core/plugins/admin/applications/class_applicationManagement.inc index f474b5b74..9804b330a 100644 --- a/gosa-core/plugins/admin/applications/class_applicationManagement.inc +++ b/gosa-core/plugins/admin/applications/class_applicationManagement.inc @@ -208,7 +208,7 @@ class applicationManagement extends plugin del_lock ($this->apptabs->dn); unset ($this->apptabs); $this->apptabs= NULL; - unset ($_SESSION['objectinfo']); + session::un_set('objectinfo'); } @@ -241,7 +241,7 @@ class applicationManagement extends plugin } unset ($this->apptabs); $this->apptabs= NULL; - unset ($_SESSION['objectinfo']); + session::un_set('objectinfo'); } } else { /* Ok. There seem to be errors regarding to the tab data, @@ -439,7 +439,7 @@ class applicationManagement extends plugin /* Delete application canceled? */ if (isset($_POST['delete_cancel'])){ del_lock ($this->dn); - unset($_SESSION['objectinfo']); + session::un_set('objectinfo'); } /* Show tab dialog if object is present */ diff --git a/gosa-core/plugins/admin/departments/class_departmentManagement.inc b/gosa-core/plugins/admin/departments/class_departmentManagement.inc index e2db188d1..99e308167 100644 --- a/gosa-core/plugins/admin/departments/class_departmentManagement.inc +++ b/gosa-core/plugins/admin/departments/class_departmentManagement.inc @@ -379,7 +379,7 @@ class departmentManagement extends plugin } unset ($this->deptabs); $this->deptabs= NULL; - unset ($_SESSION['objectinfo']); + session::un_set('objectinfo'); } @@ -394,7 +394,7 @@ class departmentManagement extends plugin del_lock ($this->dn); unset($this->depdabs); $this->deptabs= NULL; - unset ($_SESSION['objectinfo']); + session::un_set('objectinfo'); } /* Headpage or normal plugin screen? */ diff --git a/gosa-core/plugins/admin/devices/class_deviceManagement.inc b/gosa-core/plugins/admin/devices/class_deviceManagement.inc index 2558cc135..a70644c54 100644 --- a/gosa-core/plugins/admin/devices/class_deviceManagement.inc +++ b/gosa-core/plugins/admin/devices/class_deviceManagement.inc @@ -146,7 +146,7 @@ class deviceManagement extends plugin del_lock ($this->devicetabs->dn); unset ($this->devicetabs); $this->devicetabs= NULL; - unset ($_SESSION['objectinfo']); + session::un_set('objectinfo'); } @@ -176,7 +176,7 @@ class deviceManagement extends plugin } unset ($this->devicetabs); $this->devicetabs= NULL; - unset ($_SESSION['objectinfo']); + session::un_set('objectinfo'); } } else { /* Ok. There seem to be errors regarding to the tab data, @@ -374,7 +374,7 @@ class deviceManagement extends plugin /* Delete device canceled? */ if (isset($_POST['delete_cancel'])){ del_lock ($this->dn); - unset($_SESSION['objectinfo']); + session::un_set('objectinfo'); } /* Show tab dialog if object is present */ diff --git a/gosa-core/plugins/admin/fai/class_faiManagement.inc b/gosa-core/plugins/admin/fai/class_faiManagement.inc index 178f00035..b0e6a92ea 100644 --- a/gosa-core/plugins/admin/fai/class_faiManagement.inc +++ b/gosa-core/plugins/admin/fai/class_faiManagement.inc @@ -757,7 +757,7 @@ class faiManagement extends plugin unset($this->dialog); $this->dialog=FALSE; $this->is_dialog = false; - unset($_SESSION['objectinfo']); + session::un_set('objectinfo'); del_lock ($this->dn); } @@ -785,7 +785,7 @@ class faiManagement extends plugin unset($this->dialog); $this->dialog=FALSE; $this->is_dialog=false; - unset($_SESSION['objectinfo']); + session::un_set('objectinfo'); } } } diff --git a/gosa-core/plugins/admin/groups/class_groupManagement.inc b/gosa-core/plugins/admin/groups/class_groupManagement.inc index dbd073532..fb8d01489 100644 --- a/gosa-core/plugins/admin/groups/class_groupManagement.inc +++ b/gosa-core/plugins/admin/groups/class_groupManagement.inc @@ -209,7 +209,7 @@ class groupManagement extends plugin //$this->reload (); unset ($this->grouptab); $this->grouptab= NULL; - unset ($_SESSION['objectinfo']); + session::un_set('objectinfo'); } } else { /* Ok. There seem to be errors regarding to the tab data, @@ -395,7 +395,7 @@ class groupManagement extends plugin /* Remove lock file after successfull deletion */ del_lock ($this->dn); - unset($_SESSION['objectinfo']); + session::un_set('objectinfo'); } @@ -406,7 +406,7 @@ class groupManagement extends plugin /* Delete group canceled? */ if (isset($_POST['delete_cancel'])){ del_lock ($this->dn); - unset($_SESSION['objectinfo']); + session::un_set('objectinfo'); } @@ -421,7 +421,7 @@ class groupManagement extends plugin } unset ($this->grouptab); $this->grouptab= NULL; - unset($_SESSION['objectinfo']); + session::un_set('objectinfo'); } diff --git a/gosa-core/plugins/admin/mimetypes/class_mimetypeManagement.inc b/gosa-core/plugins/admin/mimetypes/class_mimetypeManagement.inc index 4f8caed82..b52fed080 100755 --- a/gosa-core/plugins/admin/mimetypes/class_mimetypeManagement.inc +++ b/gosa-core/plugins/admin/mimetypes/class_mimetypeManagement.inc @@ -207,7 +207,7 @@ class mimetypeManagement extends plugin del_lock ($this->mimetabs->dn); unset ($this->mimetabs); $this->mimetabs= NULL; - unset ($_SESSION['objectinfo']); + session::un_set('objectinfo'); } @@ -237,7 +237,7 @@ class mimetypeManagement extends plugin } unset ($this->mimetabs); $this->mimetabs= NULL; - unset ($_SESSION['objectinfo']); + session::un_set('objectinfo'); } } else { /* Ok. There seem to be errors regarding to the tab data, @@ -439,7 +439,7 @@ class mimetypeManagement extends plugin /* Delete mime type canceled? */ if (isset($_POST['delete_cancel'])){ del_lock ($this->dn); - unset($_SESSION['objectinfo']); + session::un_set('objectinfo'); } /* Show tab dialog if object is present */ diff --git a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc index dc0d3188a..9bce9c372 100644 --- a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc +++ b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc @@ -297,7 +297,7 @@ class ogroupManagement extends plugin /* Remove lock file after successfull deletion */ del_lock ($this->dn); - unset($_SESSION['objectinfo']); + session::un_set('objectinfo'); } @@ -308,7 +308,7 @@ class ogroupManagement extends plugin /* Delete group canceled? */ if (isset($_POST['delete_cancel'])){ del_lock ($this->dn); - unset($_SESSION['objectinfo']); + session::un_set('objectinfo'); } @@ -363,7 +363,7 @@ class ogroupManagement extends plugin unset ($this->ogroup); $this->ogroup= NULL; - unset ($_SESSION['objectinfo']); + session::un_set('objectinfo'); } } else { /* Ok. There seem to be errors regarding to the tab data, @@ -382,7 +382,7 @@ class ogroupManagement extends plugin del_lock ($this->ogroup->dn); unset ($this->ogroup); $this->ogroup= NULL; - unset($_SESSION['objectinfo']); + session::un_set('objectinfo'); } diff --git a/gosa-core/plugins/admin/systems/class_systemManagement.inc b/gosa-core/plugins/admin/systems/class_systemManagement.inc index 205e70316..bb986e9dc 100644 --- a/gosa-core/plugins/admin/systems/class_systemManagement.inc +++ b/gosa-core/plugins/admin/systems/class_systemManagement.inc @@ -459,7 +459,7 @@ class systems extends plugin }else{ print_red(_("Can't detect object to change password.")); } - unset($_SESSION['objectinfo']); + session::un_set('objectinfo'); } @@ -470,7 +470,7 @@ class systems extends plugin /* Delete terminal canceled? */ if (isset($_POST['delete_cancel']) || isset($_POST['password_cancel'])){ del_lock ($this->dn); - unset($_SESSION['objectinfo']); + session::un_set('objectinfo'); } @@ -801,7 +801,7 @@ class systems extends plugin unset ($this->systab); $this->systab= NULL; - unset($_SESSION['objectinfo']); + session::un_set('objectinfo'); } else { /* Ok. There seem to be errors regarding to the tab data, show message and continue as usual. */ @@ -820,7 +820,7 @@ class systems extends plugin unset ($this->systab); } $this->systab= NULL; - unset($_SESSION['objectinfo']); + session::un_set('objectinfo'); /* Remove ogroup selection, which was set while editing a new incoming entry */ if(isset($_SESSION['SelectedSystemType'])){ diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc index 0b9e6ffad..f4641b984 100644 --- a/gosa-core/plugins/admin/users/class_userManagement.inc +++ b/gosa-core/plugins/admin/users/class_userManagement.inc @@ -248,7 +248,7 @@ class userManagement extends plugin $this->sn= ""; $this->givenName= ""; $this->uid= ""; - unset ($_SESSION['objectinfo']); + session::un_set('objectinfo'); } @@ -372,7 +372,7 @@ class userManagement extends plugin $this->sn= ""; $this->givenName= ""; $this->uid= ""; - unset ($_SESSION['objectinfo']); + session::un_set('objectinfo'); } @@ -622,7 +622,7 @@ class userManagement extends plugin unset ($this->usertab); $this->usertab= NULL; - unset ($_SESSION['objectinfo']); + session::un_set('objectinfo'); } } else { /* Ok. There seem to be errors regarding to the tab data, diff --git a/gosa-core/plugins/gofax/blocklists/class_blocklistManagement.inc b/gosa-core/plugins/gofax/blocklists/class_blocklistManagement.inc index c7e1175c6..5b0ac1d0c 100644 --- a/gosa-core/plugins/gofax/blocklists/class_blocklistManagement.inc +++ b/gosa-core/plugins/gofax/blocklists/class_blocklistManagement.inc @@ -124,7 +124,7 @@ class blocklist extends plugin del_lock ($this->dn); $this->dialog = NULL; - unset($_SESSION['objectinfo']); + session::un_set('objectinfo'); } @@ -146,7 +146,7 @@ class blocklist extends plugin del_lock ($this->dn); $this->dn= ""; $this->dialog = NULL; - unset($_SESSION['objectinfo']); + session::un_set('objectinfo'); } } else { /* Errors found, show message */ diff --git a/gosa-core/plugins/gofon/conference/class_phoneConferenceManagment.inc b/gosa-core/plugins/gofon/conference/class_phoneConferenceManagment.inc index eabc6e2ae..2f711df44 100644 --- a/gosa-core/plugins/gofon/conference/class_phoneConferenceManagment.inc +++ b/gosa-core/plugins/gofon/conference/class_phoneConferenceManagment.inc @@ -152,7 +152,7 @@ class phoneConferenceManagment extends plugin $this->conftab= NULL; $this->lognames= array();; $this->cn= ""; - unset ($_SESSION['objectinfo']); + session::un_set('objectinfo'); } @@ -319,7 +319,7 @@ class phoneConferenceManagment extends plugin $this->dn= "new"; $this->conftab= new conferencetabs($this->config,$this->config->data['TABS']['CONFERENCETABS'], $this->dn,"gofonconference"); $this->conftab->set_acl_base($dummy_dn); - unset($_SESSION['objectinfo']); + session::un_set('objectinfo'); } } @@ -351,7 +351,7 @@ class phoneConferenceManagment extends plugin del_lock ($this->conftab->dn);; unset ($this->conftab); $this->conftab= NULL; - unset ($_SESSION['objectinfo']); + session::un_set('objectinfo'); } else { show_errors($message); } diff --git a/gosa-core/plugins/gofon/macro/class_gofonMacroManagement.inc b/gosa-core/plugins/gofon/macro/class_gofonMacroManagement.inc index 764a445bb..91738fd7e 100755 --- a/gosa-core/plugins/gofon/macro/class_gofonMacroManagement.inc +++ b/gosa-core/plugins/gofon/macro/class_gofonMacroManagement.inc @@ -162,7 +162,7 @@ class goFonMacro extends plugin del_lock ($this->macrotabs->dn); unset ($this->macrotabs); $this->macrotabs= NULL; - unset ($_SESSION['objectinfo']); + session::un_set('objectinfo'); } @@ -195,7 +195,7 @@ class goFonMacro extends plugin unset ($this->macrotabs); $this->macrotabs= NULL; - unset ($_SESSION['objectinfo']); + session::un_set('objectinfo'); } } else { /* Ok. There seem to be errors regarding to the tab data,