Merge pull request #9 from icewind1991/time-reformat

Reformat date from the log if needed

Author: icewind1991

controller/logcontroller.php

@@ -47,13 +47,19 @@ public function __construct($appName,
 		$this->config = $config;
 	}
 
+	private function getLogIterator() {
+		$dateFormat = $this->config->getSystemValue('logdateformat', \DateTime::ISO8601);
+		$handle = fopen(\OC_Log_Owncloud::getLogFilePath(), 'rb');
+		return new LogIterator($handle, $dateFormat);
+	}
+
 	/**
 	 * @param int $count
 	 * @param int $offset
 	 * @return TemplateResponse
 	 */
 	public function get($count = 50, $offset = 0) {
-		$iterator = new LogIterator(fopen(\OC_Log_Owncloud::getLogFilePath(), 'rb'));
+		$iterator = $this->getLogIterator();
 		return $this->responseFromIterator($iterator, $count, $offset);
 	}
 
@@ -64,7 +70,7 @@ public function get($count = 50, $offset = 0) {
 	 * @return TemplateResponse
 	 */
 	public function search($query = '', $count = 50, $offset = 0) {
-		$iterator = new LogIterator(fopen(\OC_Log_Owncloud::getLogFilePath(), 'rb'));
+		$iterator = $this->getLogIterator();
 		$iterator = new SearchFilter($iterator, $query);
 		return $this->responseFromIterator($iterator, $count, $offset);
 	}

log/logiterator.php

@@ -39,11 +39,18 @@ class LogIterator implements \Iterator {
 
 	private $currentKey = -1;
 
+	/**
+	 * @var string
+	 */
+	private $dateFormat;
+
 	/**
 	 * @param resource $handle
+	 * @param string $dateFormat
 	 */
-	public function __construct($handle) {
+	public function __construct($handle, $dateFormat) {
 		$this->handle = $handle;
+		$this->dateFormat = $dateFormat;
 		$this->rewind();
 		$this->next();
 	}
@@ -55,7 +62,12 @@ function rewind() {
 	}
 
 	function current() {
-		return json_decode($this->lastLine);
+		$entry = json_decode($this->lastLine, true);
+		if ($this->dateFormat !== \DateTime::ISO8601) {
+			$time = \DateTime::createFromFormat($this->dateFormat, $entry['time']);
+			$entry['time'] = $time->format(\DateTime::ISO8601);
+		}
+		return $entry;
 	}
 
 	function key() {