From 3d6b39900dd4e3cc5b3ead6c827fa098924c122d Mon Sep 17 00:00:00 2001
From: Megan Watson <megan@knowledgetree.com>
Date: Fri, 30 Oct 2009 13:03:39 +0200
Subject: [PATCH] Update script to include kernel version and os type PT: 1591661

---
 bin/system_info.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/bin/system_info.php b/bin/system_info.php
index e9b39d0..c61ed8d 100644
--- a/bin/system_info.php
+++ b/bin/system_info.php
@@ -151,22 +151,28 @@ function getKTEdition()
 function getOSInfo()
 {
     $server = php_uname();
-    $flavour = '';//'|-';
+    $server_arr = explode(' ', $server);
+
+    // kernel version and os type - 32bit / 64bit
+    $kernel_v = $server_arr[2];
+    $os_v = array_pop($server_arr);
 
     if(strpos($server, 'Darwin') !== false){
         $os = 'Mac OS X';
     }else if(strpos($server, 'Win') !== false){
         $os = 'Windows';
+        // windows differs from *nix
+        // kernel version = windows version
+        // os version = build number
+        $kernel_v = $server_arr[3];
+        $os_v = array_pop($server_arr);
     }else if(strpos($server, 'Linux') !== false) {
-        // Again regular expressions would be nice...
-        // $pos = strpos($server, 'SMP');
-        // $flavour = '|'.substr($server, 6, $pos-7);
         $os = 'Linux';
     }else {
         $os = 'Unix';
     }
 
-    return $os.$flavour;
+    return $os.'|'.$kernel_v.'|'.$os_v;
 }
 
 function sendForm($data)
--
libgit2 0.21.4