remove dead map.php code, rename some .inc to .inc.php files, general trailing space cleanup part 1, some reindent. No expected functionality change whatsoever ;)

git-svn-id: http://www.observium.org/svn/observer/trunk@1824 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-03-12 08:50:47 +00:00
parent 90e2dee34a
commit c6428480bc
32 changed files with 339 additions and 423 deletions

View File

@@ -8,41 +8,42 @@ $rrd_options .= " -l 0 -E ";
$iter = "1";
$sql = mysql_query("SELECT * FROM toner where device_id = '$id'");
$rrd_options .= " COMMENT:'Toner level Cur Min Max\\n'";
while($toner = mysql_fetch_array($sql))
while($toner = mysql_fetch_array($sql))
{
switch ($iter)
{
case "1":
$colour= "000000";
break;
$colour= "000000";
break;
case "2":
$colour= "008C00";
break;
$colour= "008C00";
break;
case "3":
$colour= "4096EE";
break;
$colour= "4096EE";
break;
case "4":
$colour= "73880A";
$colour= "73880A";
break;
case "5":
$colour= "D01F3C";
$colour= "D01F3C";
break;
case "6":
$colour= "36393D";
break;
case "7":
$colour= "36393D";
break;
case "7":
default:
$colour= "FF0000";
$colour= "FF0000";
unset($iter);
break;
}
if (stripos($toner['toner_descr'],"cyan" ) !== false || substr($toner['toner_descr'],-1) == 'C') { $colour = "55D6D3"; }
if (stripos($toner['toner_descr'],"magenta") !== false || substr($toner['toner_descr'],-1) == 'M') { $colour = "F24AC8"; }
if (stripos($toner['toner_descr'],"yellow" ) !== false || substr($toner['toner_descr'],-1) == 'Y') { $colour = "FFF200"; }
if (stripos($toner['toner_descr'],"black" ) !== false || substr($toner['toner_descr'],-1) == 'K') { $colour = "000000"; }
$hostname = gethostbyid($toner['device_id']);
$descr = substr(str_pad($toner['toner_descr'], 16),0,16);
$rrd_filename = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("toner-" . $toner['toner_descr'] . ".rrd");
$toner_id = $toner['toner_id'];
@@ -56,5 +57,4 @@ while($toner = mysql_fetch_array($sql))
$iter++;
}
?>