diff --git a/html/includes/graphs/current.inc.php b/html/includes/graphs/current.inc.php index 6a6396a76..d41120254 100644 --- a/html/includes/graphs/current.inc.php +++ b/html/includes/graphs/current.inc.php @@ -15,7 +15,6 @@ include("common.inc.php"); $rrd_filename = $config['rrd_dir'] . "/".$hostname."/" . safename("current-" . $current['current_descr'] . ".rrd"); $rrd_options .= " DEF:current=$rrd_filename:current:AVERAGE"; - $rrd_options .= " AREA:current#FFFF99"; $rrd_options .= " LINE1.5:current#cc0000:'" . $current['current_descr_fixed']."'"; $rrd_options .= " GPRINT:current:LAST:%3.0lfA"; $rrd_options .= " GPRINT:current:MAX:%3.0lfA\\\\l"; diff --git a/html/includes/graphs/fanspeed.inc.php b/html/includes/graphs/fanspeed.inc.php index 1cee05689..b697720ef 100644 --- a/html/includes/graphs/fanspeed.inc.php +++ b/html/includes/graphs/fanspeed.inc.php @@ -15,7 +15,6 @@ include("common.inc.php"); $rrd_filename = $config['rrd_dir'] . "/".$hostname."/" . safename("fan-" . $fanspeed['fan_descr'] . ".rrd"); $rrd_options .= " DEF:fan=$rrd_filename:fan:AVERAGE"; - $rrd_options .= " AREA:fan#FFFF99"; $rrd_options .= " LINE1.5:fan#cc0000:'" . str_replace(':','\:',str_replace('\*','*',quotemeta($fanspeed['fan_descr_fixed'])))."'"; # Ugly hack :( $rrd_options .= " GPRINT:fan:LAST:%3.0lfrpm"; $rrd_options .= " GPRINT:fan:MAX:%3.0lfrpm\\\\l"; diff --git a/html/includes/graphs/frequency.inc.php b/html/includes/graphs/frequency.inc.php index 87e081219..7e98d134d 100644 --- a/html/includes/graphs/frequency.inc.php +++ b/html/includes/graphs/frequency.inc.php @@ -15,7 +15,6 @@ include("common.inc.php"); $rrd_filename = $config['rrd_dir'] . "/".$hostname."/" . safename("freq-" . $frequency['freq_descr'] . ".rrd"); $rrd_options .= " DEF:freq=$rrd_filename:freq:AVERAGE"; - $rrd_options .= " AREA:freq#FFFF99"; $rrd_options .= " LINE1.5:freq#cc0000:'" . $frequency['freq_descr_fixed']."'"; $rrd_options .= " GPRINT:freq:LAST:%3.0lfHz"; $rrd_options .= " GPRINT:freq:MAX:%3.0lfHz\\\\l"; diff --git a/includes/osdiscovery/discover-dell-laser.php b/includes/osdiscovery/discover-dell-laser.php index 4d1b880e5..6b4d3f5cf 100644 --- a/includes/osdiscovery/discover-dell-laser.php +++ b/includes/osdiscovery/discover-dell-laser.php @@ -4,6 +4,7 @@ if(!$os) { if(strstr($sysDescr, "Dell Color Laser")) { $os = "dell-laser"; } elseif(strstr($sysDescr, "Dell Laser Printer")) { $os = "dell-laser"; } + elseif(preg_match("/^Dell.*MFP/", $sysDescr)) { $os = "dell-laser"; } }