From 1110de3ab3f9982cf79bce2ba8b17aa8ed9251a3 Mon Sep 17 00:00:00 2001 From: crcro Date: Sun, 4 Sep 2016 18:20:41 +0300 Subject: [PATCH] fix: toner nrg os capacity (#4177) fix: ricoh/nrg toner levels #4177 --- includes/discovery/toner.inc.php | 2 +- includes/polling/toner.inc.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/includes/discovery/toner.inc.php b/includes/discovery/toner.inc.php index 4ea234329a..ead2f0a9f1 100644 --- a/includes/discovery/toner.inc.php +++ b/includes/discovery/toner.inc.php @@ -37,7 +37,7 @@ if ($device['os_group'] == 'printer') { $current = snmp_get($device, $toner_oid, '-Oqv'); //ricoh private mibs returns values as percent, no capacity is disclosed as it is not needed - if ($os == 'ricoh' || $os == 'lanier') { + if ($os == 'ricoh' || $os == 'nrg' || $os == 'lanier') { $capacity = 100; } else { $capacity = snmp_get($device, $capacity_oid, '-Oqv'); diff --git a/includes/polling/toner.inc.php b/includes/polling/toner.inc.php index 038c4b5d98..fbc454b53c 100644 --- a/includes/polling/toner.inc.php +++ b/includes/polling/toner.inc.php @@ -6,7 +6,6 @@ foreach ($toner_data as $toner) { echo 'Checking toner '.$toner['toner_descr'].'... '; if ($toner['toner_capacity_oid']) { - // FIXME this if can go on 1-Sep-2012 $toner['toner_capacity'] = snmp_get($device, $toner['toner_capacity_oid'], '-OUqnv'); }