From 06bcb220b54dc289ed0776f625dab674b69bc618 Mon Sep 17 00:00:00 2001
From: Roger Szabo <roger.szabo@web.de>
Date: Thu, 9 Mar 2017 18:31:25 +0800
Subject: [PATCH 1/4] audit log the user-agent

Signed-off-by: Roger Szabo <roger.szabo@web.de>
---
 apps/admin_audit/lib/actions/action.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/admin_audit/lib/actions/action.php b/apps/admin_audit/lib/actions/action.php
index 2d036675869..e83c33a68ca 100644
--- a/apps/admin_audit/lib/actions/action.php
+++ b/apps/admin_audit/lib/actions/action.php
@@ -74,6 +74,10 @@ class Action {
 			}
 			$replaceArray[] = $params[$element];
 		}
+		
+		//log the User-Agent
+		$text = $text.' with User-Agent: "%s"';
+		$replaceArray[] = $_SERVER['HTTP_USER_AGENT'];	
 
 		$this->logger->info(
 			vsprintf(

From 06a8ac6ff694301c8bc51169f6b86d16a7f5ea4e Mon Sep 17 00:00:00 2001
From: Roger Szabo <roger.szabo@web.de>
Date: Fri, 10 Mar 2017 16:50:15 +0800
Subject: [PATCH 2/4] log user agent globally instead

Signed-off-by: Roger Szabo <roger.szabo@web.de>
---
 apps/admin_audit/lib/actions/action.php | 4 ----
 lib/private/Log/File.php                | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/admin_audit/lib/actions/action.php b/apps/admin_audit/lib/actions/action.php
index e83c33a68ca..2d036675869 100644
--- a/apps/admin_audit/lib/actions/action.php
+++ b/apps/admin_audit/lib/actions/action.php
@@ -74,10 +74,6 @@ class Action {
 			}
 			$replaceArray[] = $params[$element];
 		}
-		
-		//log the User-Agent
-		$text = $text.' with User-Agent: "%s"';
-		$replaceArray[] = $_SERVER['HTTP_USER_AGENT'];	
 
 		$this->logger->info(
 			vsprintf(
diff --git a/lib/private/Log/File.php b/lib/private/Log/File.php
index be8b72b3a3f..b1acd0175c5 100644
--- a/lib/private/Log/File.php
+++ b/lib/private/Log/File.php
@@ -101,6 +101,7 @@ class File {
 		} else {
 			$user = '--';
 		}
+		$userAgent = ($request->getHeader('User-Agent') !== '') ? $request->getHeader('User-Agent') : '--';
 		$version = $config->getValue('version', '');
 		$entry = compact(
 			'reqId',
@@ -112,6 +113,7 @@ class File {
 			'method',
 			'url',
 			'user',
+			'userAgent',
 			'version'
 		);
 		$entry = json_encode($entry);

From 38d8492f30fa6e8e530711986042487c6310360b Mon Sep 17 00:00:00 2001
From: Roger Szabo <roger.szabo@web.de>
Date: Fri, 10 Mar 2017 17:20:19 +0800
Subject: [PATCH 3/4] improvement of userAgent variable assigment

Signed-off-by: Roger Szabo <roger.szabo@web.de>
---
 lib/private/Log/File.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/Log/File.php b/lib/private/Log/File.php
index b1acd0175c5..0c30d2f1c00 100644
--- a/lib/private/Log/File.php
+++ b/lib/private/Log/File.php
@@ -101,7 +101,7 @@ class File {
 		} else {
 			$user = '--';
 		}
-		$userAgent = ($request->getHeader('User-Agent') !== '') ? $request->getHeader('User-Agent') : '--';
+		$userAgent = $request->getHeader('User-Agent') ?: '--';
 		$version = $config->getValue('version', '');
 		$entry = compact(
 			'reqId',

From 35369ecc9684dc0c44c1bd6e418619ed3c148390 Mon Sep 17 00:00:00 2001
From: Roger Szabo <roger.szabo@web.de>
Date: Fri, 10 Mar 2017 17:24:37 +0800
Subject: [PATCH 4/4] author update

Signed-off-by: Roger Szabo <roger.szabo@web.de>
---
 lib/private/Log/File.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/private/Log/File.php b/lib/private/Log/File.php
index 0c30d2f1c00..4c7ef446a05 100644
--- a/lib/private/Log/File.php
+++ b/lib/private/Log/File.php
@@ -14,6 +14,7 @@
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Thomas Pulzer <t.pulzer@kniel.de>
  * @author Vincent Petry <pvince81@owncloud.com>
+ * @author Roger Szabo <roger.szabo@web.de>
  *
  * @license AGPL-3.0
  *