mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3094 from owncloud/log-ajax 

fix logical issue while retrieving log via ajax
This commit is contained in:
Bart Visscher 2013-04-25 01:21:59 -07:00
parent a0df5903b0 8fab7d5afb
commit 63b2699720
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
settings/admin.php
View File

@ -20,11 +20,6 @@ $htaccessworking=OC_Util::ishtaccessworking();
$entries=OC_Log_Owncloud::getEntries(3);
$entriesremain=(count(OC_Log_Owncloud::getEntries(4)) > 3)?true:false;
function compareEntries($a, $b) {
return $b->time - $a->time;
}
usort($entries, 'compareEntries');
$tmpl->assign('loglevel', OC_Config::getValue( "loglevel", 2 ));
$tmpl->assign('entries', $entries);
$tmpl->assign('entriesremain', $entriesremain);

9
settings/ajax/getlog.php
View File

@ -13,6 +13,9 @@ $offset=(isset($_GET['offset']))?$_GET['offset']:0;
$entries=OC_Log_Owncloud::getEntries($count, $offset);
$data = array();
OC_JSON::success(array(
"data" => $entries,
"remain"=>(count(OC_Log_Owncloud::getEntries(1, $offset + $offset)) != 0) ? true : false));
OC_JSON::success(
array(
"data" => $entries,
"remain"=>(count(OC_Log_Owncloud::getEntries(1, $offset + $count)) != 0) ? true : false
)
);