|
@@ -329,12 +329,17 @@ foreach ($VLANS as $vn => $vi) {
|
|
|
$custom_macros = array();
|
|
|
if (isset($CUSTOM_MACROS)) {
|
|
|
foreach ($CUSTOM_MACROS as $macro => $mv) {
|
|
|
- $custom_macros[$macro] = process_macro($macro, $mv, $row['hostname'], $sn, $pid, $logger);
|
|
|
+ $custom_macros[$macro] = process_macro($macro, $mv, $row['hostname'], $sn, $found_pid, $logger);
|
|
|
}
|
|
|
}
|
|
|
if (isset($MDF_OVERRIDES) && isset($MDF_OVERRIDES[$row['location']])) {
|
|
|
foreach ($MDF_OVERRIDES[$row['locations']] as $macro => $mv) {
|
|
|
- $custom_macros[$macro] = process_macro($macro, $mv, $row['hostname'], $sn, $pid, $logger);
|
|
|
+ $custom_macros[$macro] = process_macro($macro, $mv, $row['hostname'], $sn, $found_pid, $logger);
|
|
|
+ }
|
|
|
+}
|
|
|
+if (isset($PID_MACROS) && isset($PID_MACROS[$found_pid])) {
|
|
|
+ foreach ($PID_MACROS[$found_pid] as $macro => $mv) {
|
|
|
+ $custom_macros[$macro] = process_macro($macro, $mv, $row['hostname'], $sn, $found_pid, $logger);
|
|
|
}
|
|
|
}
|
|
|
|