fix admin log display and use a more readable format

diff --git a/lib/log/owncloud.php b/lib/log/owncloud.php
index 8c593528293964e48c0fb92d9e04eef20ba35cb4..7a11a588330c7a79902fda7e82a25a0fcf4aaebe 100644 (file)
--- 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 81117f9e8272de09a5eb3ee4cca7b9159355005c..84f6d1aa5f3f9f6cbc58d2f8ee8134b685756657 100644 (file)
--- 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);
                }