small cleanups etc, plus allow sysLocation override

git-svn-id: http://www.observium.org/svn/observer/trunk@2000 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-03-31 17:19:54 +00:00
parent 28e03f65ea
commit b7720135e9
12 changed files with 382 additions and 319 deletions
+5 -2
View File
@@ -272,8 +272,11 @@ while ($device = mysql_fetch_assoc($device_query))
if ($sysLocation && $device['location'] != $sysLocation)
{
$poll_update .= $poll_separator . "`location` = '$sysLocation'";
$poll_separator = ", ";
if (!get_dev_attrib($device,'override_sysLocation_bool'))
{
$poll_update .= $poll_separator . "`location` = '$sysLocation'";
$poll_separator = ", ";
}
log_event("Location -> $sysLocation", $device['device_id'], 'system');
}