Commit 3d6b39900dd4e3cc5b3ead6c827fa098924c122d
1 parent
2cf24923
Update script to include kernel version and os type
PT: 1591661 Committed by: Megan Watson
Showing
1 changed file
with
11 additions
and
5 deletions
bin/system_info.php
| @@ -151,22 +151,28 @@ function getKTEdition() | @@ -151,22 +151,28 @@ function getKTEdition() | ||
| 151 | function getOSInfo() | 151 | function getOSInfo() |
| 152 | { | 152 | { |
| 153 | $server = php_uname(); | 153 | $server = php_uname(); |
| 154 | - $flavour = '';//'|-'; | 154 | + $server_arr = explode(' ', $server); |
| 155 | + | ||
| 156 | + // kernel version and os type - 32bit / 64bit | ||
| 157 | + $kernel_v = $server_arr[2]; | ||
| 158 | + $os_v = array_pop($server_arr); | ||
| 155 | 159 | ||
| 156 | if(strpos($server, 'Darwin') !== false){ | 160 | if(strpos($server, 'Darwin') !== false){ |
| 157 | $os = 'Mac OS X'; | 161 | $os = 'Mac OS X'; |
| 158 | }else if(strpos($server, 'Win') !== false){ | 162 | }else if(strpos($server, 'Win') !== false){ |
| 159 | $os = 'Windows'; | 163 | $os = 'Windows'; |
| 164 | + // windows differs from *nix | ||
| 165 | + // kernel version = windows version | ||
| 166 | + // os version = build number | ||
| 167 | + $kernel_v = $server_arr[3]; | ||
| 168 | + $os_v = array_pop($server_arr); | ||
| 160 | }else if(strpos($server, 'Linux') !== false) { | 169 | }else if(strpos($server, 'Linux') !== false) { |
| 161 | - // Again regular expressions would be nice... | ||
| 162 | - // $pos = strpos($server, 'SMP'); | ||
| 163 | - // $flavour = '|'.substr($server, 6, $pos-7); | ||
| 164 | $os = 'Linux'; | 170 | $os = 'Linux'; |
| 165 | }else { | 171 | }else { |
| 166 | $os = 'Unix'; | 172 | $os = 'Unix'; |
| 167 | } | 173 | } |
| 168 | 174 | ||
| 169 | - return $os.$flavour; | 175 | + return $os.'|'.$kernel_v.'|'.$os_v; |
| 170 | } | 176 | } |
| 171 | 177 | ||
| 172 | function sendForm($data) | 178 | function sendForm($data) |