From 4667d17f96a3858293820f644db14306a8bf8ddd Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Mon, 9 Apr 2012 17:53:22 +0000
Subject: [PATCH] fix v4 address discovery retardness

git-svn-id: http://www.observium.org/svn/observer/trunk@3010 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/graphs/device/toner.inc.php | 5 +++--
 includes/discovery/ipv4-addresses.inc.php | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/html/includes/graphs/device/toner.inc.php b/html/includes/graphs/device/toner.inc.php
index ba49239d6..a614a78c5 100644
--- a/html/includes/graphs/device/toner.inc.php
+++ b/html/includes/graphs/device/toner.inc.php
@@ -40,8 +40,9 @@ foreach (dbFetchRows("SELECT * FROM toner where device_id = ?", array($id)) as $
 
   if (stripos($toner['toner_descr'],"cyan"   ) !== false || substr($toner['toner_descr'],-1) == 'C') { $colour = "55D6D3"; }
   if (stripos($toner['toner_descr'],"magenta") !== false || substr($toner['toner_descr'],-1) == 'M') { $colour = "F24AC8"; }
-  if (stripos($toner['toner_descr'],"yellow" ) !== false || substr($toner['toner_descr'],-1) == 'Y') { $colour = "FFF200"; }
-  if (stripos($toner['toner_descr'],"black"  ) !== false || substr($toner['toner_descr'],-1) == 'K') { $colour = "000000"; }
+  if (stripos($toner['toner_descr'],"yellow" ) !== false || substr($toner['toner_descr'],-1) == 'Y' || stripos($toner['toner_descr'],"giallo"  ) !== false) { $colour = "FFF200"; }
+  if (stripos($toner['toner_descr'],"black"  ) !== false || substr($toner['toner_descr'],-1) == 'K' || stripos($toner['toner_descr'],"nero"    ) !== false) { $colour = "000000"; }
+
 
   $hostname = gethostbyid($toner['device_id']);
 
diff --git a/includes/discovery/ipv4-addresses.inc.php b/includes/discovery/ipv4-addresses.inc.php
index 0c9731961..961feebfc 100755
--- a/includes/discovery/ipv4-addresses.inc.php
+++ b/includes/discovery/ipv4-addresses.inc.php
@@ -3,7 +3,7 @@
 echo("IPv4 Addresses : ");
 
 $oids = trim(snmp_walk($device,"ipAdEntIfIndex","-Osq","IP-MIB"));
-$oids = trim(str_replace("ipAdEntIfIndex", "", $oids),'.');
+$oids = str_replace("ipAdEntIfIndex.", "", $oids);
 foreach (explode("\n", $oids) as $data)
 {
   $data = trim($data);