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

Merge pull request #2059 from owncloud/getlog 

Add log as text and not as HTML
This commit is contained in:
Frank Karlitschek 2013-03-04 00:00:04 -08:00
parent 841daf4845 962b7a7c80
commit 17f7bd4c14
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
settings/ajax/getlog.php
View File

@ -12,14 +12,7 @@ $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" => $data,
"data" => $entries,
"remain"=>(count(OC_Log_Owncloud::getEntries(1, $offset + $offset)) != 0) ? true : false));

2
settings/js/log.js
View File

@ -42,7 +42,7 @@ OC.Log={
row.append(appTd);
var messageTd=$('<td/>');
messageTd.html(entry.message);
messageTd.text(entry.message);
row.append(messageTd);
var timeTd=$('<td/>');