From 3aa01ec5137e0821e8245f7d52061eb8706a54a8 Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Sat, 24 Dec 2011 02:01:54 +0000 Subject: [PATCH] - Web: Don't display VirtualBox version number information in the coproc field while displaying host information. html/inc/ host.inc svn path=/trunk/boinc/; revision=24882 --- checkin_notes | 7 +++++++ html/inc/host.inc | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/checkin_notes b/checkin_notes index 4768e85a68..1021be9205 100644 --- a/checkin_notes +++ b/checkin_notes @@ -9371,3 +9371,10 @@ Charlie 23 Dec 2011 samples/vboxwrapper/ vboxwrapper.cpp + +Rom 23 Dec 2011 + - Web: Don't display VirtualBox version number information in the coproc field while + displaying host information. + + html/inc/ + host.inc diff --git a/html/inc/host.inc b/html/inc/host.inc index 1fdcd413f6..210cb24615 100644 --- a/html/inc/host.inc +++ b/html/inc/host.inc @@ -238,7 +238,7 @@ function host_nresults($host) { return BoincResult::count("hostid=$host->id"); } -// Given string of the form [BOINC|vers][type|model|count|RAM|driver-vers], +// Given string of the form [BOINC|vers][type|model|count|RAM|driver-vers][vbox|vers], // return a human-readable version of the GPU info // function gpu_desc($x) { @@ -249,8 +249,9 @@ function gpu_desc($x) { $desc = trim($desc, "["); $d = explode("|", $desc); //print_r($d); - if ($d[0] == "BOINC") continue; - if ($str) $str .= ", "; + if ($d[0] == "BOINC") continue; + if ($d[0] == "vbox") continue; + if ($str) $str .= ", "; if ($d[2]!="" && $d[2]!="1") $str .= "[".$d[2]."] "; if ($d[0] == "CUDA") { $str .= "NVIDIA";