X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_listing.inc;h=e66ff530847801ca0e05e62f6bbf5a9548465a8f;hb=9f97e0838b447e659085ba136e50f375e885804c;hp=d1a2d3d1361be8ef52ab2c5f1ca849811a8a9329;hpb=af70293b5e682561b4d510c2dc276fbd17f29b19;p=gosa.git diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc index d1a2d3d13..e66ff5308 100644 --- a/gosa-core/include/class_listing.inc +++ b/gosa-core/include/class_listing.inc @@ -271,7 +271,7 @@ class listing { // Some browsers don't have the ability do do scrollable table bodies, filter them // here. $switch= false; - if (preg_match('/(Opera|Konqueror|Safari|msie)/i', $_SERVER['HTTP_USER_AGENT'])){ + if (preg_match('/(Opera|Konqueror|Safari)/i', $_SERVER['HTTP_USER_AGENT'])){ $switch= true; } @@ -380,10 +380,10 @@ class listing { // Complete list by sorting entries for _sort$index and appending them to the output $entryIterator= new listingSortIterator($this->entries, $this->sortDirection[$this->sortColumn], "_sort".$this->sortColumn, $this->sortType); foreach ($entryIterator as $row => $entry){ - $alt++; $result.="\n"; $result.= $entry['_rendered']; $result.="\n"; + $alt++; } // Need to fill the list if it's not full (nobody knows why this is 22 ;-)) @@ -472,6 +472,10 @@ class listing { // Take care of base selector if ($this->baseMode) { $this->baseSelector->update(); + // Check if a wrong base was supplied + if(!$this->baseSelector->checkLastBaseUpdate()){ + msg_dialog::display(_("Error"), msgPool::check_base(), ERROR_DIALOG); + } } // Save base @@ -1246,7 +1250,7 @@ class listing { $checkAcl= ""; // Category or detailed permission? - if (strpos('/', $module) === false) { + if (strpos($module, '/') !== false) { if (preg_match('/([a-zA-Z0-9]+):([rwcdm]+)/', $sAcl, $m) ) { $checkAcl= $ui->get_permissions($dn, $module, $m[1]); $sAcl= $m[2];