diff --git a/discovery.php b/discovery.php index 5873a9bd6..a231c7694 100755 --- a/discovery.php +++ b/discovery.php @@ -41,7 +41,7 @@ if(!$where) { if (file_exists('.svn')) { - list(,$dbu_rev) = split(': ',@shell_exec('svn info database-update.sql|grep ^Revision')); + list(,$dbu_rev) = preg_split('/: /',@shell_exec('svn info database-update.sql|grep ^Revision')); $device_query = mysql_query("SELECT revision FROM `dbSchema`"); if ($rev = @mysql_fetch_array($device_query)) diff --git a/html/images/icons/greyscale/storage.png b/html/images/icons/greyscale/storage.png index 6034d45d9..6c0f1b978 100644 Binary files a/html/images/icons/greyscale/storage.png and b/html/images/icons/greyscale/storage.png differ diff --git a/html/images/icons/storage.png b/html/images/icons/storage.png index 79bf874f1..5dd9b8bea 100755 Binary files a/html/images/icons/storage.png and b/html/images/icons/storage.png differ diff --git a/html/pages/health/processors.inc.php b/html/pages/health/processors.inc.php index 8d4ee6368..781aa32ea 100644 --- a/html/pages/health/processors.inc.php +++ b/html/pages/health/processors.inc.php @@ -8,6 +8,8 @@ if(devicepermitted($proc['device_id'])) { + if(!is_integer($i/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; } + $device = $proc; $text_descr = $proc['processor_descr']; diff --git a/html/pages/health/storage.inc.php b/html/pages/health/storage.inc.php index fd49ae19f..f2166d13a 100644 --- a/html/pages/health/storage.inc.php +++ b/html/pages/health/storage.inc.php @@ -6,7 +6,7 @@ $sql = "SELECT * FROM `storage` AS S, `devices` AS D WHERE S.device_id = D.devi $query = mysql_query($sql); echo("
- "); +
"); echo(" diff --git a/html/pages/health/temperatures.inc.php b/html/pages/health/temperatures.inc.php index 830b64ba6..4c1847e49 100644 --- a/html/pages/health/temperatures.inc.php +++ b/html/pages/health/temperatures.inc.php @@ -8,7 +8,7 @@ if($_SESSION['userlevel'] >= '5') { $query = mysql_query($sql); -echo('
Device
'); +echo('
'); echo(' @@ -30,6 +30,8 @@ while($temp = mysql_fetch_array($query)) $temp_popup = "', LEFT);\" onmouseout=\"return nd();\"> " . $temp['temp_descr'] . ""; + $temp['temp_current'] = round($temp['temp_current'],1); + $temp_perc = $temp['temp_current'] / $temp['temp_limit'] * 100; $temp_colour = percent_colour($temp_perc);
Device