From f7e29eabf29e4bda052ad170df1955fce0ad37ee Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <nukeawhale@gmail.com>
Date: Wed, 17 Apr 2013 14:05:51 +0200
Subject: [PATCH] fix admin log display and use a more readable format
---
lib/log/owncloud.php | 2 +-
settings/js/log.js | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/lib/log/owncloud.php b/lib/log/owncloud.php
index 8c59352829..7a11a58833 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 81117f9e82..84f6d1aa5f 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -55,7 +55,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);
}
--
GitLab