X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_baseSelector.inc;h=c6ac8d2b70c391cd79e0b85ad5db83010dc4d0e0;hb=f7ebf98692ee53fcfffdc91b87d81a24ac19df0e;hp=f2a852abe0d163750bc309078dfc8417943804b5;hpb=df3177a78e02405a97d25858a968833a99548755;p=gosa.git
diff --git a/gosa-core/include/class_baseSelector.inc b/gosa-core/include/class_baseSelector.inc
index f2a852abe..c6ac8d2b7 100644
--- a/gosa-core/include/class_baseSelector.inc
+++ b/gosa-core/include/class_baseSelector.inc
@@ -92,10 +92,12 @@ class baseSelector {
$elements= array_reverse($elements, true);
$this->pathMapping[$base]= $base == $config->current['BASE']? '/' : ldap::fix(preg_replace('/(^|,)[a-z0-9]+=/i', '/', implode(',', $elements)));
+ $this->pathMapping[$base]= stripslashes( $this->pathMapping[$base]);
}
// Save bases to session for autocompletion
session::global_set('pathMapping', $this->pathMapping);
+ session::global_set('department_info', $config->department_info);
}
@@ -109,6 +111,7 @@ class baseSelector {
if(isset($_REQUEST['BPID']) && $_REQUEST['BPID'] == $this->pid) {
if (isset($_POST['bs_rebase_'.$this->pid]) && !empty($_POST['bs_rebase_'.$this->pid])) {
$new_base= base64_decode($_POST['bs_rebase_'.$this->pid]);
+
if (isset($this->pathMapping[$new_base])) {
$this->base= $new_base;
$this->action= 'rebase';
@@ -117,16 +120,17 @@ class baseSelector {
return false;
}
}else{
+
// Input field set?
if (isset($_POST['bs_input_'.$this->pid])) {
// Take over input field base
- if ($this->submitButton && isset($_POST['submit_base_'.$this->pid.'_x']) || !$this->submitButton) {
+ if ($this->submitButton && isset($_POST['submit_base_'.$this->pid]) || !$this->submitButton) {
// Check if base is available
$this->lastState= false;
foreach ($this->pathMapping as $key => $path) {
- if (mb_strtolower($path) == mb_strtolower($_POST['bs_input_'.$this->pid])) {
+ if (mb_strtolower($path) == mb_strtolower(get_post('bs_input_'.$this->pid))) {
$this->base= $key;
$this->lastState= true;
break;
@@ -196,14 +200,14 @@ class baseSelector {
}
// Close tree
- for ($i= 0; $i<$last_indent; $i++) {
+ for ($i= 1; $i<$last_indent; $i++) {
$this->tree.= "\n";
}
$this->tree.= "\n";
// Draw submitter if required
if ($this->submitButton) {
- $this->tree.= image('images/lists/submit.png', null, "submit_base_".$this->pid, _("Submit"));
+ $this->tree.= image('images/lists/submit.png', "submit_base_".$this->pid, _("Submit"));
}
$this->tree.= "";
$this->tree.= "";