From 6f31755dfb6d38df2669635dc579ffff0b96bcc9 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Fri, 5 Feb 2016 18:14:44 -0600
Subject: [PATCH] Use poll_device; List the inserted cards in "features".

---
 includes/polling/os/calix.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/includes/polling/os/calix.inc.php b/includes/polling/os/calix.inc.php
index 610448189..c4e22dca4 100644
--- a/includes/polling/os/calix.inc.php
+++ b/includes/polling/os/calix.inc.php
@@ -1,4 +1,5 @@
 <?php
 // Device might not have a card 1 (or even card2 if it is an E7-20)
 $version = trim(strtok(snmp_walk($device, "e7CardSoftwareVersion.1", "-OQv", "E7-Calix-MIB"), PHP_EOL),'"');
-$hardware = "Calix " . trim(snmp_get($device, "sysDescr.0", "-OQv"),'"');
+$hardware = "Calix " . $poll_device['sysDescr'];
+$features = str_replace(PHP_EOL, ', ', snmp_walk($device, "e7CardProvType", "-OQv", "E7-Calix-MIB"));