fixed limit restriction in doSearch()

This commit is contained in:
Uwe Steinmann 2015-03-13 08:08:28 +01:00
parent b59139202d
commit 401d02daaf

View File

@ -680,18 +680,17 @@ function doSearch() { /* {{{ */
$mode = $app->request()->get('mode'); $mode = $app->request()->get('mode');
if(!$limit = $app->request()->get('limit')) if(!$limit = $app->request()->get('limit'))
$limit = 8; $limit = 8;
$resArr = $dms->search($querystr, $limit); $resArr = $dms->search($querystr);
$entries = array(); $entries = array();
$count = 0; $count = 0;
if($resArr['folders']) { if($resArr['folders']) {
foreach ($resArr['folders'] as $entry) { foreach ($resArr['folders'] as $entry) {
if ($entry->getAccessMode($userobj) >= M_READ) { if ($entry->getAccessMode($userobj) >= M_READ) {
$entries[] = $entry; $entries[] = $entry;
if($count < $limit) $count++;
$count++;
else
break;
} }
if($count >= $limit)
break;
} }
} }
$count = 0; $count = 0;
@ -699,11 +698,10 @@ function doSearch() { /* {{{ */
foreach ($resArr['docs'] as $entry) { foreach ($resArr['docs'] as $entry) {
if ($entry->getAccessMode($userobj) >= M_READ) { if ($entry->getAccessMode($userobj) >= M_READ) {
$entries[] = $entry; $entries[] = $entry;
if($count < $limit) $count++;
$count++;
else
break;
} }
if($count >= $limit)
break;
} }
} }