From 137a282a1b479c84e4ca465b5580fe25c39d4ec6 Mon Sep 17 00:00:00 2001
From: Mafoo <mafoo@users.noreply.github.com>
Date: Thu, 8 Jun 2017 19:44:15 +0100
Subject: [PATCH] Enhance - system_info (#2656)

display more information about the operating system
---
 app/system/app_languages.php | 22 ++++++++++++++++-
 app/system/system.php        | 46 +++++++++++++++++++++++++++++++-----
 2 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/app/system/app_languages.php b/app/system/app_languages.php
index 079a283565..bb62b3a1f4 100644
--- a/app/system/app_languages.php
+++ b/app/system/app_languages.php
@@ -179,7 +179,27 @@ $text['label-os']['pt-pt'] = "Sistema Operativo";
 $text['label-os']['ro-ro'] = "";
 $text['label-os']['ru-ru'] = "Операционная система";
 $text['label-os']['sv-se'] = "Operativsystem";
-$text['label-os']['uk-ua'] = "Операційна система ";
+$text['label-os']['uk-ua'] = "Операційна система";
+
+$text['label-kernel']['en-us'] = "Kernel";
+$text['label-kernel']['ar-eg'] = "";
+$text['label-kernel']['de-at'] = "";
+$text['label-kernel']['de-ch'] = "";
+$text['label-kernel']['de-de'] = "";
+$text['label-kernel']['es-cl'] = "";
+$text['label-kernel']['es-mx'] = "";
+$text['label-kernel']['fr-ca'] = "";
+$text['label-kernel']['fr-fr'] = "";
+$text['label-kernel']['he-il'] = "";
+$text['label-kernel']['it-it'] = "";
+$text['label-kernel']['nl-nl'] = "";
+$text['label-kernel']['pl-pl'] = "";
+$text['label-kernel']['pt-br'] = "";
+$text['label-kernel']['pt-pt'] = "";
+$text['label-kernel']['ro-ro'] = "";
+$text['label-kernel']['ru-ru'] = "";
+$text['label-kernel']['sv-se'] = "";
+$text['label-kernel']['uk-ua'] = "";
 
 $text['label-version']['en-us'] = "Version";
 $text['label-version']['ar-eg'] = "";
diff --git a/app/system/system.php b/app/system/system.php
index 97d285f485..ac06b150ab 100644
--- a/app/system/system.php
+++ b/app/system/system.php
@@ -172,20 +172,54 @@
 		echo "	<th class='th' colspan='2' align='left' style='padding-top:2em'>".$text['title-os-info']."</th>\n";
 		echo "</tr>\n";
 
-		echo "<!--\n";
-		$tmp_result = shell_exec('uname -a');
-		echo "-->\n";
-		if (strlen($tmp_result) > 0) {
+		if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+			echo "<!--\n";
+			$data = explode("\n",shell_exec('systeminfo /FO CSV 2> nul'));
+			$data = array_combine(str_getcsv($data[0]), str_getcsv($data[1]));
+			$os_name = $data['OS Name'];
+			$os_version = $data['OS Version'];
+			unset($data);
+			echo "-->\n";
+		}
+		else {
+			echo "<!--\n";
+			$os_kernel = shell_exec('uname -a');
+			$os_name = shell_exec('lsb_release -is');
+			$os_version = shell_exec('lsb_release -rs');
+			echo "-->\n";
+		}
+		
+		if (strlen($os_name) > 0) {
 			echo "<tr>\n";
 			echo "	<td width='20%' class=\"vncell\" style='text-align: left;'>\n";
 			echo "		".$text['label-os']." \n";
 			echo "	</td>\n";
 			echo "	<td class=\"row_style1\">\n";
-			echo "		".$tmp_result." \n";
+			echo "		".$os_name." \n";
 			echo "	</td>\n";
 			echo "</tr>\n";
 		}
-		unset($tmp_result);
+		if (strlen($os_version) > 0) {
+			echo "<tr>\n";
+			echo "	<td width='20%' class=\"vncell\" style='text-align: left;'>\n";
+			echo "		".$text['label-version']." \n";
+			echo "	</td>\n";
+			echo "	<td class=\"row_style1\">\n";
+			echo "		".$os_version." \n";
+			echo "	</td>\n";
+			echo "</tr>\n";
+		}
+		if (strlen($os_kernel) > 0) {
+			echo "<tr>\n";
+			echo "	<td width='20%' class=\"vncell\" style='text-align: left;'>\n";
+			echo "		".$text['label-kernel']." \n";
+			echo "	</td>\n";
+			echo "	<td class=\"row_style1\">\n";
+			echo "		".$os_kernel." \n";
+			echo "	</td>\n";
+			echo "</tr>\n";
+		}
+		unset($os_name, $os_version, $os_kernel);
 
 		echo "<!--\n";
 		$tmp_result = shell_exec('uptime');