index d0b9eab7b568bba5f1659c2f5b265d3880e46a33..c6ac8d2b70c391cd79e0b85ad5db83010dc4d0e0 100644 (file)
$elements= array_reverse($elements, true);
$this->pathMapping[$base]= $base == $config->current['BASE']? '/' : ldap::fix(preg_replace('/(^|,)[a-z0-9]+=/i', '/', implode(',', $elements)));
$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);
}
// Save bases to session for autocompletion
session::global_set('pathMapping', $this->pathMapping);
+ session::global_set('department_info', $config->department_info);
}
}
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($_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';
if (isset($this->pathMapping[$new_base])) {
$this->base= $new_base;
$this->action= 'rebase';
return false;
}
}else{
return false;
}
}else{
+
// Input field set?
if (isset($_POST['bs_input_'.$this->pid])) {
// Take over input field base
// 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) {
// 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;
$this->base= $key;
$this->lastState= true;
break;
}
$selected= $this->base == $base?" class='treeListSelected'":"";
$link= "onclick=\"\$('bs_rebase_".$this->pid."').value='".base64_encode($base)."';$('submit_tree_base_".$this->pid."').click();\"";
}
$selected= $this->base == $base?" class='treeListSelected'":"";
$link= "onclick=\"\$('bs_rebase_".$this->pid."').value='".base64_encode($base)."';$('submit_tree_base_".$this->pid."').click();\"";
- $this->tree.= "<li><a$selected $link>".
- "<img class='center' src='".$config->department_info[$base]['img']."'> ".
+ $this->tree.= "<li>".
+ image($config->department_info[$base]['img'])." <a$selected $link>".
$this->gennonbreaks($config->department_info[$base]['name']).
($config->department_info[$base]['description']==''?'':' <span class="informal">['.$this->gennonbreaks($config->department_info[$base]['description']).']</span>').
"</a>";
$this->gennonbreaks($config->department_info[$base]['name']).
($config->department_info[$base]['description']==''?'':' <span class="informal">['.$this->gennonbreaks($config->department_info[$base]['description']).']</span>').
"</a>";
}
// Close tree
}
// Close tree
- for ($i= 0; $i<$last_indent; $i++) {
+ for ($i= 1; $i<$last_indent; $i++) {
$this->tree.= "</li></ul>\n";
}
$this->tree.= "</div>\n";
// Draw submitter if required
if ($this->submitButton) {
$this->tree.= "</li></ul>\n";
}
$this->tree.= "</div>\n";
// Draw submitter if required
if ($this->submitButton) {
- $this->tree.= " <input class='center' type='image' src='images/lists/submit.png' align='middle' title='"._("Submit")."' name='submit_base_".$this->pid."' id='submit_base_".$this->pid."' alt='"._("Submit")."'>";
+ $this->tree.= image('images/lists/submit.png', "submit_base_".$this->pid, _("Submit"));
}
$this->tree.= "<input type='submit' style='display:none' name='submit_tree_base_".$this->pid."' id='submit_tree_base_".$this->pid."'>";
$this->tree.= "<input type='hidden' name='bs_rebase_".$this->pid."' id='bs_rebase_".$this->pid."'>";
}
$this->tree.= "<input type='submit' style='display:none' name='submit_tree_base_".$this->pid."' id='submit_tree_base_".$this->pid."'>";
$this->tree.= "<input type='hidden' name='bs_rebase_".$this->pid."' id='bs_rebase_".$this->pid."'>";