X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_listing.inc;h=d1a2d3d1361be8ef52ab2c5f1ca849811a8a9329;hb=9fee4c10382768e341abef8b0b69751e6b050e19;hp=20fcf22d62eea24eafb366640e8c5cb77e57f11f;hpb=24c0cdb7acc400ab5f11efe6267d81d19f066a8c;p=gosa.git diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc index 20fcf22d6..d1a2d3d13 100644 --- a/gosa-core/include/class_listing.inc +++ b/gosa-core/include/class_listing.inc @@ -284,13 +284,8 @@ class listing { $height= $this->height; } - $result.= ""; + $result.= "
\n"; - - $height= ""; - if ($switch){ - $height= "height:100%;"; - } - $result.= "\n"; + $result.= "
\n"; + $result.= "
\n"; $this->numColumns= count($this->colprops) + ($this->multiSelect?1:0); // Build list header @@ -410,11 +405,11 @@ class listing { } // Close list body - $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; }