Merge pull request #4293 from owncloud/config-date

make log date configurable, default to iso 8601

config/config.sample.php

@@ -188,5 +188,8 @@ $CONFIG = array(
 //links to custom clients
 'customclient_desktop' => '', //http://owncloud.org/sync-clients/
 'customclient_android' => '', //https://play.google.com/store/apps/details?id=com.owncloud.android
-'customclient_ios' => '' //https://itunes.apple.com/us/app/owncloud/id543672169?mt=8
+'customclient_ios' => '', //https://itunes.apple.com/us/app/owncloud/id543672169?mt=8
+
+// date format to be used while writing to the owncloud logfile
+'logdateformat' => 'F d, Y H:i:s'
 );

lib/log/owncloud.php

@@ -44,12 +44,14 @@ class OC_Log_Owncloud {
 	 * write a message in the log
 	 * @param string $app
 	 * @param string $message
-	 * @param int level
+	 * @param int $level
 	 */
 	public static function write($app, $message, $level) {
 		$minLevel=min(OC_Config::getValue( "loglevel", OC_Log::WARN ), OC_Log::ERROR);
 		if($level>=$minLevel) {
-			$time = date("F d, Y H:i:s", time());
+			// default to ISO8601
+			$format = OC_Config::getValue('logdateformat', 'c');
+			$time = date($format, time());
 			$entry=array('app'=>$app, 'message'=>$message, 'level'=>$level, 'time'=> $time);
 			$handle = @fopen(self::$logFile, 'a');
 			if ($handle) {
@@ -61,8 +63,8 @@ class OC_Log_Owncloud {
 
 	/**
 	 * get entries from the log in reverse chronological order
-	 * @param int limit
-	 * @param int offset
+	 * @param int $limit
+	 * @param int $offset
 	 * @return array
 	 */
 	public static function getEntries($limit=50, $offset=0) {