diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2013-03-03 14:38:32 -0800 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2013-03-03 14:38:32 -0800 |
| commit | d8d14637f331b55489acfa0b7574ae9af2b40611 (patch) | |
| tree | 72ea977e0b2b68a39153a8379a062fbd73a0d78b | |
| parent | 0488968443ee6d94f0695cb5189f5ea9b4d343b3 (diff) | |
| parent | 376f350af21ea83bcf7db73ae24c9f3618bb96fe (diff) | |
| download | nextcloud-server-d8d14637f331b55489acfa0b7574ae9af2b40611.tar.gz nextcloud-server-d8d14637f331b55489acfa0b7574ae9af2b40611.zip | |
Merge pull request #2058 from owncloud/fix-getlog
Fix encoding settings ajax getlog
| -rw-r--r-- | settings/ajax/getlog.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/settings/ajax/getlog.php b/settings/ajax/getlog.php index 043124fa175..e1fc1689877 100644 --- a/settings/ajax/getlog.php +++ b/settings/ajax/getlog.php @@ -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)); |