Merge pull request #2058 from owncloud/fix-getlog

Fix encoding settings ajax getlog
This commit is contained in:
Frank Karlitschek 2013-03-03 14:38:32 -08:00
commit d8d14637f3

View file

@ -11,6 +11,15 @@ $count=(isset($_GET['count']))?$_GET['count']:50;
$offset=(isset($_GET['offset']))?$_GET['offset']:0;
$entries=OC_Log_Owncloud::getEntries($count, $offset);
$data = array();
foreach($entries as $entry) {
$data[] = array(
'level' => OC_Util::sanitizeHTML($entry->level),
'app' => OC_Util::sanitizeHTML($entry->app),
'message' => OC_Util::sanitizeHTML($entry->message),
'time' => OC_Util::sanitizeHTML($entry->time),
);
}
OC_JSON::success(array(
"data" => OC_Util::sanitizeHTML($entries),
"data" => $data,
"remain"=>(count(OC_Log_Owncloud::getEntries(1, $offset + $offset)) != 0) ? true : false));