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,35 +8,35 @@ $rrd_options .= " -l 0 -E ";
$iter = "1";
$sql = mysql_query("SELECT * FROM sensors WHERE sensor_class='humidity' AND device_id = '$id' ORDER BY sensor_index");
$rrd_options .= " COMMENT:' Cur Min Max\\n'";
while($humidity = mysql_fetch_array($sql))
while($humidity = mysql_fetch_array($sql))
{
switch ($iter)
{
case "1":
$colour= "CC0000";
break;
$colour= "CC0000";
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= "FF0084";
$colour= "FF0084";
unset($iter);
break;
}
$humidity['sensor_descr_fixed'] = substr(str_pad($humidity['sensor_descr'], 22),0,22);
$humidityrrd = $config['rrd_dir'] . "/".$device['hostname']."/".safename("humidity-" . safename($humidity['sensor_type']."-".$humidity['sensor_index']) . ".rrd");
$rrd_options .= " DEF:sensor" . $humidity['sensor_id'] . "=$humidityrrd:sensor:AVERAGE ";