From: hickert Date: Fri, 4 Jan 2008 07:20:34 +0000 (+0000) Subject: Mass checkin. X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=951ff52238278141c5d423bda877eea92c86ce32;p=gosa.git Mass checkin. Modified session assignments from $_SESSION['...'] = ...; to session::set('...','...'); git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8204 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc index f2be83034..3b8761790 100644 --- a/gosa-core/include/class_MultiSelectWindow.inc +++ b/gosa-core/include/class_MultiSelectWindow.inc @@ -533,7 +533,7 @@ class MultiSelectWindow{ } } } - $_SESSION['CurrentMainBase'] = $this->selectedBase; + session::set('CurrentMainBase',$this->selectedBase); if(isset($_POST['MultiSelectWindow'.$this->filterName])){ @@ -655,7 +655,7 @@ class MultiSelectWindow{ /* check for a valid base */ if(!$base){ if(!isset($_SESSION['CurrentMainBase'])){ - $_SESSION['CurrentMainBase'] = $this->config->current['BASE']; + session::set('CurrentMainBase',$this->config->current['BASE']); } $base = $_SESSION['CurrentMainBase']; } diff --git a/gosa-core/include/class_acl.inc b/gosa-core/include/class_acl.inc index f5b26e32f..a9d7bc85d 100644 --- a/gosa-core/include/class_acl.inc +++ b/gosa-core/include/class_acl.inc @@ -1058,7 +1058,7 @@ class acl extends plugin /* Refresh users ACLs */ $ui= get_userinfo(); $ui->loadACL(); - $_SESSION['ui']= $ui; + session::set('ui',$ui); } diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc index 3ad4fd81c..0b4b92eb6 100644 --- a/gosa-core/include/class_config.inc +++ b/gosa-core/include/class_config.inc @@ -226,8 +226,8 @@ class config { } if (!isset($_SESSION['size_limit'])){ - $_SESSION['size_limit']= $this->current['SIZELIMIT']; - $_SESSION['size_ignore']= $this->current['SIZEIGNORE']; + session::set('size_limit',$this->current['SIZELIMIT']); + session::set('size_ignore',$this->current['SIZEIGNORE']); } if ($sizelimit){ @@ -257,7 +257,7 @@ class config { } if (isset($this->current['INITIAL_BASE'])){ - $_SESSION['CurrentMainBase']= $this->current['INITIAL_BASE']; + session::set('CurrentMainBase',$this->current['INITIAL_BASE']); } /* Remove possibly added ',' from end of group and people ou */ diff --git a/gosa-core/include/class_msg_dialog.inc b/gosa-core/include/class_msg_dialog.inc index 538dc152a..4293414ca 100644 --- a/gosa-core/include/class_msg_dialog.inc +++ b/gosa-core/include/class_msg_dialog.inc @@ -24,7 +24,7 @@ class msg_dialog } if((!isset($_SESSION['errorsAlreadyPosted'])) || !is_array($_SESSION['errorsAlreadyPosted'])){ - $_SESSION['errorsAlreadyPosted'] = array(); + session::set('errorsAlreadyPosted',array()); } if(!isset($_SESSION['errorsAlreadyPosted'][$s_title.$s_message])){ @@ -47,7 +47,7 @@ class msg_dialog $this->a_Trace = debug_backtrace(); } if(!isset($_SESSION['msg_dialogs'])){ - $_SESSION['msg_dialogs'] = array(); + session::set('msg_dialogs',array()); } if($this->i_Type == FATAL_ERROR_DIALOG){ restore_error_handler(); diff --git a/gosa-core/include/class_plugin.inc b/gosa-core/include/class_plugin.inc index fea28591a..b33e609e2 100644 --- a/gosa-core/include/class_plugin.inc +++ b/gosa-core/include/class_plugin.inc @@ -239,10 +239,11 @@ class plugin function execute() { /* This one is empty currently. Fabian - please fill in the docu code */ - $_SESSION['current_class_for_help'] = get_class($this); + session::set('current_class_for_help',get_class($this)); /* Reset Lock message POST/GET check array, to prevent perg_match errors*/ - $_SESSION['LOCK_VARS_TO_USE'] = $_SESSION['LOCK_VARS_USED'] =array(); + session::set('LOCK_VARS_TO_USE',array()); + session::set('LOCK_VARS_USED',array()); } /*! \brief execute plugin @@ -1755,10 +1756,11 @@ class plugin function multiple_execute() { /* This one is empty currently. Fabian - please fill in the docu code */ - $_SESSION['current_class_for_help'] = get_class($this); + session::set('current_class_for_help',get_class($this)); /* Reset Lock message POST/GET check array, to prevent perg_match errors*/ - $_SESSION['LOCK_VARS_TO_USE'] = $_SESSION['LOCK_VARS_USED'] =array(); + session::set('LOCK_VARS_TO_USE',array()); + session::set('LOCK_VARS_USED',array()); return("Multiple edit is currently not implemented for this plugin."); } diff --git a/gosa-core/include/class_userinfo.inc b/gosa-core/include/class_userinfo.inc index 097c7ccdc..77015dad2 100644 --- a/gosa-core/include/class_userinfo.inc +++ b/gosa-core/include/class_userinfo.inc @@ -66,7 +66,7 @@ class userinfo $this->ip= $_SERVER['REMOTE_ADDR']; /* Initialize ACL_CACHE */ - $_SESSION['ACL_CACHE']= array(); + session::set('ACL_CACHE',array()); $this->reset_acl_cache(); } @@ -74,7 +74,7 @@ class userinfo public function reset_acl_cache() { /* Initialize ACL_CACHE */ - $_SESSION['ACL_CACHE']= array(); + session::set('ACL_CACHE',array()); } function loadACL() diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc index 77ccf4d13..6937598f2 100644 --- a/gosa-core/include/functions.inc +++ b/gosa-core/include/functions.inc @@ -360,7 +360,7 @@ function ldap_login_user_htaccess ($username) $ui->loadACL(); /* TODO: check java script for htaccess authentication */ - $_SESSION['js']= true; + session::set('js',true); return ($ui); } diff --git a/gosa-core/include/functions_FAI.inc b/gosa-core/include/functions_FAI.inc index d01cfbc7e..92a350e4d 100644 --- a/gosa-core/include/functions_FAI.inc +++ b/gosa-core/include/functions_FAI.inc @@ -378,7 +378,7 @@ function save_release_changes_now() } } } - $_SESSION['FAI_objects_to_save'] = array(); + session::set('FAI_objects_to_save',array()); } diff --git a/gosa-core/include/functions_helpviewer.inc b/gosa-core/include/functions_helpviewer.inc index 2f2e9c814..1339332ac 100644 --- a/gosa-core/include/functions_helpviewer.inc +++ b/gosa-core/include/functions_helpviewer.inc @@ -272,7 +272,7 @@ function search($arr,$word) $result['global']['maxhit'] = 0; session::un_set('lastresults'); unset($_SESSION['parsed_search_keyword']); - $_SESSION['parsed_search_keyword']=""; + session::set('parsed_search_keyword',""); error_reporting(E_ALL | E_STRICT); @@ -341,7 +341,7 @@ function search($arr,$word) } /* Save result in Session, so we can mark words later, or go back to search, without searching again*/ - $_SESSION['lastresults'] = $result; + session::set('lastresults',$result); return($result); } diff --git a/gosa-core/plugins/addons/godfs/class_dfsManagment.inc b/gosa-core/plugins/addons/godfs/class_dfsManagment.inc index 4144eac58..cb8db375f 100644 --- a/gosa-core/plugins/addons/godfs/class_dfsManagment.inc +++ b/gosa-core/plugins/addons/godfs/class_dfsManagment.inc @@ -96,7 +96,7 @@ class dfsManagment extends plugin { $this->dfstab = new dfstabs($this->config, $this->config->data['TABS']['DFSTABS'], $this->dn); $this->dfstab->set_acl($this->acl); $this->dfstab->save_object(); - $_SESSION['objectinfo']= $this->dn; + session::set('objectinfo',$this->dn); } } diff --git a/gosa-core/plugins/addons/godfs/main.inc b/gosa-core/plugins/addons/godfs/main.inc index 433f9be92..1bd11d47c 100644 --- a/gosa-core/plugins/addons/godfs/main.inc +++ b/gosa-core/plugins/addons/godfs/main.inc @@ -36,7 +36,7 @@ $display.= $output; # show page - $_SESSION['dfsManagment'] = $dfsManagment; + session::set('dfsManagment',$dfsManagment); } ?> diff --git a/gosa-core/plugins/addons/gotomasses/main.inc b/gosa-core/plugins/addons/gotomasses/main.inc index 2de044572..4e06270fe 100644 --- a/gosa-core/plugins/addons/gotomasses/main.inc +++ b/gosa-core/plugins/addons/gotomasses/main.inc @@ -51,5 +51,5 @@ if (!$remove_lock){ $display= print_header(get_template_path('images/system.png'), _("System deployment")).$display; /* Store changes in session */ - $_SESSION['gotomasses']= $gotomasses; + session::set('gotomasses',$gotomasses); } diff --git a/gosa-core/plugins/addons/ldapmanager/main.inc b/gosa-core/plugins/addons/ldapmanager/main.inc index f2955a35c..87cd43179 100644 --- a/gosa-core/plugins/addons/ldapmanager/main.inc +++ b/gosa-core/plugins/addons/ldapmanager/main.inc @@ -34,6 +34,6 @@ if (!$remove_lock){ $display= print_header(get_template_path('images/ldif.png'), _("LDAP manager")).$display; /* Store changes in session */ - $_SESSION['ldif']= $ldif; + session::set('ldif',$ldif); } ?> diff --git a/gosa-core/plugins/addons/logview/main.inc b/gosa-core/plugins/addons/logview/main.inc index 9ecb3161d..f6767de94 100644 --- a/gosa-core/plugins/addons/logview/main.inc +++ b/gosa-core/plugins/addons/logview/main.inc @@ -34,6 +34,6 @@ if (!$remove_lock){ $display= print_header(get_template_path('images/logview.png'), _("System log view")).$display; /* Store changes in session */ - $_SESSION['log_tabs']= $log_tabs; + session::set('log_tabs',$log_tabs); } ?> diff --git a/gosa-core/plugins/addons/mailqueue/main.inc b/gosa-core/plugins/addons/mailqueue/main.inc index 37dca88c2..4962d5db6 100644 --- a/gosa-core/plugins/addons/mailqueue/main.inc +++ b/gosa-core/plugins/addons/mailqueue/main.inc @@ -42,6 +42,6 @@ if (!$remove_lock){ $display= print_header(get_template_path('images/mailqueue.png'), _("Mail queue")).$display; /* Store changes in session */ - $_SESSION['mailqueue']= $mailqueue; + session::set('mailqueue',$mailqueue); } ?> diff --git a/gosa-core/plugins/addons/notifications/main.inc b/gosa-core/plugins/addons/notifications/main.inc index 6d7245c75..b2e0a0339 100644 --- a/gosa-core/plugins/addons/notifications/main.inc +++ b/gosa-core/plugins/addons/notifications/main.inc @@ -46,6 +46,6 @@ if (!$remove_lock){ $display= print_header(get_template_path('images/notifications.png'), _("Notifications")).$display; /* Store changes in session */ - $_SESSION['msgplug']= $msgplug; + session::set('msgplug',$msgplug); } ?> diff --git a/gosa-core/plugins/admin/acl/class_aclManagement.inc b/gosa-core/plugins/admin/acl/class_aclManagement.inc index 7e77a07c7..6db90f32f 100644 --- a/gosa-core/plugins/admin/acl/class_aclManagement.inc +++ b/gosa-core/plugins/admin/acl/class_aclManagement.inc @@ -54,7 +54,7 @@ class aclManagement extends plugin /* Call parent execute */ plugin::execute(); - $_SESSION['LOCK_VARS_TO_USE'] = array("/^list/","/^id_/","/^list_acl_role_del/","/^list_acl_del/"); + session::set('LOCK_VARS_TO_USE',array("/^list/","/^id_/","/^list_acl_role_del/","/^list_acl_del/")); $smarty = get_smarty(); // Smarty instance $s_action = ""; // Contains the action to be taken @@ -192,7 +192,7 @@ class aclManagement extends plugin } /* Set ACL and move DN to the headline */ - $_SESSION['objectinfo']= $this->dn; + session::set('objectinfo',$this->dn); }else{ print_red(_("You are not allowed to edit this acl.")); } @@ -297,7 +297,7 @@ class aclManagement extends plugin /* Check locking, save current plugin in 'back_plugin', so the dialog knows where to return. */ if (($acl= get_lock($this->dn)) != ""){ - $_SESSION['LOCK_VARS_TO_USE'] = array("/^list_acl_edit/","/^list_acl_del/","/^id_/"); + session::set('LOCK_VARS_TO_USE',array("/^list_acl_edit/","/^list_acl_del/","/^id_/")); return(gen_locked_message ($acl, $this->dn)); } diff --git a/gosa-core/plugins/admin/acl/class_aclRole.inc b/gosa-core/plugins/admin/acl/class_aclRole.inc index 18bf440dc..16c7e4473 100644 --- a/gosa-core/plugins/admin/acl/class_aclRole.inc +++ b/gosa-core/plugins/admin/acl/class_aclRole.inc @@ -566,7 +566,7 @@ class aclrole extends acl /* Refresh users ACLs */ $ui= get_userinfo(); $ui->loadACL(); - $_SESSION['ui']= $ui; + session::set('ui',$ui); } diff --git a/gosa-core/plugins/admin/acl/main.inc b/gosa-core/plugins/admin/acl/main.inc index 914817c8e..3383a010e 100644 --- a/gosa-core/plugins/admin/acl/main.inc +++ b/gosa-core/plugins/admin/acl/main.inc @@ -52,6 +52,6 @@ if (!session::is_set('macl') || (isset($_GET['reset']) && $_GET['reset'] == 1)){ } $display.= $output; - $_SESSION['macl']= $macl; + session::set('macl',$macl); } ?> diff --git a/gosa-core/plugins/admin/applications/class_applicationGeneric.inc b/gosa-core/plugins/admin/applications/class_applicationGeneric.inc index 65cb8b75a..a8fb6bf24 100644 --- a/gosa-core/plugins/admin/applications/class_applicationGeneric.inc +++ b/gosa-core/plugins/admin/applications/class_applicationGeneric.inc @@ -49,8 +49,8 @@ class application extends plugin if ($this->iconData == ""){ $this->set_picture(""); } - $_SESSION['binary']= $this->iconData; - $_SESSION['binarytype']= "image/jpeg"; + session::set('binary',$this->iconData); + session::set('binarytype',"image/jpeg"); $this->gosaApplicationIcon= $this->iconData; /* This is always an account */ @@ -138,17 +138,17 @@ class application extends plugin /* Download requested */ foreach($_POST as $name => $value){ if(preg_match("/^downloadScript/",$name)){ - $_SESSION['binary'] = $this->gotoLogonScript; - $_SESSION['binarytype'] = "octet-stream"; - $_SESSION['binaryfile'] = $this->cn.".gosaApplication"; + session::set('binary',$this->gotoLogonScript); + session::set('binarytype',"octet-stream"); + session::set('binaryfile',$this->cn.".gosaApplication"); header("location: getbin.php "); exit(); } } /* Reassign picture data, sometimes its corrupt cause we started a download of application scripts */ - $_SESSION['binary'] = $this->iconData; - $_SESSION['binarytype'] = "image/jpeg"; + session::set('binary',$this->iconData); + session::set('binarytype',"image/jpeg"); $smarty->assign("rand", rand(0, 10000)); $head = $this->generateTemplate(); @@ -487,8 +487,8 @@ class application extends plugin if (file_exists($filename)){ $fd = fopen ($filename, "rb"); $this->iconData= fread ($fd, filesize ($filename)); - $_SESSION['binary']= $this->iconData; - $_SESSION['binarytype']= "image/jpeg"; + session::set('binary',$this->iconData); + session::set('binarytype',"image/jpeg"); $this->gosaApplicationIcon= $this->iconData; fclose ($fd); diff --git a/gosa-core/plugins/admin/applications/class_applicationManagement.inc b/gosa-core/plugins/admin/applications/class_applicationManagement.inc index 9804b330a..c7810321e 100644 --- a/gosa-core/plugins/admin/applications/class_applicationManagement.inc +++ b/gosa-core/plugins/admin/applications/class_applicationManagement.inc @@ -105,7 +105,7 @@ class applicationManagement extends plugin /* These vars will be stored if you try to open a locked app, to be able to perform your last requests after showing a warning message */ - $_SESSION['LOCK_VARS_TO_USE'] = array("/^act$/","/^id$/","/^appl_edit_/","/^appl_del_/","/^item_selected/","/^remove_multiple_applications/"); + session::set('LOCK_VARS_TO_USE',array("/^act$/","/^id$/","/^appl_edit_/","/^appl_del_/","/^item_selected/","/^remove_multiple_applications/")); $smarty = get_smarty(); // Smarty instance $s_action = ""; // Contains the action to proceed @@ -274,7 +274,7 @@ class applicationManagement extends plugin /* Register apptabs to trigger edit dialog */ $this->apptabs= new apptabs($this->config,$this->config->data['TABS']['APPSTABS'], $this->dn,"application"); $this->apptabs->set_acl_base($this->dn); - $_SESSION['objectinfo']= $this->dn; + session::set('objectinfo',$this->dn); } diff --git a/gosa-core/plugins/admin/applications/main.inc b/gosa-core/plugins/admin/applications/main.inc index 51011b31a..9d2b4d373 100644 --- a/gosa-core/plugins/admin/applications/main.inc +++ b/gosa-core/plugins/admin/applications/main.inc @@ -49,7 +49,7 @@ if ($remove_lock){ /* Show and save dialog */ $display.= $output; - $_SESSION['applicationManagement']= $applicationManagement; + session::set('applicationManagement',$applicationManagement); } ?> diff --git a/gosa-core/plugins/admin/departments/class_departmentManagement.inc b/gosa-core/plugins/admin/departments/class_departmentManagement.inc index 99e308167..5eef20099 100644 --- a/gosa-core/plugins/admin/departments/class_departmentManagement.inc +++ b/gosa-core/plugins/admin/departments/class_departmentManagement.inc @@ -63,7 +63,7 @@ class departmentManagement extends plugin Var init ***************/ - $_SESSION['LOCK_VARS_TO_USE'] = array("/^act$/","/^id$/","/^dep_edit_.*/","/^dep_del_.*/","/^item_selected/","/^remove_multiple_departments/"); + session::set('LOCK_VARS_TO_USE',array("/^act$/","/^id$/","/^dep_edit_.*/","/^dep_del_.*/","/^item_selected/","/^remove_multiple_departments/")); /* Reload departments */ $smarty = get_smarty(); @@ -143,7 +143,7 @@ class departmentManagement extends plugin $this->deptabs= new deptabs($this->config,$this->config->data['TABS']['DEPTABS'], $this->dn,"department"); $this->deptabs->set_acl_base($this->dn); - $_SESSION['objectinfo']= $this->dn; + session::set('objectinfo',$this->dn); } @@ -241,7 +241,7 @@ class departmentManagement extends plugin /* Check locking */ if (($user= get_lock($this->dn)) != ""){ - $_SESSION['dn']= $this->dn; + session::set('dn',$this->dn); return(gen_locked_message($user, $this->dn)); } else { add_lock ($this->dn, $this->ui->dn); diff --git a/gosa-core/plugins/admin/departments/main.inc b/gosa-core/plugins/admin/departments/main.inc index 76d816ccb..f0dbab6b2 100644 --- a/gosa-core/plugins/admin/departments/main.inc +++ b/gosa-core/plugins/admin/departments/main.inc @@ -50,7 +50,7 @@ if ($remove_lock){ } $display.= $output; - $_SESSION['department']= $department; + session::set('department',$department); $config = $department->config; } diff --git a/gosa-core/plugins/admin/devices/class_deviceManagement.inc b/gosa-core/plugins/admin/devices/class_deviceManagement.inc index a70644c54..d66e15c39 100644 --- a/gosa-core/plugins/admin/devices/class_deviceManagement.inc +++ b/gosa-core/plugins/admin/devices/class_deviceManagement.inc @@ -210,7 +210,7 @@ class deviceManagement extends plugin /* Register devicetabs to trigger edit dialog */ $this->devicetabs= new devicetabs($this->config,$this->config->data['TABS']['DEVICETABS'], $this->dn,"devices"); $this->devicetabs->set_acl_base($this->dn); - $_SESSION['objectinfo']= $this->dn; + session::set('objectinfo',$this->dn); } diff --git a/gosa-core/plugins/admin/devices/main.inc b/gosa-core/plugins/admin/devices/main.inc index e56937a62..86769df39 100755 --- a/gosa-core/plugins/admin/devices/main.inc +++ b/gosa-core/plugins/admin/devices/main.inc @@ -52,6 +52,6 @@ if ($remove_lock){ /* Show and save dialog */ $display.= $output; - $_SESSION['DeviceManagement']= $DeviceManagement; + session::set('DeviceManagement',$DeviceManagement); } ?> diff --git a/gosa-core/plugins/admin/fai/class_askClassName.inc b/gosa-core/plugins/admin/fai/class_askClassName.inc index 54ec897fb..64d246695 100644 --- a/gosa-core/plugins/admin/fai/class_askClassName.inc +++ b/gosa-core/plugins/admin/fai/class_askClassName.inc @@ -23,7 +23,7 @@ class askClassName extends plugin $this->objectClass = $objectClass; plugin::plugin ($config, $dn); if(!isset($_SESSION['CurrentMainBase'])){ - $_SESSION['CurrentMainBase'] = $this->config->current['BASE']; + 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 b15485c82..602283d83 100644 --- a/gosa-core/plugins/admin/fai/class_divListFai.inc +++ b/gosa-core/plugins/admin/fai/class_divListFai.inc @@ -35,7 +35,7 @@ class divListFai extends MultiSelectWindow /* Set default base */ if(!isset($_SESSION['CurrentMainBase'])){ - $_SESSION['CurrentMainBase'] = $this->config->current['BASE']; + session::set('CurrentMainBase',$this->config->current['BASE']); } $this->selectedBase = $_SESSION['CurrentMainBase']; diff --git a/gosa-core/plugins/admin/fai/class_faiHook.inc b/gosa-core/plugins/admin/fai/class_faiHook.inc index ce60202a3..d7cba42ea 100644 --- a/gosa-core/plugins/admin/fai/class_faiHook.inc +++ b/gosa-core/plugins/admin/fai/class_faiHook.inc @@ -174,7 +174,7 @@ class faiHook extends plugin $this->dialog->set_acl_base($this->acl_base_for_current_object($obj['dn'])); $this->dialog->set_acl_category("fai"); - $_SESSION['objectinfo'] = $obj['dn']; + session::set('objectinfo',$obj['dn']); $this->dialog->parent = &$this; $this->is_dialog=true; } @@ -207,7 +207,7 @@ class faiHook extends plugin } $this->dialog= new $this->subClassName($this->config,$this->dn,$obj); $this->dialog->acl = $this->acl; - $_SESSION['objectinfo'] = $obj['dn']; + session::set('objectinfo',$obj['dn']); $this->dialog->parent = &$this; $this->is_dialog=true; } diff --git a/gosa-core/plugins/admin/fai/class_faiManagement.inc b/gosa-core/plugins/admin/fai/class_faiManagement.inc index b0e6a92ea..005a6ea27 100644 --- a/gosa-core/plugins/admin/fai/class_faiManagement.inc +++ b/gosa-core/plugins/admin/fai/class_faiManagement.inc @@ -83,7 +83,7 @@ class faiManagement extends plugin $s_entry = ""; /* If an entry was locked, these vars will be stored in a session to allow direct edit */ - $_SESSION['LOCK_VARS_TO_USE'] = array("/^edit_entry$/","/^id$/","/^entry_edit_/","/^entry_delete_/","/^item_selected/","/^remove_multiple_fai_objects/"); + session::set('LOCK_VARS_TO_USE',array("/^edit_entry$/","/^id$/","/^entry_edit_/","/^entry_delete_/","/^item_selected/","/^remove_multiple_fai_objects/")); /**************** @@ -400,7 +400,7 @@ class faiManagement extends plugin #$this->dialog->set_acl(array("*none*")) ; echo "Dawn it is freezed."; } - $_SESSION['objectinfo'] = $this->dn; + session::set('objectinfo',$this->dn); } @@ -476,7 +476,7 @@ class faiManagement extends plugin ****************/ if((isset($_POST['UseBranchName']))&&(($this->dispNewBranch)||($this->dispNewFreeze))){ - $_SESSION['LASTPOST'] = $_POST; + session::set('LASTPOST',$_POST); if($this->dispNewBranch){ $type = "branch"; diff --git a/gosa-core/plugins/admin/fai/class_faiPackageEntry.inc b/gosa-core/plugins/admin/fai/class_faiPackageEntry.inc index 1b22ba869..947493501 100644 --- a/gosa-core/plugins/admin/fai/class_faiPackageEntry.inc +++ b/gosa-core/plugins/admin/fai/class_faiPackageEntry.inc @@ -147,7 +147,7 @@ $CHKS = "searchStrPKG; + session::set('searchStrPKG',$this->searchStrPKG); $smarty->assign("CHKS" , $CHKS); $smarty->assign("searchStrPKG" , $this->searchStrPKG); $smarty->assign("faihead" , ""); diff --git a/gosa-core/plugins/admin/fai/class_faiPartitionTable.inc b/gosa-core/plugins/admin/fai/class_faiPartitionTable.inc index 216d6c3ed..e7ab5a9b0 100644 --- a/gosa-core/plugins/admin/fai/class_faiPartitionTable.inc +++ b/gosa-core/plugins/admin/fai/class_faiPartitionTable.inc @@ -153,7 +153,7 @@ class faiPartitionTable extends plugin */ if($this->dn != "new"){ - $_SESSION['objectinfo']= $this->dn; + session::set('objectinfo',$this->dn); } if((isset($_POST['EditDisk']))&&(isset($_POST['disks']))){ @@ -169,10 +169,10 @@ class faiPartitionTable extends plugin /* Set object info string, which will be displayed in plugin info line */ if(isset($this->disks[$Udisk]['dn'])){ - $_SESSION['objectinfo'] = $this->disks[$Udisk]['dn']; + session::set('objectinfo',$this->disks[$Udisk]['dn']); $dn = $this->disks[$Udisk]['dn']; }else{ - $_SESSION['objectinfo'] = ""; + session::set('objectinfo',""); $dn = "new"; } diff --git a/gosa-core/plugins/admin/fai/class_faiProfileEntry.inc b/gosa-core/plugins/admin/fai/class_faiProfileEntry.inc index 1dbcad7f0..7819137a3 100644 --- a/gosa-core/plugins/admin/fai/class_faiProfileEntry.inc +++ b/gosa-core/plugins/admin/fai/class_faiProfileEntry.inc @@ -123,7 +123,7 @@ class faiProfileEntry extends plugin } /* Save current searchfilter in session*/ - $_SESSION['SUBfaifilter']= $SUBfaifilter; + session::set('SUBfaifilter',$SUBfaifilter); /* Check if we used a checkboxe from the list, to select dselect an entry */ foreach($_POST as $name => $value){ diff --git a/gosa-core/plugins/admin/fai/class_faiScript.inc b/gosa-core/plugins/admin/fai/class_faiScript.inc index 928aa0e94..b5310e40e 100644 --- a/gosa-core/plugins/admin/fai/class_faiScript.inc +++ b/gosa-core/plugins/admin/fai/class_faiScript.inc @@ -161,7 +161,7 @@ class faiScript extends plugin } if($this->dn != "new"){ - $_SESSION['objectinfo']= $this->dn; + session::set('objectinfo',$this->dn); } /* Handle posts */ @@ -206,7 +206,7 @@ class faiScript extends plugin $this->dialog->set_acl_category("fai"); /* Assign some additional dialog informations like headline and parent */ - $_SESSION['objectinfo'] = $obj['dn']; + session::set('objectinfo',$obj['dn']); $this->dialog->parent = &$this; $this->is_dialog=true; } diff --git a/gosa-core/plugins/admin/fai/class_faiTemplate.inc b/gosa-core/plugins/admin/fai/class_faiTemplate.inc index 5f4fcbf14..d35648a8e 100644 --- a/gosa-core/plugins/admin/fai/class_faiTemplate.inc +++ b/gosa-core/plugins/admin/fai/class_faiTemplate.inc @@ -152,7 +152,7 @@ class faiTemplate extends plugin $this->dialog->set_acl_base($this->acl_base); $this->dialog->set_acl_category("fai"); - $_SESSION['objectinfo'] = $obj['dn']; + session::set('objectinfo',$obj['dn']); $this->dialog->parent = &$this; $this->is_dialog=true; } @@ -185,7 +185,7 @@ class faiTemplate extends plugin } $this->dialog= new $this->subClassName($this->config,$this->dn,$obj); $this->dialog->acl = $this->acl; - $_SESSION['objectinfo'] = $obj['dn']; + session::set('objectinfo',$obj['dn']); $this->dialog->parent = &$this; $this->is_dialog=true; } @@ -206,7 +206,7 @@ class faiTemplate extends plugin } if($this->dn != "new"){ - $_SESSION['objectinfo']= $this->dn; + session::set('objectinfo',$this->dn); } /* Save Dialog */ diff --git a/gosa-core/plugins/admin/fai/class_faiTemplateEntry.inc b/gosa-core/plugins/admin/fai/class_faiTemplateEntry.inc index 05c6b72ac..bef885e00 100644 --- a/gosa-core/plugins/admin/fai/class_faiTemplateEntry.inc +++ b/gosa-core/plugins/admin/fai/class_faiTemplateEntry.inc @@ -53,13 +53,13 @@ class faiTemplateEntry extends plugin $this->group = $this->user[1]; $this->user = $this->user[0]; - $_SESSION['binary'] = $this->FAItemplateFile; - $_SESSION['binarytype'] = 'octet-stream'; + session::set('binary',$this->FAItemplateFile); + session::set('binarytype','octet-stream'); $_SESSION['binaryfile'] = basename( $this->FAItemplatePath ); if(!empty($this->dn) && $this->dn != "new"){ $ldap = $this->config->get_ldap_link(); - $_SESSION['binary'] =$ldap->get_attribute($this->dn,"FAItemplateFile"); + session::set('binary',$ldap->get_attribute($this->dn,"FAItemplateFile")); $this->FAItemplateFile = $_SESSION['binary']; } @@ -86,8 +86,8 @@ class faiTemplateEntry extends plugin $this->FAItemplatePath = $_FILES['FAItemplateFile']['name']; } - $_SESSION['binary'] = $this->FAItemplateFile; - $_SESSION['binarytype'] = 'octet-stream'; + session::set('binary',$this->FAItemplateFile); + session::set('binarytype','octet-stream'); $_SESSION['binaryfile'] = basename( $this->FAItemplatePath ); } } diff --git a/gosa-core/plugins/admin/fai/class_faiVariable.inc b/gosa-core/plugins/admin/fai/class_faiVariable.inc index ae6b79a99..a3cbe09dc 100644 --- a/gosa-core/plugins/admin/fai/class_faiVariable.inc +++ b/gosa-core/plugins/admin/fai/class_faiVariable.inc @@ -128,7 +128,7 @@ class faiVariable extends plugin } if($this->dn != "new"){ - $_SESSION['objectinfo']= $this->dn; + session::set('objectinfo',$this->dn); } @@ -141,7 +141,7 @@ class faiVariable extends plugin $this->dialog->set_acl_category("fai"); $this->dialog->set_acl_base($c_dn); $this->dialog->parent = &$this; - $_SESSION['objectinfo'] = $this->SubObjects[$var]['dn']; + session::set('objectinfo',$this->SubObjects[$var]['dn']); $this->is_dialog=true; } diff --git a/gosa-core/plugins/admin/fai/main.inc b/gosa-core/plugins/admin/fai/main.inc index edf3a59e3..d9ccd1069 100644 --- a/gosa-core/plugins/admin/fai/main.inc +++ b/gosa-core/plugins/admin/fai/main.inc @@ -49,7 +49,7 @@ if ($remove_lock){ } $display.= $output; - $_SESSION['FAI']= $FAI; + session::set('FAI',$FAI); } ?> diff --git a/gosa-core/plugins/admin/groups/class_groupManagement.inc b/gosa-core/plugins/admin/groups/class_groupManagement.inc index fb8d01489..7ff67d26a 100644 --- a/gosa-core/plugins/admin/groups/class_groupManagement.inc +++ b/gosa-core/plugins/admin/groups/class_groupManagement.inc @@ -67,7 +67,7 @@ class groupManagement extends plugin plugin::execute(); /* Store these posts if the current object is locked (used by somebody else)*/ - $_SESSION['LOCK_VARS_TO_USE'] = array("/^act$/","/^id$/","/^group_edit_/","/^group_del_/","/^item_selected/","/^remove_multiple_groups/"); + session::set('LOCK_VARS_TO_USE',array("/^act$/","/^id$/","/^group_edit_/","/^group_del_/","/^item_selected/","/^remove_multiple_groups/")); /* Save data */ $s_action = ""; @@ -239,7 +239,7 @@ class groupManagement extends plugin /* Register grouptab to trigger edit dialog */ $this->grouptab= new grouptabs($this->config,$this->config->data['TABS']['GROUPTABS'], $this->dn); $this->grouptab->set_acl_base($this->dn); - $_SESSION['objectinfo']= $this->dn; + session::set('objectinfo',$this->dn); } diff --git a/gosa-core/plugins/admin/groups/main.inc b/gosa-core/plugins/admin/groups/main.inc index 2f30e04b1..f8f82c586 100644 --- a/gosa-core/plugins/admin/groups/main.inc +++ b/gosa-core/plugins/admin/groups/main.inc @@ -53,7 +53,7 @@ if ($remove_lock){ } /* Show and save dialog */ - $_SESSION['groupManagement']= $groupManagement; + session::set('groupManagement',$groupManagement); } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: diff --git a/gosa-core/plugins/admin/mimetypes/class_mimetypeGeneric.inc b/gosa-core/plugins/admin/mimetypes/class_mimetypeGeneric.inc index 5d90a5ecd..c9eac57ab 100644 --- a/gosa-core/plugins/admin/mimetypes/class_mimetypeGeneric.inc +++ b/gosa-core/plugins/admin/mimetypes/class_mimetypeGeneric.inc @@ -575,8 +575,8 @@ class mimetype extends plugin if (file_exists($filename)){ $fd = fopen ($filename, "rb"); $this->iconData= fread ($fd, filesize ($filename)); - $_SESSION['binary']= $this->iconData; - $_SESSION['binarytype']= "image/jpeg"; + session::set('binary',$this->iconData); + session::set('binarytype',"image/jpeg"); fclose ($fd); } } @@ -584,8 +584,8 @@ class mimetype extends plugin /* Get picture link */ function get_picture() { - $_SESSION['binary']= $this->iconData; - $_SESSION['binarytype']= "image/jpeg"; + session::set('binary',$this->iconData); + session::set('binarytype',"image/jpeg"); return("getbin.php"); } diff --git a/gosa-core/plugins/admin/mimetypes/class_mimetypeManagement.inc b/gosa-core/plugins/admin/mimetypes/class_mimetypeManagement.inc index b52fed080..7af6280d7 100755 --- a/gosa-core/plugins/admin/mimetypes/class_mimetypeManagement.inc +++ b/gosa-core/plugins/admin/mimetypes/class_mimetypeManagement.inc @@ -100,7 +100,7 @@ class mimetypeManagement extends plugin /* These vars will be stored if you try to open a locked mime, to be able to perform your last requests after showing a warning message */ - $_SESSION['LOCK_VARS_TO_USE'] = array("/^act$/","/^id$/","/^mime_edit_/","/^mime_del_/","/^item_selected/","/^remove_multiple_mimetypes/"); + session::set('LOCK_VARS_TO_USE',array("/^act$/","/^id$/","/^mime_edit_/","/^mime_del_/","/^item_selected/","/^remove_multiple_mimetypes/")); $smarty = get_smarty(); // Smarty instance $s_action = ""; // Contains the action to proceed @@ -271,7 +271,7 @@ class mimetypeManagement extends plugin /* Register mimetabs to trigger edit dialog */ $this->mimetabs= new mimetabs($this->config,$this->config->data['TABS']['MIMETABS'], $this->dn,"mimetypes"); $this->mimetabs->set_acl_base($this->dn); - $_SESSION['objectinfo']= $this->dn; + session::set('objectinfo',$this->dn); } diff --git a/gosa-core/plugins/admin/mimetypes/main.inc b/gosa-core/plugins/admin/mimetypes/main.inc index fb64f754f..edfe3d9b3 100755 --- a/gosa-core/plugins/admin/mimetypes/main.inc +++ b/gosa-core/plugins/admin/mimetypes/main.inc @@ -52,6 +52,6 @@ if ($remove_lock){ /* Show and save dialog */ $display.= $output; - $_SESSION['MimeTypeManagement']= $MimeTypeManagement; + session::set('MimeTypeManagement',$MimeTypeManagement); } ?> diff --git a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc index 9bce9c372..0c529fd12 100644 --- a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc +++ b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc @@ -59,7 +59,7 @@ class ogroupManagement extends plugin Variable intialisation && Check posts for commands ****************/ - $_SESSION['LOCK_VARS_TO_USE'] = array("/^act$/","/^id$/","/^group_edit_/","/^group_del_/","/^item_selected/","/^remove_multiple_ogroups/"); + session::set('LOCK_VARS_TO_USE',array("/^act$/","/^id$/","/^group_edit_/","/^group_del_/","/^item_selected/","/^remove_multiple_ogroups/")); $smarty = get_smarty(); $s_action = ""; @@ -334,7 +334,7 @@ class ogroupManagement extends plugin /* Register grouptab to trigger edit dialog */ $this->ogroup= new ogrouptabs($this->config, $this->config->data['TABS']['OGROUPTABS'], $this->dn, "ogroups"); $this->ogroup->set_acl_base($this->dn); - $_SESSION['objectinfo']= $this->dn; + session::set('objectinfo',$this->dn); } diff --git a/gosa-core/plugins/admin/ogroups/main.inc b/gosa-core/plugins/admin/ogroups/main.inc index 9d13b8cc0..701087ab9 100644 --- a/gosa-core/plugins/admin/ogroups/main.inc +++ b/gosa-core/plugins/admin/ogroups/main.inc @@ -43,7 +43,7 @@ if (!$remove_lock){ $display.= $output; /* Store changes in session */ - $_SESSION['ogroup']= $ogroup; + session::set('ogroup',$ogroup); } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: diff --git a/gosa-core/plugins/admin/systems/class_systemManagement.inc b/gosa-core/plugins/admin/systems/class_systemManagement.inc index bb986e9dc..58c0d0fc3 100644 --- a/gosa-core/plugins/admin/systems/class_systemManagement.inc +++ b/gosa-core/plugins/admin/systems/class_systemManagement.inc @@ -63,7 +63,7 @@ class systems extends plugin /* Call parent execute */ plugin::execute(); - $_SESSION['LOCK_VARS_TO_USE'] = array("/^system_edit_/i","/^system_del_/","/^act/","/^id/","/^item_selected/","/^remove_multiple_systems/"); + session::set('LOCK_VARS_TO_USE',array("/^system_edit_/i","/^system_del_/","/^act/","/^id/","/^item_selected/","/^remove_multiple_systems/")); /******************** Check for functional posts, edit|delete|add|... system devices @@ -172,7 +172,7 @@ class systems extends plugin ********************/ if ($s_action=="gen_cd"){ $this->dn= $this->terminals[$s_entry]['dn']; - $_SESSION['objectinfo']= $this->dn; + session::set('objectinfo',$this->dn); return ($smarty->fetch(get_template_path('gencd.tpl', TRUE))); } @@ -357,7 +357,7 @@ class systems extends plugin $this->systab= new $tabclass($this->config, $this->config->data['TABS'][$class], $this->dn,$acl_cat); $this->systab->set_acl_base($this->dn); - $_SESSION['objectinfo']= $this->dn; + session::set('objectinfo',$this->dn); add_lock ($this->dn, $this->ui->dn); }else{ print_red (_("You can't edit this object type yet!")); @@ -385,7 +385,7 @@ class systems extends plugin $tabacl = $ui->get_permissions($this->DivListSystem->selectedBase,$acl_cat."/".$tabname,"gotoRootPasswd"); if(preg_match("/w/",$tabacl)){ $this->dn= $this->terminals[$s_entry]['dn']; - $_SESSION['objectinfo']= $this->dn; + session::set('objectinfo',$this->dn); return ($smarty->fetch(get_template_path('password.tpl', TRUE))); }else{ print_red(_("You are not allowed to change the password for this object.")); diff --git a/gosa-core/plugins/admin/systems/class_workstationStartup.inc b/gosa-core/plugins/admin/systems/class_workstationStartup.inc index 9e9a4732d..371966801 100644 --- a/gosa-core/plugins/admin/systems/class_workstationStartup.inc +++ b/gosa-core/plugins/admin/systems/class_workstationStartup.inc @@ -112,8 +112,8 @@ class workstartup extends plugin */ if($this->fai_activated) { - $_SESSION['getAvailableClassesForThisRelease_CACHE'] = array(); - $_SESSION['getAvailableClassesForThisRelease_CACHED_CLASSES'] = array(); + session::set('getAvailableClassesForThisRelease_CACHE',array()); + session::set('getAvailableClassesForThisRelease_CACHED_CLASSES',array()); /* Search all FAI objects */ $ldap->search("(|(objectClass=FAIpackageList)(objectClass=FAItemplate)(objectClass=FAIvariable)(objectClass=FAIscript)(objectClass=FAIhook)(objectClass=FAIprofile)(objectClass=FAIpartitionTable))",array("cn","objectClass","FAIdebianSection",'description')); diff --git a/gosa-core/plugins/admin/systems/main.inc b/gosa-core/plugins/admin/systems/main.inc index a129e7196..2e6e2edc3 100644 --- a/gosa-core/plugins/admin/systems/main.inc +++ b/gosa-core/plugins/admin/systems/main.inc @@ -49,7 +49,7 @@ if ($remove_lock){ /* Show and save dialog */ $display.= $output; - $_SESSION['systems']= $systems; + session::set('systems',$systems); } ?> 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 b50066029..7e5897a43 100644 --- a/gosa-core/plugins/admin/systems/services/glpi/class_glpiAttachmentPool.inc +++ b/gosa-core/plugins/admin/systems/services/glpi/class_glpiAttachmentPool.inc @@ -29,7 +29,7 @@ class glpiAttachmentPool extends plugin { plugin::plugin ($config, $dn); if(!isset($_SESSION['GlpiAttachmentFilter'])){ - $_SESSION['GlpiAttachmentFilter'] = array("filter"=>"*"); + session::set('GlpiAttachmentFilter',array("filter"=>"*")); } /* Assign used attributes */ 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 0f24300d8..619e8015f 100644 --- a/gosa-core/plugins/admin/systems/services/glpi/class_glpiDeviceManagement.inc +++ b/gosa-core/plugins/admin/systems/services/glpi/class_glpiDeviceManagement.inc @@ -32,7 +32,7 @@ class glpiDeviceManagement extends plugin if(!isset($_SESSION['glpiDeviceRegex'])){ $tmp['device_regex'] = "*"; - $_SESSION['glpiDeviceRegex'] = $tmp; + session::set('glpiDeviceRegex',$tmp); } $this->ui = get_userinfo(); 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 3d9d63010..68413a064 100644 --- a/gosa-core/plugins/admin/systems/services/glpi/class_glpiPrinterCartridges.inc +++ b/gosa-core/plugins/admin/systems/services/glpi/class_glpiPrinterCartridges.inc @@ -30,7 +30,7 @@ class glpiPrinterCartridges extends plugin /* Assign some basic settings */ $this->ui = get_userinfo(); if(!isset($_SESSION['glpiCartridgeRegex'])){ - $_SESSION['glpiCartridgeRegex'] = "*"; + session::set('glpiCartridgeRegex',"*"); } /* Only display cartridges for this type of printer */ @@ -54,7 +54,7 @@ class glpiPrinterCartridges extends plugin if(empty($filter)) { $filter = "*"; } - $_SESSION['glpiCartridgeRegex']= $filter; + session::set('glpiCartridgeRegex',$filter); /* Open dialog which allows to edit the manufacturers */ 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 7073b12a4..7b580df31 100644 --- a/gosa-core/plugins/admin/systems/services/glpi/class_glpiSelectUser.inc +++ b/gosa-core/plugins/admin/systems/services/glpi/class_glpiSelectUser.inc @@ -28,7 +28,7 @@ class glpiSelectUser extends plugin if(!isset($_SESSION['glpi_user_filter'])){ $tmp['users_regex'] = "*"; $tmp['base'] = $this->config->current['BASE']; - $_SESSION['glpi_user_filter'] = $tmp; + session::set('glpi_user_filter',$tmp); } $this->ui = get_userinfo(); @@ -97,7 +97,7 @@ class glpiSelectUser extends plugin $filter['base']= ($this->config->departments[$entry]); } - $_SESSION['glpi_user_filter'] = $filter; + session::set('glpi_user_filter',$filter); $this->reload(); diff --git a/gosa-core/plugins/admin/systems/tabs_server.inc b/gosa-core/plugins/admin/systems/tabs_server.inc index 608a02fd1..ea674e9de 100644 --- a/gosa-core/plugins/admin/systems/tabs_server.inc +++ b/gosa-core/plugins/admin/systems/tabs_server.inc @@ -58,7 +58,7 @@ class servtabs extends tabs /* Reload server settings after saving */ $config= $_SESSION['config']; $config->load_servers(); - $_SESSION['config']= $config; + session::set('config',$config); /* Fix tagging if needed */ $baseobject->handle_object_tagging(); diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc index f4641b984..922c68ffd 100644 --- a/gosa-core/plugins/admin/users/class_userManagement.inc +++ b/gosa-core/plugins/admin/users/class_userManagement.inc @@ -62,7 +62,7 @@ class userManagement extends plugin plugin::execute(); /* LOCK MESSAGE Vars */ - $_SESSION['LOCK_VARS_TO_USE'] = array("/^act$/","/^id$/","/^user_edit_/","/^user_del_/","/^item_selected/","/^remove_multiple_users/","/^multiple_edit/","/menu_action/"); + session::set('LOCK_VARS_TO_USE',array("/^act$/","/^id$/","/^user_edit_/","/^user_del_/","/^item_selected/","/^remove_multiple_users/","/^multiple_edit/","/menu_action/")); $smarty = get_smarty(); // Smarty instance $s_action = ""; // Contains the action to be taken @@ -287,7 +287,7 @@ class userManagement extends plugin /* User is allowed to change passwords, save 'dn' and 'acl' for next dialog. */ - $_SESSION['objectinfo']= $this->dn; + session::set('objectinfo',$this->dn); return ($smarty->fetch(get_template_path('password.tpl', TRUE))); @@ -328,7 +328,7 @@ class userManagement extends plugin /* Set ACL and move DN to the headline */ $this->usertab->set_acl_base($this->dn); - $_SESSION['objectinfo']= $this->dn; + session::set('objectinfo',$this->dn); } @@ -352,7 +352,7 @@ class userManagement extends plugin if($tmp->multiple_available()){ $this->usertab = $tmp; $this->usertab->set_active_tab($s_tab); - $_SESSION['objectinfo']= $this->usertab->get_object_info(); + session::set('objectinfo',$this->usertab->get_object_info()); } } diff --git a/gosa-core/plugins/admin/users/main.inc b/gosa-core/plugins/admin/users/main.inc index b3a0a4251..e7dd66372 100644 --- a/gosa-core/plugins/admin/users/main.inc +++ b/gosa-core/plugins/admin/users/main.inc @@ -58,7 +58,7 @@ if ($remove_lock){ } /* Show and save dialog */ - $_SESSION['userManagement']= $userManagement; + session::set('userManagement',$userManagement); } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: diff --git a/gosa-core/plugins/generic/welcome/main.inc b/gosa-core/plugins/generic/welcome/main.inc index eb0c63cd9..b5205012c 100644 --- a/gosa-core/plugins/generic/welcome/main.inc +++ b/gosa-core/plugins/generic/welcome/main.inc @@ -19,7 +19,7 @@ */ if (!$remove_lock){ - $_SESSION['plugin_dir']= dirname(__FILE__); + session::set('plugin_dir',dirname(__FILE__)); $smarty->assign("iconmenu", $plist->show_iconmenu()); $smarty->assign("header", print_header(get_template_path('images/hdd_linux_unmount.png'), sprintf(_("Welcome %s!"), $ui->cn))); $smarty->assign("year", date("Y")); diff --git a/gosa-core/plugins/gofax/blocklists/class_blocklistManagement.inc b/gosa-core/plugins/gofax/blocklists/class_blocklistManagement.inc index 5b0ac1d0c..2476c807b 100644 --- a/gosa-core/plugins/gofax/blocklists/class_blocklistManagement.inc +++ b/gosa-core/plugins/gofax/blocklists/class_blocklistManagement.inc @@ -31,7 +31,7 @@ class blocklist extends plugin /* Call parent execute */ plugin::execute(); - $_SESSION['LOCK_VARS_TO_USE'] = array("/^goFaxBlocklist_/","/^act$/","/^id$/","/^remove_multiple_blocklists/","/^item_selected/"); + session::set('LOCK_VARS_TO_USE',array("/^goFaxBlocklist_/","/^act$/","/^id$/","/^remove_multiple_blocklists/","/^item_selected/")); /*************** Init vars @@ -180,7 +180,7 @@ class blocklist extends plugin }else{ add_lock ($this->dn, $this->ui->dn); } - $_SESSION['objectinfo']= trim($this->dn); + session::set('objectinfo',trim($this->dn)); $this->dialog = new faxblocktabs($this->config,$this->config->data['TABS']['FAXBLOCKTABS'],$this->dn); $this->dialog->set_acl_base($this->dn); } @@ -277,7 +277,7 @@ class blocklist extends plugin /* Check locking */ if (($user= get_lock($this->dn)) != ""){ - $_SESSION['dn']= $this->dn; + session::set('dn',$this->dn); return(gen_locked_message($user, $this->dn)); } else { diff --git a/gosa-core/plugins/gofax/blocklists/main.inc b/gosa-core/plugins/gofax/blocklists/main.inc index 5951a6307..74b4739ba 100644 --- a/gosa-core/plugins/gofax/blocklists/main.inc +++ b/gosa-core/plugins/gofax/blocklists/main.inc @@ -29,6 +29,6 @@ if ($remove_lock){ } $display.= $output; - $_SESSION['blocklist']= $blocklist; + session::set('blocklist',$blocklist); } ?> diff --git a/gosa-core/plugins/gofax/faxaccount/main.inc b/gosa-core/plugins/gofax/faxaccount/main.inc index aa8393cc9..605e17f47 100644 --- a/gosa-core/plugins/gofax/faxaccount/main.inc +++ b/gosa-core/plugins/gofax/faxaccount/main.inc @@ -33,16 +33,16 @@ if (!$remove_lock){ /* Check locking */ if (($username= get_lock($ui->dn)) != ""){ - $_SESSION['back_plugin']= $plug; - $_SESSION['LOCK_VARS_TO_USE'] = array("/^edit$/","/^plug$/"); + session::set('back_plugin',$plug); + session::set('LOCK_VARS_TO_USE',array("/^edit$/","/^plug$/")); $lock_msg = gen_locked_message ($username, $ui->dn); }else{ /* Lock the current entry */ add_lock ($ui->dn, $ui->dn); - $_SESSION['dn']= $ui->dn; - $_SESSION['edit']= TRUE; + session::set('dn',$ui->dn); + session::set('edit',TRUE); } } @@ -75,7 +75,7 @@ if (!$remove_lock){ /* Store changes in session */ if (isset ($_SESSION['edit'])){ - $_SESSION['gofaxAccount']= $gofaxAccount; + session::set('gofaxAccount',$gofaxAccount); } /* Show page footer depending on the mode */ diff --git a/gosa-core/plugins/gofax/faxreports/class_faxreport.inc b/gosa-core/plugins/gofax/faxreports/class_faxreport.inc index 41e0fc471..53b915ee7 100644 --- a/gosa-core/plugins/gofax/faxreports/class_faxreport.inc +++ b/gosa-core/plugins/gofax/faxreports/class_faxreport.inc @@ -200,7 +200,7 @@ class faxreport extends plugin /* The user is allowed to download all fax images from those users that are listed in $_SESSION['fuserfilter'] Don't forget to check getfax.php if you change somthing here */ - $_SESSION['fuserfilter']= $this->userfilter; + session::set('fuserfilter',$this->userfilter); $smarty->assign("plug", "?plug=".validate($_GET['plug'])); $smarty->assign("detail", validate($_GET['detail'])); diff --git a/gosa-core/plugins/gofax/faxreports/main.inc b/gosa-core/plugins/gofax/faxreports/main.inc index 61dd4cea0..b2421c979 100644 --- a/gosa-core/plugins/gofax/faxreports/main.inc +++ b/gosa-core/plugins/gofax/faxreports/main.inc @@ -14,6 +14,6 @@ if (!$remove_lock){ $display= print_header(get_template_path('images/reports.png'), _("FAX reports")).$display; /* Store changes in session */ - $_SESSION['faxreport']= $faxreport; + session::set('faxreport',$faxreport); } ?> diff --git a/gosa-core/plugins/gofon/conference/class_phoneConferenceManagment.inc b/gosa-core/plugins/gofon/conference/class_phoneConferenceManagment.inc index 2f711df44..65fccd9b9 100644 --- a/gosa-core/plugins/gofon/conference/class_phoneConferenceManagment.inc +++ b/gosa-core/plugins/gofon/conference/class_phoneConferenceManagment.inc @@ -62,7 +62,7 @@ class phoneConferenceManagment extends plugin /* Call parent execute */ plugin::execute(); - $_SESSION['LOCK_VARS_TO_USE'] = array("/^id$/","/^act$/","/^conference_/","/^item_selected/","/^remove_multiple_conferences/"); + session::set('LOCK_VARS_TO_USE',array("/^id$/","/^act$/","/^conference_/","/^item_selected/","/^remove_multiple_conferences/")); /*************** Variable initialisation @@ -250,7 +250,7 @@ class phoneConferenceManagment extends plugin /* Check locking */ if (($conf= get_lock($this->dn)) != ""){ - $_SESSION['dn']= $this->dn; + session::set('dn',$this->dn); return(gen_locked_message($conf, $this->dn)); } else { add_lock ($this->dn, $this->ui->dn); @@ -301,7 +301,7 @@ class phoneConferenceManagment extends plugin /* Register conftab to trigger edit dialog */ $this->conftab= new conferencetabs($this->config,$this->config->data['TABS']['CONFERENCETABS'], $this->dn,"gofonconference"); $this->conftab->set_acl_base($this->dn); - $_SESSION['objectinfo']= $this->dn; + session::set('objectinfo',$this->dn); } diff --git a/gosa-core/plugins/gofon/conference/main.inc b/gosa-core/plugins/gofon/conference/main.inc index 0cc2451dd..b6496a4b4 100644 --- a/gosa-core/plugins/gofon/conference/main.inc +++ b/gosa-core/plugins/gofon/conference/main.inc @@ -50,7 +50,7 @@ if ($remove_lock){ /* Show and save dialog */ $conference->save_object(); $display.= $output; - $_SESSION['conference']= $conference; + session::set('conference',$conference); } ?> diff --git a/gosa-core/plugins/gofon/fonreports/main.inc b/gosa-core/plugins/gofon/fonreports/main.inc index 98b245346..f6defcac4 100644 --- a/gosa-core/plugins/gofon/fonreports/main.inc +++ b/gosa-core/plugins/gofon/fonreports/main.inc @@ -16,6 +16,6 @@ if (!$remove_lock){ $display= print_header(get_template_path('images/phonereport.png'), _("Phone reports")).$display; /* Store changes in session */ - $_SESSION['fonreport']= $fonreport; + session::set('fonreport',$fonreport); } ?> diff --git a/gosa-core/plugins/gofon/macro/class_gofonMacroManagement.inc b/gosa-core/plugins/gofon/macro/class_gofonMacroManagement.inc index 91738fd7e..9d552be2a 100755 --- a/gosa-core/plugins/gofon/macro/class_gofonMacroManagement.inc +++ b/gosa-core/plugins/gofon/macro/class_gofonMacroManagement.inc @@ -52,7 +52,7 @@ class goFonMacro extends plugin /* Call parent execute */ plugin::execute(); - $_SESSION['LOCK_VARS_TO_USE'] = array("/^goFonMacro_/","/^act$/","/^id$/","/^item_selected/","/^remove_multiple_macros/"); + session::set('LOCK_VARS_TO_USE',array("/^goFonMacro_/","/^act$/","/^id$/","/^item_selected/","/^remove_multiple_macros/")); /***************** Variable initialisation @@ -229,7 +229,7 @@ class goFonMacro extends plugin /* Register macrotabs to trigger edit dialog */ $this->macrotabs= new macrotabs($this->config, $this->config->data['TABS']['MACROTABS'], $this->dn,"gofonmacro"); - $_SESSION['objectinfo']= $this->dn; + session::set('objectinfo',$this->dn); } } diff --git a/gosa-core/plugins/gofon/macro/main.inc b/gosa-core/plugins/gofon/macro/main.inc index 36e0d65df..402ca2e7c 100755 --- a/gosa-core/plugins/gofon/macro/main.inc +++ b/gosa-core/plugins/gofon/macro/main.inc @@ -55,7 +55,7 @@ if ($remove_lock){ /* Show and save dialog */ $display.= $output; - $_SESSION['macroManagment']= $macroManagment; + session::set('macroManagment',$macroManagment); } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: ?> diff --git a/gosa-core/plugins/gofon/phoneaccount/main.inc b/gosa-core/plugins/gofon/phoneaccount/main.inc index 75ed8a9bc..06d7f6ccf 100644 --- a/gosa-core/plugins/gofon/phoneaccount/main.inc +++ b/gosa-core/plugins/gofon/phoneaccount/main.inc @@ -48,16 +48,16 @@ if (!$remove_lock){ /* Check locking */ if (($username= get_lock($ui->dn)) != ""){ - $_SESSION['back_plugin']= $plug; - $_SESSION['LOCK_VARS_TO_USE'] = array("/^edit$/","/^plug$/"); + session::set('back_plugin',$plug); + session::set('LOCK_VARS_TO_USE',array("/^edit$/","/^plug$/")); $lock_msg = gen_locked_message ($username, $ui->dn); }else{ /* Lock the current entry */ add_lock ($ui->dn, $ui->dn); - $_SESSION['dn']= $ui->dn; - $_SESSION['edit']= TRUE; + session::set('dn',$ui->dn); + session::set('edit',TRUE); } } @@ -76,7 +76,7 @@ if (!$remove_lock){ sess_del ('edit'); /* Write back to session */ - $_SESSION['phoneAccount']= $phoneAccount; + session::set('phoneAccount',$phoneAccount); } else { /* Errors found, show message */ show_errors ($message); @@ -92,7 +92,7 @@ if (!$remove_lock){ /* Store changes in session */ if (isset ($_SESSION['edit'])){ - $_SESSION['phoneAccount']= $phoneAccount; + session::set('phoneAccount',$phoneAccount); } $info= ""; diff --git a/gosa-core/plugins/personal/connectivity/main.inc b/gosa-core/plugins/personal/connectivity/main.inc index a1684f744..16b66c13e 100644 --- a/gosa-core/plugins/personal/connectivity/main.inc +++ b/gosa-core/plugins/personal/connectivity/main.inc @@ -54,7 +54,7 @@ if (!$remove_lock){ /* Check locking */ if ((($username= get_lock($ui->dn)) != "") && (!session::is_set('edit'))){ - $_SESSION['back_plugin']= $plug; + session::set('back_plugin',$plug); gen_locked_message ($username, $ui->dn); exit (); } @@ -62,8 +62,8 @@ if (!$remove_lock){ /* Lock the current entry */ add_lock ($ui->dn, $ui->dn); - $_SESSION['dn']= $ui->dn; - $_SESSION['edit']= TRUE; + session::set('dn',$ui->dn); + session::set('edit',TRUE); } /* save changes to LDAP and disable edit mode */ @@ -91,7 +91,7 @@ if (!$remove_lock){ /* Store changes in session */ if (isset ($_SESSION['edit'])){ - $_SESSION['connectivity']= $connectivity; + session::set('connectivity',$connectivity); } $info= ""; diff --git a/gosa-core/plugins/personal/environment/main.inc b/gosa-core/plugins/personal/environment/main.inc index 4cb24346f..7142f96e7 100644 --- a/gosa-core/plugins/personal/environment/main.inc +++ b/gosa-core/plugins/personal/environment/main.inc @@ -46,16 +46,16 @@ if (!$remove_lock){ /* Check locking */ if (($username= get_lock($ui->dn)) != ""){ - $_SESSION['back_plugin']= $plug; - $_SESSION['LOCK_VARS_TO_USE'] = array("/^edit$/","/^plug$/"); + session::set('back_plugin',$plug); + session::set('LOCK_VARS_TO_USE',array("/^edit$/","/^plug$/")); $lock_msg = gen_locked_message ($username, $ui->dn); }else{ /* Lock the current entry */ add_lock ($ui->dn, $ui->dn); - $_SESSION['dn']= $ui->dn; - $_SESSION['edit']= TRUE; + session::set('dn',$ui->dn); + session::set('edit',TRUE); } } @@ -88,7 +88,7 @@ if (!$remove_lock){ /* Store changes in session */ if (isset ($_SESSION['edit'])){ - $_SESSION['environment']= $environment; + session::set('environment',$environment); } $info= ""; diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc index 49a732cce..ff26df46f 100644 --- a/gosa-core/plugins/personal/generic/class_user.inc +++ b/gosa-core/plugins/personal/generic/class_user.inc @@ -396,8 +396,8 @@ class user extends plugin $this->photoData= $this->old_photoData; /* Update picture */ - $_SESSION['binary']= $this->photoData; - $_SESSION['binarytype']= "image/jpeg"; + session::set('binary',$this->photoData); + session::set('binarytype',"image/jpeg"); $this->picture_dialog= FALSE; $this->dialog= FALSE; } @@ -980,7 +980,7 @@ class user extends plugin if(isset($this->attrs['preferredLanguage'])){ $_SESSION['ui']->language = $this->preferredLanguage; - $_SESSION['Last_init_lang'] = "update"; + session::set('Last_init_lang',"update"); } $ldap->cd ($this->dn); @@ -1194,8 +1194,8 @@ class user extends plugin /* Set picture */ $this->photoData= $data; - $_SESSION['binary']= $this->photoData; - $_SESSION['binarytype']= "image/jpeg"; + session::set('binary',$this->photoData); + session::set('binarytype',"image/jpeg"); $this->jpegPhoto= ""; } } @@ -1247,8 +1247,8 @@ class user extends plugin $fd = fopen ($filename, "rb"); $this->photoData= fread ($fd, filesize ($filename)); - $_SESSION['binary']= $this->photoData; - $_SESSION['binarytype']= "image/jpeg"; + session::set('binary',$this->photoData); + session::set('binarytype',"image/jpeg"); $this->jpegPhoto= ""; fclose ($fd); @@ -1322,8 +1322,8 @@ class user extends plugin { $str = ""; - $_SESSION['binary'] = $this->photoData; - $_SESSION['binarytype']= "image/jpeg"; + session::set('binary',$this->photoData); + session::set('binarytype',"image/jpeg"); /* Get random number for pictures */ srand((double)microtime()*1000000); diff --git a/gosa-core/plugins/personal/generic/main.inc b/gosa-core/plugins/personal/generic/main.inc index 68c98d85c..556cfe8ec 100644 --- a/gosa-core/plugins/personal/generic/main.inc +++ b/gosa-core/plugins/personal/generic/main.inc @@ -50,16 +50,16 @@ if (!$remove_lock){ /* Check locking */ if (($username= get_lock($ui->dn)) != ""){ - $_SESSION['back_plugin']= $plug; - $_SESSION['LOCK_VARS_TO_USE'] = array("/^edit$/","/^plug$/"); + session::set('back_plugin',$plug); + session::set('LOCK_VARS_TO_USE',array("/^edit$/","/^plug$/")); $lock_msg = gen_locked_message ($username, $ui->dn); }else{ /* Lock the current entry */ add_lock ($ui->dn, $ui->dn); - $_SESSION['dn']= $ui->dn; - $_SESSION['edit']= TRUE; + session::set('dn',$ui->dn); + session::set('edit',TRUE); } } @@ -121,7 +121,7 @@ if (!$remove_lock){ /* Need to reset the password? */ if($user->password_change_needed()){ /* Save object */ - $_SESSION['user']= $user; + session::set('user',$user); $display.= $smarty->fetch(get_template_path('password.tpl', TRUE)); return ($display); @@ -144,7 +144,7 @@ if (!$remove_lock){ /* Store changes in session */ if (isset ($_SESSION['edit'])){ - $_SESSION['user']= $user; + session::set('user',$user); } $info = ""; diff --git a/gosa-core/plugins/personal/mail/main.inc b/gosa-core/plugins/personal/mail/main.inc index a247e9e5a..492639f32 100644 --- a/gosa-core/plugins/personal/mail/main.inc +++ b/gosa-core/plugins/personal/mail/main.inc @@ -48,16 +48,16 @@ if (!$remove_lock){ /* Check locking */ if (($username= get_lock($ui->dn)) != ""){ - $_SESSION['back_plugin']= $plug; - $_SESSION['LOCK_VARS_TO_USE'] = array("/^edit$/","/^plug$/"); + session::set('back_plugin',$plug); + session::set('LOCK_VARS_TO_USE',array("/^edit$/","/^plug$/")); $lock_msg = gen_locked_message ($username, $ui->dn); }else{ /* Lock the current entry */ add_lock ($ui->dn, $ui->dn); - $_SESSION['dn']= $ui->dn; - $_SESSION['edit']= TRUE; + session::set('dn',$ui->dn); + session::set('edit',TRUE); } } @@ -90,7 +90,7 @@ if (!$remove_lock){ /* Store changes in session */ if (isset ($_SESSION['edit'])){ - $_SESSION['mailAccount']= $mailAccount; + session::set('mailAccount',$mailAccount); } $info= ""; diff --git a/gosa-core/plugins/personal/nagios/main.inc b/gosa-core/plugins/personal/nagios/main.inc index feb399ed1..e554b0e8e 100644 --- a/gosa-core/plugins/personal/nagios/main.inc +++ b/gosa-core/plugins/personal/nagios/main.inc @@ -49,16 +49,16 @@ if (!$remove_lock){ /* Check locking */ if (($username= get_lock($ui->dn)) != ""){ - $_SESSION['back_plugin']= $plug; - $_SESSION['LOCK_VARS_TO_USE'] = array("/^edit$/","/^plug$/"); + session::set('back_plugin',$plug); + session::set('LOCK_VARS_TO_USE',array("/^edit$/","/^plug$/")); $lock_msg = gen_locked_message ($username, $ui->dn); }else{ /* Lock the current entry */ add_lock ($ui->dn, $ui->dn); - $_SESSION['dn']= $ui->dn; - $_SESSION['edit']= TRUE; + session::set('dn',$ui->dn); + session::set('edit',TRUE); } } @@ -91,7 +91,7 @@ if (!$remove_lock){ /* Store changes in session */ if (isset ($_SESSION['edit'])){ - $_SESSION['nagiosAccount']= $nagiosAccount; + session::set('nagiosAccount',$nagiosAccount); } $info= ""; diff --git a/gosa-core/plugins/personal/netatalk/main.inc b/gosa-core/plugins/personal/netatalk/main.inc index e1a62c965..bb03aa918 100644 --- a/gosa-core/plugins/personal/netatalk/main.inc +++ b/gosa-core/plugins/personal/netatalk/main.inc @@ -46,15 +46,15 @@ if (!$remove_lock) { /* Check locking */ if (($username = get_lock($ui->dn)) != "") { - $_SESSION['back_plugin'] = $plug; + session::set('back_plugin',$plug); gen_locked_message($username, $ui->dn); exit (); } /* Lock the current entry */ add_lock($ui->dn, $ui->dn); - $_SESSION['dn'] = $ui->dn; - $_SESSION['edit'] = TRUE; + session::set('dn',$ui->dn); + session::set('edit',TRUE); } /* save changes to LDAP and disable edit mode */ @@ -82,7 +82,7 @@ if (!$remove_lock) { /* Store changes in session */ if (isset ($_SESSION['edit'])) { - $_SESSION['netatalk'] = $netatalk; + session::set('netatalk',$netatalk); } $info = ""; diff --git a/gosa-core/plugins/personal/password/class_password.inc b/gosa-core/plugins/personal/password/class_password.inc index f9d5ac44a..2a4df8481 100644 --- a/gosa-core/plugins/personal/password/class_password.inc +++ b/gosa-core/plugins/personal/password/class_password.inc @@ -115,7 +115,7 @@ class password extends plugin change_password ($ui->dn, $_POST['new_password']); gosa_log ("User/password has been changed"); $ui->password= $_POST['new_password']; - $_SESSION['ui']= $ui; + session::set('ui',$ui); #$this->handle_post_events("modify",array("userPassword" => $_POST['new_password'])); return($smarty->fetch(get_template_path("changed.tpl", TRUE))); } diff --git a/gosa-core/plugins/personal/posix/class_posixAccount.inc b/gosa-core/plugins/personal/posix/class_posixAccount.inc index 4eb7a3344..911718e96 100644 --- a/gosa-core/plugins/personal/posix/class_posixAccount.inc +++ b/gosa-core/plugins/personal/posix/class_posixAccount.inc @@ -236,7 +236,7 @@ class posixAccount extends plugin /* Department has changed? */ if(isset($_POST['depselect'])){ - $_SESSION['CurrentMainBase']= validate($_POST['depselect']); + session::set('CurrentMainBase',validate($_POST['depselect'])); } if($this->multiple_support_active){ @@ -1306,7 +1306,7 @@ class posixAccount extends plugin /* check sizelimit */ if (preg_match("/size limit/i", $ldap->error)){ - $_SESSION['limit_exceeded']= TRUE; + session::set('limit_exceeded',TRUE); } /* Create a list of users */ diff --git a/gosa-core/plugins/personal/posix/main.inc b/gosa-core/plugins/personal/posix/main.inc index 560bc0416..86d01d3b0 100644 --- a/gosa-core/plugins/personal/posix/main.inc +++ b/gosa-core/plugins/personal/posix/main.inc @@ -49,16 +49,16 @@ if (!$remove_lock){ /* Check locking */ if (($username= get_lock($ui->dn)) != ""){ - $_SESSION['back_plugin']= $plug; - $_SESSION['LOCK_VARS_TO_USE'] = array("/^edit$/","/^plug$/"); + session::set('back_plugin',$plug); + session::set('LOCK_VARS_TO_USE',array("/^edit$/","/^plug$/")); $lock_msg = gen_locked_message ($username, $ui->dn); }else{ /* Lock the current entry */ add_lock ($ui->dn, $ui->dn); - $_SESSION['dn']= $ui->dn; - $_SESSION['edit']= TRUE; + session::set('dn',$ui->dn); + session::set('edit',TRUE); } } @@ -92,7 +92,7 @@ if (!$remove_lock){ /* Store changes in session */ if (isset ($_SESSION['edit'])){ - $_SESSION['posixAccount']= $posixAccount; + session::set('posixAccount',$posixAccount); } /* Show page footer depending on the mode */ diff --git a/gosa-core/plugins/personal/samba/main.inc b/gosa-core/plugins/personal/samba/main.inc index 934c24237..e97e1ca7e 100644 --- a/gosa-core/plugins/personal/samba/main.inc +++ b/gosa-core/plugins/personal/samba/main.inc @@ -49,16 +49,16 @@ if (!$remove_lock){ /* Check locking */ if (($username= get_lock($ui->dn)) != ""){ - $_SESSION['back_plugin']= $plug; - $_SESSION['LOCK_VARS_TO_USE'] = array("/^edit$/","/^plug$/"); + session::set('back_plugin',$plug); + session::set('LOCK_VARS_TO_USE',array("/^edit$/","/^plug$/")); $lock_msg = gen_locked_message ($username, $ui->dn); }else{ /* Lock the current entry */ add_lock ($ui->dn, $ui->dn); - $_SESSION['dn']= $ui->dn; - $_SESSION['edit']= TRUE; + session::set('dn',$ui->dn); + session::set('edit',TRUE); } } @@ -91,7 +91,7 @@ if (!$remove_lock){ /* Store changes in session */ if (isset ($_SESSION['edit'])){ - $_SESSION['sambaAccount']= $sambaAccount; + session::set('sambaAccount',$sambaAccount); } $info= ""; diff --git a/gosa-core/plugins/personal/scalix/main.inc b/gosa-core/plugins/personal/scalix/main.inc index c086e8d7d..bb2e1fd44 100644 --- a/gosa-core/plugins/personal/scalix/main.inc +++ b/gosa-core/plugins/personal/scalix/main.inc @@ -47,16 +47,16 @@ if (!$remove_lock){ /* Check locking */ if (($username= get_lock($ui->dn)) != ""){ - $_SESSION['back_plugin']= $plug; - $_SESSION['LOCK_VARS_TO_USE'] = array("/^edit$/","/^plug$/"); + session::set('back_plugin',$plug); + session::set('LOCK_VARS_TO_USE',array("/^edit$/","/^plug$/")); $lock_msg = gen_locked_message ($username, $ui->dn); }else{ /* Lock the current entry */ add_lock ($ui->dn, $ui->dn); - $_SESSION['dn']= $ui->dn; - $_SESSION['edit']= TRUE; + session::set('dn',$ui->dn); + session::set('edit',TRUE); } } @@ -87,7 +87,7 @@ if (!$remove_lock){ /* Store changes in session */ if (isset ($_SESSION['edit'])){ - $_SESSION['scalixAccount']= $scalixAccount; + session::set('scalixAccount',$scalixAccount); } /* Show page footer depending on the mode */ diff --git a/gosa-core/setup/class_setupStep_Language.inc b/gosa-core/setup/class_setupStep_Language.inc index e1b5e72ab..ebb9c497b 100644 --- a/gosa-core/setup/class_setupStep_Language.inc +++ b/gosa-core/setup/class_setupStep_Language.inc @@ -60,9 +60,9 @@ class Step_Language extends setup_step $this->is_completed = TRUE; if($this->lang_selected != ""){ - $_SESSION['lang'] = $this->lang_selected; + session::set('lang',$this->lang_selected); }else{ - $_SESSION['lang'] = $this->lang; + session::set('lang',$this->lang); } } } diff --git a/gosa-core/setup/main.inc b/gosa-core/setup/main.inc index 870490a74..3abe6ccef 100644 --- a/gosa-core/setup/main.inc +++ b/gosa-core/setup/main.inc @@ -29,7 +29,7 @@ $setup->save_object(); $display= $setup->execute(); /* Store changes in session */ -$_SESSION['setup']= $setup; +session::set('setup',$setup); // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: ?>