\n";
$this->numColumns= count($this->colprops) + ($this->multiSelect?1:0);
// Build list header
@@ -410,11 +405,11 @@ class listing {
}
// Close list body
- $result.= "
";
+ $result.= "
";
// Add the footer if requested
if ($this->showFooter) {
- $result.= "
";
+ $result.= "
";
foreach ($this->objectTypes as $objectType) {
if (isset($this->objectTypeCount[$objectType['label']])) {
@@ -423,11 +418,10 @@ class listing {
}
}
- $result.= "
";
+ $result.= "";
}
// Close list
- $result.= "
";
$result.= $switch?"":"";
// Add scroll positioner
@@ -562,6 +556,7 @@ class listing {
$deps= $ui->get_module_departments($this->categories);
$this->base= $deps[0];
$this->baseSelector->setBase($this->base);
+ session::global_set("CurrentMainBase", $this->base);
}
if ($action == 'BACK') {
$deps= $ui->get_module_departments($this->categories);
@@ -569,12 +564,14 @@ class listing {
if(in_array_ics($base, $deps)){
$this->base= $base;
$this->baseSelector->setBase($this->base);
+ session::global_set("CurrentMainBase", $this->base);
}
}
if ($action == 'HOME') {
$ui= get_userinfo();
- $this->base= $this->filter->getObjectBase($ui->dn);
+ $this->base= get_base_from_people($ui->dn);
$this->baseSelector->setBase($this->base);
+ session::global_set("CurrentMainBase", $this->base);
}
}
@@ -977,7 +974,7 @@ class listing {
$listhead ="";
/* Check if we are in users home department */
- if(!count($deps) || $this->filter->base == $this->filter->getObjectBase($ui->dn)){
+ if(!count($deps) || $this->filter->base == get_base_from_people($ui->dn)){
$enableHome = false;
}