From fd45988eabd84e1b53687becf3c8a02a86be90b4 Mon Sep 17 00:00:00 2001
From: Kohei Tamura <ktamura.biz.80@gmail.com>
Date: Thu, 31 Aug 2017 13:24:37 +0900
Subject: [PATCH] Add more information to client information page

---
 src/main/resources/messages_en.properties |  6 +++++
 src/main/resources/messages_ja.properties |  6 +++++
 src/main/webapp/uid/clientinfo.jsp        | 32 +++++++++++++++++------
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties
index 020cb00d..078d7cb6 100644
--- a/src/main/resources/messages_en.properties
+++ b/src/main/resources/messages_en.properties
@@ -13,9 +13,11 @@ description.send.mail=You can send a mail to the site administrator.
 label.access.time=Access Time
 label.available.characters=Available Characters
 label.attach.file=Attach File
+label.browser=Browser
 label.calculate=Calculate
 label.capitalized.string=Capitalized String
 label.character.count=Character Count
+label.code=Code
 label.content=Content
 label.current.date=Current Date
 label.current.thread.count=Current Thread Count
@@ -27,6 +29,7 @@ label.history.back=Back
 label.ip.address=IP Address
 label.json.string=JSON String
 label.key=Key
+label.language=Language
 label.login=Log in
 label.login.user.id=Login User ID
 label.logout=Log out
@@ -41,6 +44,7 @@ label.memory.peak.usage=Peak Memory Usage
 label.memory.collection.usage=Collection Usage
 label.metaspace=Metaspace
 label.permgen.space=PermGen space
+label.platform=Platform
 label.name=Name
 label.numbers=Numbers
 label.obelus=/
@@ -68,8 +72,10 @@ label.timezone.use.daylight.time=Useing DST
 label.update=Update
 label.upload=Upload
 label.uppercase.characters=Uppercase Characters
+label.user.agent=User Agent
 label.user.id=User ID
 label.value=Value
+label.version=Version
 label.your.name=Your Name
 label.your.mail=Your Mail Address
 msg.account.locked=Your account is locked out because the number of login failures exceeds 10 times.
diff --git a/src/main/resources/messages_ja.properties b/src/main/resources/messages_ja.properties
index d4732e92..413238b2 100644
--- a/src/main/resources/messages_ja.properties
+++ b/src/main/resources/messages_ja.properties
@@ -13,9 +13,11 @@ description.send.mail=\u30b5\u30a4\u30c8\u306e\u7ba1\u7406\u8005\u306b\u30e1\u30
 label.access.time=\u30a2\u30af\u30bb\u30b9\u6642\u523b
 label.available.characters=\u5229\u7528\u53ef\u80fd\u306a\u6587\u5b57
 label.attach.file=\u6dfb\u4ed8\u30d5\u30a1\u30a4\u30eb
+label.browser=\u30d6\u30e9\u30a6\u30b6
 label.calculate=\u8a08\u7b97\u3059\u308b
 label.capitalized.string=\u5148\u982d\u3092\u5927\u6587\u5b57\u306b\u3057\u305f\u6587\u5b57\u5217
 label.character.count=\u6587\u5b57\u6570
+label.code=\u30b3\u30fc\u30c9
 label.content=\u672c\u6587
 label.current.date=\u73fe\u5728\u65e5\u4ed8
 label.current.thread.count=\u73fe\u5728\u306e\u30b9\u30ec\u30c3\u30c9\u6570
@@ -27,6 +29,7 @@ label.history.back=\u623b\u308b
 label.ip.address=IP\u30a2\u30c9\u30ec\u30b9
 label.json.string=JSON\u6587\u5b57\u5217
 label.key=\u30ad\u30fc
+label.language=\u8a00\u8a9e
 label.login=\u30ed\u30b0\u30a4\u30f3
 label.login.user.id=\u30ed\u30b0\u30a4\u30f3\u30e6\u30fc\u30b6\u30fcID
 label.logout=\u30ed\u30b0\u30a2\u30a6\u30c8
@@ -47,6 +50,7 @@ label.obelus=\u00f7
 label.password=\u30d1\u30b9\u30ef\u30fc\u30c9
 label.phone=\u96fb\u8a71\u756a\u53f7
 label.ping.url=Ping\u3059\u308bURL
+label.platform=\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0
 label.response.code=\u5fdc\u7b54\u30b3\u30fc\u30c9
 label.response.time=\u5fdc\u7b54\u6642\u9593
 label.reversed.string=\u9006\u8ee2\u3057\u305f\u6587\u5b57\u5217
@@ -68,8 +72,10 @@ label.timezone.use.daylight.time=\u590f\u6642\u9593\u3092\u4f7f\u7528\u3059\u308
 label.update=\u66f4\u65b0
 label.upload=\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9
 label.uppercase.characters=\u534a\u89d2\u5927\u6587\u5b57
+label.user.agent=\u30e6\u30fc\u30b6\u30fc\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8
 label.user.id=\u30e6\u30fc\u30b6\u30fcID
 label.value=\u5024
+label.version=\u30d0\u30fc\u30b8\u30e7\u30f3
 label.your.name=\u3042\u306a\u305f\u306e\u540d\u524d
 label.your.mail=\u3042\u306a\u305f\u306e\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9
 msg.account.locked=\u30ed\u30b0\u30a4\u30f3\u9023\u7d9a\u5931\u6557\u56de\u6570\u304c10\u56de\u3092\u8d85\u3048\u305f\u305f\u3081\u3001\u30a2\u30ab\u30a6\u30f3\u30c8\u304c\u30ed\u30c3\u30af\u3055\u308c\u3066\u3044\u307e\u3059\u3002
diff --git a/src/main/webapp/uid/clientinfo.jsp b/src/main/webapp/uid/clientinfo.jsp
index 3e06d74f..9aa11ca3 100644
--- a/src/main/webapp/uid/clientinfo.jsp
+++ b/src/main/webapp/uid/clientinfo.jsp
@@ -28,18 +28,34 @@
 		</tr>
 	</table>
 	<hr style="margin-top: 0px" />
-	<ul>
-		<li><p>
-				User-Agent:
-				<%=request.getHeader("user-agent")%></p></li>
-		<li><p>
-				Accept-Language:
-				<%=request.getHeader("Accept-Language")%></p></li>
-	</ul>
+	<table class="table table-striped table-bordered table-hover" style="font-size: small;">
+		<tr><th><fmt:message key="label.key" /></th><th><fmt:message key="label.value" /></th></tr>
+		<tr><td><fmt:message key="label.code" /></td><td id="appCodeName"></td></tr>
+		<tr><td><fmt:message key="label.browser" /></td><td id="appName"></td></tr>
+		<tr><td><fmt:message key="label.version" /></td><td id="appVersion"></td></tr>
+		<tr><td><fmt:message key="label.platform" /></td><td id="platform"></td></tr>
+		<tr><td><fmt:message key="label.user.agent" /></td><td id="userAgent"></td></tr>
+		<tr><td><fmt:message key="label.language" /></td><td id="browserLanguage"></td></tr>
+	</table>
 	<hr />
 	<div class="alert alert-info" role="alert">
 		<span class="glyphicon glyphicon-info-sign"></span>&nbsp;
 		<fmt:message key="msg.note.unintended.file.disclosure" />
 	</div>
+	<script type="text/javascript">
+	<!--
+		document.getElementById("appCodeName").textContent=navigator.appCodeName;
+		document.getElementById("appName").textContent=navigator.appName;
+		document.getElementById("appVersion").textContent=navigator.appVersion;
+		document.getElementById("platform").textContent=navigator.platform;
+		document.getElementById("userAgent").textContent=navigator.userAgent;
+		document.getElementById("browserLanguage").textContent=navigator.browserLanguage;
+		if (document.all) {
+			document.getElementById("browserLanguage").textContent=navigator.browserLanguage;
+		} else {
+			document.getElementById("browserLanguage").textContent=navigator.language;
+		}
+	// -->
+	</script>
 </body>
 </html>
\ No newline at end of file