X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_MultiSelectWindow.inc;h=9c9bd5071763836acd638b6201d0f0a983b95fd5;hb=67253c858b7c867ee5fa3a9b4bbfde1fc1ee81d1;hp=73746231c71c0ed5bf4acd754f8aed25857879cc;hpb=a17101a056382b9e2fc3eaf1d95854d994956952;p=gosa.git
diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc
index 73746231c..9c9bd5071 100644
--- a/gosa-core/include/class_MultiSelectWindow.inc
+++ b/gosa-core/include/class_MultiSelectWindow.inc
@@ -529,9 +529,12 @@ class MultiSelectWindow{
}
}
- /* Save base selection from headpage selectbox*/
+ /* Save base selection from headpage selectbox */
if(isset($_POST['CurrentMainBase'])){
- $this->selectedBase = $_POST['CurrentMainBase'];
+ $this->selectedBase = get_post('CurrentMainBase');
+ session::global_set("CurrentMainBase", $this->selectedBase);
+ } else {
+ $this->selectedBase= session::global_get("CurrentMainBase");
}
/* Homebutton is posted */
@@ -645,7 +648,7 @@ class MultiSelectWindow{
}
/* Save currenlty selected base in session */
- session::set("CurrentMainBase",$this->selectedBase);
+ session::global_set("CurrentMainBase",$this->selectedBase);
}
@@ -655,6 +658,11 @@ class MultiSelectWindow{
$this->DepartmentsAdded = true;
$this->Added_Departments = array();
$this->departments = array();
+
+ if(isset($this->Regex)){
+ $this->base_selection_regex = $this->Regex;
+ }
+
$linkopen = "post_id."&act=dep_open&dep_id=%s'>%s";
$types = departmentManagement::get_support_departments();
$ui = get_userinfo();
@@ -767,11 +775,13 @@ class MultiSelectWindow{
$first = $value;
}
+
+ $v_value = htmlentities($value,ENT_QUOTES);
if ($this->selectedBase == $value){
$found = TRUE;
- $options.= "";
+ $options.= "";
} else {
- $options.= "";
+ $options.= "";
}
}