mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix for spaces

Browse Source
This commit is contained in:
crcro
2016-09-18 17:20:34 +03:00
parent 7ee585b3e3
commit af9f4fb8df
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/discovery/toner.inc.php
View File

@ -31,7 +31,7 @@ if ($device['os_group'] == 'printer') {
$capacity_oid = ".1.3.6.1.2.1.43.11.1.1.8.1.$index"; $capacity_oid = ".1.3.6.1.2.1.43.11.1.1.8.1.$index";
} }
$descr = trim(str_replace("\n", '', preg_replace('/[^A-Za-z0-9\-]/', '', snmp_get($device, $descr_oid, '-Oqv')))); $descr = trim(str_replace("\n", '', preg_replace('/[^ \w]+/', '', snmp_get($device, $descr_oid, '-Oqv'))));
if ($descr != '') { if ($descr != '') {
$current = snmp_get($device, $toner_oid, '-Oqv'); $current = snmp_get($device, $toner_oid, '-Oqv');
@ -59,7 +59,7 @@ if ($device['os_group'] == 'printer') {
$type = 'jetdirect'; $type = 'jetdirect';
if (isHexString($descr)) { if (isHexString($descr)) {
$descr = preg_replace('/[^A-Za-z0-9\-]/', '', snmp_hexstring($descr)); $descr = preg_replace('/[^ \w]+/', '', snmp_hexstring($descr));
} }
discover_toner($valid_toner, $device, $toner_oid, $index, $type, $descr, $capacity_oid, $capacity, $current); discover_toner($valid_toner, $device, $toner_oid, $index, $type, $descr, $capacity_oid, $capacity, $current);