aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-04-17 14:05:51 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2013-08-01 18:09:18 +0200
commit45f5c9ceb27e6ef545f5f58deccb4a5153071563 (patch)
treeb83382f1e2fd258977037e5459ea5d5977b891d8
parent8930725a873937e45aef1f17d21fe406352f72c3 (diff)
downloadnextcloud-server-45f5c9ceb27e6ef545f5f58deccb4a5153071563.tar.gz
nextcloud-server-45f5c9ceb27e6ef545f5f58deccb4a5153071563.zip
fix admin log display and use a more readable format
-rw-r--r--lib/log/owncloud.php2
-rw-r--r--settings/js/log.js6
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/log/owncloud.php b/lib/log/owncloud.php
index 8c593528293..7a11a588330 100644
--- a/lib/log/owncloud.php
+++ b/lib/log/owncloud.php
@@ -49,7 +49,7 @@ class OC_Log_Owncloud {
public static function write($app, $message, $level) {
$minLevel=min(OC_Config::getValue( "loglevel", OC_Log::WARN ), OC_Log::ERROR);
if($level>=$minLevel) {
- $time = date("Y-m-d H:i:s", time());
+ $time = date("F d, Y H:i:s", time());
$entry=array('app'=>$app, 'message'=>$message, 'level'=>$level, 'time'=> $time);
$handle = @fopen(self::$logFile, 'a');
if ($handle) {
diff --git a/settings/js/log.js b/settings/js/log.js
index 09b8ec1ab44..bfcfcf0333e 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -46,7 +46,11 @@ OC.Log={
row.append(messageTd);
var timeTd=$('<td/>');
- timeTd.text(formatDate(entry.time*1000));
+ if(isNaN(entry.time)){
+ timeTd.text(entry.time);
+ } else {
+ timeTd.text(formatDate(entry.time*1000));
+ }
row.append(timeTd);
$('#log').append(row);
}