Merge pull request #1073 from f0o/issue-1072

Honour SysContact-Override
This commit is contained in:
Neil Lathwood
2015-05-19 19:59:53 +01:00
+6 -2
View File
@@ -299,8 +299,12 @@ function GetContacts($results) {
}
}
if( is_numeric($result["device_id"]) ) {
$tmpa = dbFetchRow("SELECT sysContact FROM devices WHERE device_id = ?",array($result["device_id"]));
$contacts[$tmpa["sysContact"]] = "NOC";
if( dbFetchCell("SELECT attrib_value FROM devices_attribs WHERE attrib_type = 'override_sysContact_bool' AND device_id = ?",array($result["device_id"])) === "1" ) {
$tmpa = dbFetchCell("SELECT attrib_value FROM devices_attribs WHERE attrib_type = 'override_sysContact_string' AND device_id = ?",array($result["device_id"]));
} else {
$tmpa = dbFetchCell("SELECT sysContact FROM devices WHERE device_id = ?",array($result["device_id"]));
}
$contacts[$tmpa] = "NOC";
$tmpa = dbFetchRows("SELECT user_id FROM devices_perms WHERE access_level >= 0 AND device_id = ?", array($result["device_id"]));
foreach( $tmpa as $tmp ) {
$uids[$tmp['user_id']] = $tmp['user_id'];