From: hickert Date: Fri, 4 Jan 2008 08:25:10 +0000 (+0000) Subject: Replaced session read processes X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ede91cea993d38464d47f6ef573ed70ce2cec357;p=gosa.git 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 e32eb158c..87fba5ce2 100644 --- 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 a9d7bc85d..07b84b3d3 100644 --- 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". "\n ". @@ -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 ". "\n ", $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
". @@ -739,7 +739,7 @@ class acl extends plugin $display.= str_repeat("\n  
". "\n ". diff --git a/gosa-core/include/class_ldap.inc b/gosa-core/include/class_ldap.inc index 11e3fc884..310aae104 100644 --- 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 8c3851808..89a704bb4 100644 --- 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 34f30c8fc..1fe5d5f06 100644 --- a/gosa-core/include/class_pluglist.inc +++ b/gosa-core/include/class_pluglist.inc @@ -169,7 +169,7 @@ class pluglist { $entries= $entries."

"; - if($_SESSION['js']){ + if(session::get('js')){ $entries.= _($plHeadline)."

\n"; } else { $entries.= "\"\"'; - if($_SESSION['js']){ + if(session::get('js')){ $current.= ''._($plHeadline).'
'._($plDescription); } else { $current.= ''._($plHeadline).'
'._($plDescription).''; @@ -287,7 +287,7 @@ class pluglist { } $entries= $entries.""; - if($_SESSION['js']){ + if(session::get('js')){ $entries.= "\"*\" ". _($plHeadline); diff --git a/gosa-core/include/class_sambaMungedDial.inc b/gosa-core/include/class_sambaMungedDial.inc index 03a5b8c30..9f0c0b42d 100644 --- 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 aa70a4626..4d5c69512 100644 --- 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.= "
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 4e06270fe..f83100d15 100644 --- 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 87cd43179..bef58098e 100644 --- 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 218d7ad0a..7cea93586 100644 --- 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 4962d5db6..eba85f1da 100644 --- 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 b2e0a0339..00c0cdae4 100644 --- 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 16c7e4473..545c0ea73 100644 --- 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 3383a010e..0c974af85 100644 --- 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 6427dbd8d..e150b0622 100644 --- 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 7d29cd261..3972b1269 100644 --- 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 adfd4f9a8..429b454f2 100644 --- 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 f0dbab6b2..66f23d30e 100644 --- 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 47be298a5..1415be066 100644 --- 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 7cd562153..7b0087844 100755 --- 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 db7a62bf4..de9c2a534 100644 --- 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 03803ff32..5399a29f1 100644 --- 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 d7cba42ea..7e6b1c705 100644 --- 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 005a6ea27..07189b177 100644 --- 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 792533f6d..3670a3af0 100644 --- 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 e7ab5a9b0..960b73e02 100644 --- 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 6c1fea191..048e29348 100644 --- 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 7819137a3..f0fe7f06a 100644 --- 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 d35648a8e..89e0b2d06 100644 --- 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 bef885e00..44621681f 100644 --- 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 a3cbe09dc..f21ab7cdc 100644 --- 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 d17e55122..5906069da 100644 --- 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 e5ab07827..9da0acb1e 100644 --- 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 be6f7b3fe..43baee578 100644 --- 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 742f76891..eb1ff800d 100644 --- 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 92506d1f1..2525acbd4 100755 --- 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 e1de54451..65019ac6c 100644 --- 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 701087ab9..cc95ba34a 100644 --- 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 6761f2f88..f289b4dc0 100644 --- 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 bcbd9b5f1..7d052d207 100644 --- 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 6e71b242e..b03aa140b 100644 --- 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 457acc4f4..aec2da2ae 100644 --- 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 2e6e2edc3..51c98ce5d 100644 --- 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 af5d400d3..fbb710f2d 100644 --- 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'> ". "
"; - $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 25df1dffc..cd011125b 100644 --- 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 ""; /* 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 1356557e4..5b0ec6708 100644 --- 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 ""; - $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 ea674e9de..5ee27ab39 100644 --- 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 cbb3883e6..a0c96ec9b 100644 --- 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 b2c739642..15c4c00ca 100644 --- 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 2476c807b..8c68cc421 100644 --- 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 74b4739ba..7dfbd6bad 100644 --- a/gosa-core/plugins/gofax/blocklists/main.inc +++ b/gosa-core/plugins/gofax/blocklists/main.inc @@ -1,7 +1,7 @@ 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 9c3389f4a..a9d45caee 100644 --- 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 b2421c979..58ca227c2 100644 --- 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 1ca4820aa..51194a30b 100644 --- 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 b6496a4b4..611f27773 100644 --- 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 f6defcac4..54abef0fc 100644 --- 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 fe6775c2f..1b5992cc5 100755 --- 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 e0422fa4d..691fd41a4 100755 --- 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 90c44943a..fbc3f65af 100644 --- 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 3fa7d6d1b..1df345863 100644 --- 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 04474ae70..dbcf2eba2 100644 --- 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 8f72a142a..585a4628b 100644 --- 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 2e772481d..b3a20f894 100644 --- 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 cb2fb6b4d..415e49124 100644 --- 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 8d72c9fd1..752bffafe 100644 --- 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 e92e3b0ce..267dbb1f4 100644 --- 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 3d30664cb..6b486e3d5 100644 --- 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 919e4f2dc..60794fab8 100644 --- 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 2fca342da..6e2585920 100644 --- 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 bbc68fb02..cfdc8f69b 100644 --- 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 911718e96..a12c53c52 100644 --- 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 571e88ba0..a83757c31 100644 --- 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 bb814dad4..b6be2b8f6 100644 --- 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 83e44cf20..e37c8128b 100644 --- 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 3b913efe3..d0532a257 100644 --- 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 753751c52..e16bc546a 100644 --- a/gosa-core/setup/class_setup.inc +++ b/gosa-core/setup/class_setup.inc @@ -198,7 +198,7 @@ class setup $s = "  "; } - if($_SESSION['js']){ + if(session::get('js')){ $str .="
"; diff --git a/gosa-core/setup/main.inc b/gosa-core/setup/main.inc index 3abe6ccef..b30822bc6 100644 --- 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();