From 7e63fcf0ebdee9559db0fd2783f9130f258f3064 Mon Sep 17 00:00:00 2001
From: Michael Van Delft <Michael@hybr.id.au>
Date: Tue, 30 Aug 2016 12:13:21 +0800
Subject: [PATCH 1/3] Remove entry for 'richoh'

It looks like that's a typo and ricoh appears further down.
---
 includes/definitions.inc.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 4f3a197079..c89f852d88 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -1534,13 +1534,6 @@ $config['os'][$os]['icon']             = 'hp';
 $config['os'][$os]['over'][0]['graph'] = 'device_toner';
 $config['os'][$os]['over'][0]['text']  = 'Toner';
 
-$os = 'richoh';
-$config['os'][$os]['group']            = 'printer';
-$config['os'][$os]['text']             = 'Ricoh Printer';
-$config['os'][$os]['type']             = 'printer';
-$config['os'][$os]['over'][0]['graph'] = 'device_toner';
-$config['os'][$os]['over'][0]['text']  = 'Toner';
-
 $os = 'okilan';
 $config['os'][$os]['group']       = 'printer';
 $config['os'][$os]['text']        = 'OKI Printer';

From e531253e42815f1e639fb8d85e360c134fbf0b4c Mon Sep 17 00:00:00 2001
From: Michael Van Delft <Michael@hybr.id.au>
Date: Tue, 30 Aug 2016 12:14:56 +0800
Subject: [PATCH 2/3] Add Lanier printers

Lanier printers are rebadged richo so I've copied the settings for ricoh
printers
---
 html/images/os/lanier.png            | Bin 0 -> 438 bytes
 includes/definitions.inc.php         |   9 +++++++++
 includes/discovery/os/lanier.inc.php |   7 +++++++
 includes/discovery/toner.inc.php     |   6 +++---
 4 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 html/images/os/lanier.png
 create mode 100644 includes/discovery/os/lanier.inc.php

diff --git a/html/images/os/lanier.png b/html/images/os/lanier.png
new file mode 100644
index 0000000000000000000000000000000000000000..64165b852a159438b6a2ad2200d98d8ea2379daf
GIT binary patch
literal 438
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&pIsLyp;slSP#2Gy?;pv!{z=NW|f{m+ZagI0_v9c>bm4
zqr`>jsd8)NI5IS61pQ%7Ds63=y0o>mSK)~Hf~ix#?Q3>WSg=;%hNec-p^0vaS)Uq~
zHdUDw7kIS1&iTfDTF=;e^ZuE#LY*#36Mv+5xlS_=NLX1Fe7{}kbbDbJ<D0PjSF2s8
zUH`zmUgDtDw2jTSb6n1-oHLNg|8tn@*aunODFv-Z`}kYVE;c{6^@enXqvY%rTLKeg
z-FG;r-|+ju9>4Lf)`E*g^PKtrB`rAdiPL854{?Kkde7?bJU04da^I?l@8J7o8(ZFG
z{MY!D@wGC<s{i<kM^-hJ(o9+_+}=IAYkKAplk`)AZ;7i<d@?LaG!XG`{V&~jxJ-sK
zJGaKsa^I#)N)OVHd|Q0$jYBxkHJ>$hIW2D)C6|4aQMy)eyRG5kif`U$_+=i5w<T2w
egS{AYk3mt~)#7pk$9rH1GkCiCxvX<aXaWH2OSusM

literal 0
HcmV?d00001

diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index c89f852d88..0bc735c47b 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -1501,6 +1501,15 @@ $config['os'][$os]['icon']             = 'ricoh';
 $config['os'][$os]['over'][0]['graph'] = 'device_toner';
 $config['os'][$os]['over'][0]['text']  = 'Toner';
 
+// lanier is a rebadged ricoh
+$os = 'lanier';
+$config['os'][$os]['group']            = 'printer';
+$config['os'][$os]['text']             = 'Lanier Printer';
+$config['os'][$os]['type']             = 'printer';
+$config['os'][$os]['icon']             = 'lanier';
+$config['os'][$os]['over'][0]['graph'] = 'device_toner';
+$config['os'][$os]['over'][0]['text']  = 'Toner';
+
 $os = 'nrg';
 $config['os'][$os]['group']            = 'printer';
 $config['os'][$os]['text']             = 'NRG Printer';
diff --git a/includes/discovery/os/lanier.inc.php b/includes/discovery/os/lanier.inc.php
new file mode 100644
index 0000000000..01724eb591
--- /dev/null
+++ b/includes/discovery/os/lanier.inc.php
@@ -0,0 +1,7 @@
+<?php
+
+if (!$os) {
+    if (strstr($sysDescr, 'LANIER')) {
+        $os = 'lanier';
+    }
+}
diff --git a/includes/discovery/toner.inc.php b/includes/discovery/toner.inc.php
index ddd742013e..4ea234329a 100644
--- a/includes/discovery/toner.inc.php
+++ b/includes/discovery/toner.inc.php
@@ -22,7 +22,7 @@ if ($device['os_group'] == 'printer') {
             $index           = $split_oid[(count($split_oid) - 1)];
             if (is_numeric($role)) {
                 //ricoh using private oids to expose toner levels
-                if ($os == 'ricoh' || $os == 'nrg') {
+                if ($os == 'ricoh' || $os == 'nrg' || $os == 'lanier') {
                     $toner_oid = ".1.3.6.1.4.1.367.3.2.1.2.24.1.1.5.$index";
                     $descr_oid = ".1.3.6.1.4.1.367.3.2.1.2.24.1.1.3.$index";
                 } else {
@@ -37,14 +37,14 @@ 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') {
+                    if ($os == 'ricoh' || $os == 'lanier') {
                         $capacity = 100;
                     } else {
                         $capacity = snmp_get($device, $capacity_oid, '-Oqv');
                     }
 
                     //fix for ricoh devices returning garbage and devices returning percentage
-                    if ($os == 'ricoh' || $os == 'nrg') {
+                    if ($os == 'ricoh' || $os == 'nrg' || $os == 'lanier') {
                         if ($current == '-3') {
                             $current = 50;
                         } elseif ($current == '-100') {

From 0a17f79adc1f94fa7a0a5160491e24afdb238db7 Mon Sep 17 00:00:00 2001
From: Michael Van Delft <Michael@hybr.id.au>
Date: Tue, 30 Aug 2016 12:20:42 +0800
Subject: [PATCH 3/3] I agree to the conditions of the Contributor Agreement
 contained in doc/General/Contributing.md.

---
 AUTHORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index 852f62e722..d216d55e29 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -123,6 +123,7 @@ LibreNMS contributors:
 - Bennett Blodinger <bennett.blodinger@gmail.com> (benwa)
 - Michael Hansen <nerdalertdk@gmail.com> (nerdalertdk)
 - Daniel Cox <danielcoxman@gmail.com> (ospfbgp) 
+- Michael Van Delft <librenms@xo.tc> (HybridAU)
 
 [1]: http://observium.org/ "Observium web site"
 Observium was written by: