From fa9fb61d8546fae1ac63a0718a000839be8dc3f4 Mon Sep 17 00:00:00 2001
From: Job Snijders <job@instituut.net>
Date: Wed, 8 Jul 2015 14:24:59 +0200
Subject: [PATCH] gg=G on on snmp.inc.php for readability

---
 includes/snmp.inc.php | 1274 ++++++++++++++++++++---------------------
 1 file changed, 637 insertions(+), 637 deletions(-)

diff --git a/includes/snmp.inc.php b/includes/snmp.inc.php
index ca4047815..ea31034aa 100644
--- a/includes/snmp.inc.php
+++ b/includes/snmp.inc.php
@@ -7,12 +7,12 @@
 
 function string_to_oid($string)
 {
-  $oid = strlen($string);
-  for($i = 0; $i != strlen($string); $i++)
-  {
-     $oid .= ".".ord($string[$i]);
-  }
-  return $oid;
+    $oid = strlen($string);
+    for($i = 0; $i != strlen($string); $i++)
+    {
+        $oid .= ".".ord($string[$i]);
+    }
+    return $oid;
 }
 
 function mibdir($mibdir)
@@ -23,107 +23,107 @@ function mibdir($mibdir)
 
 function snmp_get_multi($device, $oids, $options = "-OQUs", $mib = NULL, $mibdir = NULL)
 {
-  global $debug,$config,$runtime_stats,$mibs_loaded;
+    global $debug,$config,$runtime_stats,$mibs_loaded;
 
-  if (is_numeric($device['timeout']) && $device['timeout'] > 0)
-  {
-     $timeout = $device['timeout'];
-  } elseif (isset($config['snmp']['timeout'])) {
-     $timeout =  $config['snmp']['timeout'];
-  }
-
-  if (is_numeric($device['retries']) && $device['retries'] > 0)
-  {
-    $retries = $device['retries'];
-  } elseif (isset($config['snmp']['retries'])) {
-    $retries =  $config['snmp']['retries'];
-  }
-
-  if (!isset($device['transport']))
-  {
-    $device['transport'] = "udp";
-  }
-
-  $cmd  = $config['snmpget'];
-  $cmd .= snmp_gen_auth ($device);
-
-  if ($options) { $cmd .= " " . $options; }
-  if ($mib) { $cmd .= " -m " . $mib; }
-  $cmd .= mibdir($mibdir);
-
-  if (isset($timeout)) { $cmd .= " -t " . $timeout; }
-  if (isset($retries)) { $cmd .= " -r " . $retries; }
-
-  $cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port'];
-  $cmd .= " ".$oids;
-  if (!$debug) { $cmd .= " 2>/dev/null"; }
-  $data = trim(external_exec($cmd));
-  $runtime_stats['snmpget']++;
-  $array = array();
-  foreach (explode("\n", $data) as $entry)
-  {
-    list($oid,$value) = explode("=", $entry, 2);
-    $oid = trim($oid); $value = trim($value);
-    list($oid, $index) = explode(".", $oid,2);
-    if (!strstr($value, "at this OID") && isset($oid) && isset($index))
+    if (is_numeric($device['timeout']) && $device['timeout'] > 0)
     {
-      $array[$index][$oid] = $value;
+        $timeout = $device['timeout'];
+    } elseif (isset($config['snmp']['timeout'])) {
+        $timeout =  $config['snmp']['timeout'];
     }
-  }
 
-  return $array;
+    if (is_numeric($device['retries']) && $device['retries'] > 0)
+    {
+        $retries = $device['retries'];
+    } elseif (isset($config['snmp']['retries'])) {
+        $retries =  $config['snmp']['retries'];
+    }
+
+    if (!isset($device['transport']))
+    {
+        $device['transport'] = "udp";
+    }
+
+    $cmd  = $config['snmpget'];
+    $cmd .= snmp_gen_auth ($device);
+
+    if ($options) { $cmd .= " " . $options; }
+    if ($mib) { $cmd .= " -m " . $mib; }
+        $cmd .= mibdir($mibdir);
+
+    if (isset($timeout)) { $cmd .= " -t " . $timeout; }
+        if (isset($retries)) { $cmd .= " -r " . $retries; }
+
+            $cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port'];
+    $cmd .= " ".$oids;
+    if (!$debug) { $cmd .= " 2>/dev/null"; }
+    $data = trim(external_exec($cmd));
+    $runtime_stats['snmpget']++;
+    $array = array();
+    foreach (explode("\n", $data) as $entry)
+    {
+        list($oid,$value) = explode("=", $entry, 2);
+        $oid = trim($oid); $value = trim($value);
+        list($oid, $index) = explode(".", $oid,2);
+        if (!strstr($value, "at this OID") && isset($oid) && isset($index))
+        {
+            $array[$index][$oid] = $value;
+        }
+    }
+
+    return $array;
 }
 
 function snmp_get($device, $oid, $options = NULL, $mib = NULL, $mibdir = NULL)
 {
-  global $debug,$config,$runtime_stats,$mibs_loaded;
+    global $debug,$config,$runtime_stats,$mibs_loaded;
 
-  if (is_numeric($device['timeout']) && $device['timeout'] > 0)
-  {
-     $timeout = $device['timeout'];
-  } elseif (isset($config['snmp']['timeout'])) {
-     $timeout =  $config['snmp']['timeout'];
-  }
+    if (is_numeric($device['timeout']) && $device['timeout'] > 0)
+    {
+        $timeout = $device['timeout'];
+    } elseif (isset($config['snmp']['timeout'])) {
+        $timeout =  $config['snmp']['timeout'];
+    }
 
-  if (is_numeric($device['retries']) && $device['retries'] > 0)
-  {
-    $retries = $device['retries'];
-  } elseif (isset($config['snmp']['retries'])) {
-    $retries =  $config['snmp']['retries'];
-  }
+    if (is_numeric($device['retries']) && $device['retries'] > 0)
+    {
+        $retries = $device['retries'];
+    } elseif (isset($config['snmp']['retries'])) {
+        $retries =  $config['snmp']['retries'];
+    }
 
-  if (!isset($device['transport']))
-  {
-    $device['transport'] = "udp";
-  }
+    if (!isset($device['transport']))
+    {
+        $device['transport'] = "udp";
+    }
 
-  if (strstr($oid,' '))
-  {
-    echo(report_this_text("snmp_get called for multiple OIDs: $oid"));
-  }
+    if (strstr($oid,' '))
+    {
+        echo(report_this_text("snmp_get called for multiple OIDs: $oid"));
+    }
 
-  $cmd  = $config['snmpget'];
-  $cmd .= snmp_gen_auth ($device);
+    $cmd  = $config['snmpget'];
+    $cmd .= snmp_gen_auth ($device);
 
-  if ($options) { $cmd .= " " . $options; }
-  if ($mib) { $cmd .= " -m " . $mib; }
-  $cmd .= mibdir($mibdir);
-  if (isset($timeout)) { $cmd .= " -t " . $timeout; }
-  if (isset($retries)) { $cmd .= " -r " . $retries; }
-  $cmd .= " " . $device['transport'].":".$device['hostname'].":".$device['port'];
-  $cmd .= " " . $oid;
+    if ($options) { $cmd .= " " . $options; }
+    if ($mib) { $cmd .= " -m " . $mib; }
+        $cmd .= mibdir($mibdir);
+    if (isset($timeout)) { $cmd .= " -t " . $timeout; }
+        if (isset($retries)) { $cmd .= " -r " . $retries; }
+            $cmd .= " " . $device['transport'].":".$device['hostname'].":".$device['port'];
+    $cmd .= " " . $oid;
 
-  if (!$debug) { $cmd .= " 2>/dev/null"; }
-  $data = trim(external_exec($cmd));
+    if (!$debug) { $cmd .= " 2>/dev/null"; }
+    $data = trim(external_exec($cmd));
 
-  $runtime_stats['snmpget']++;
+    $runtime_stats['snmpget']++;
 
-  if (is_string($data) && (preg_match("/(No Such Instance|No Such Object|No more variables left|Authentication failure)/i", $data)))
-  {
-    return false;
-  }
-  elseif ($data) { return $data; }
-  else { return false; }
+    if (is_string($data) && (preg_match("/(No Such Instance|No Such Object|No more variables left|Authentication failure)/i", $data)))
+    {
+        return false;
+    }
+    elseif ($data) { return $data; }
+    else { return false; }
 }
 
 
@@ -131,212 +131,212 @@ function snmp_get($device, $oid, $options = NULL, $mib = NULL, $mibdir = NULL)
 
 function snmp_walk($device, $oid, $options = NULL, $mib = NULL, $mibdir = NULL)
 {
-  global $debug,$config,$runtime_stats;
+    global $debug,$config,$runtime_stats;
 
-  if (is_numeric($device['timeout']) && $device['timeout'] > 0)
-  {
-     $timeout = $device['timeout'];
-  } elseif (isset($config['snmp']['timeout']))
-  {
-     $timeout =  $config['snmp']['timeout'];
-  }
-
-  if (is_numeric($device['retries']) && $device['retries'] > 0)
-  {
-    $retries = $device['retries'];
-  } elseif (isset($config['snmp']['retries'])) {
-    $retries =  $config['snmp']['retries'];
-  }
-  if (!isset($device['transport']))
-  {
-    $device['transport'] = "udp";
-  }
-
-  if ($device['snmpver'] == 'v1' || $config['os'][$device['os']]['nobulk'])
-  {
-    $snmpcommand = $config['snmpwalk'];
-  }
-  else
-  {
-    $snmpcommand = $config['snmpbulkwalk'];
-  }
-
-  $cmd = $snmpcommand;
-
-  $cmd .= snmp_gen_auth ($device);
-
-  if ($options) { $cmd .= " $options "; }
-  if ($mib) { $cmd .= " -m $mib"; }
-  $cmd .= mibdir($mibdir);
-  if (isset($timeout)) { $cmd .= " -t " . $timeout; }
-  if (isset($retries)) { $cmd .= " -r " . $retries; }
-
-  $cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." ".$oid;
-
-  if (!$debug) { $cmd .= " 2>/dev/null"; }
-  $data = trim(external_exec($cmd));
-  $data = str_replace("\"", "", $data);
-
-  if (is_string($data) && (preg_match("/No Such (Object|Instance)/i", $data)))
-  {
-    $data = false;
-  }
-  else
-  {
-    if (preg_match("/No more variables left in this MIB View \(It is past the end of the MIB tree\)$/",$data))  {
-    # Bit ugly :-(
-    $d_ex = explode("\n",$data);
-    unset($d_ex[count($d_ex)-1]);
-    $data = implode("\n",$d_ex);
+    if (is_numeric($device['timeout']) && $device['timeout'] > 0)
+    {
+        $timeout = $device['timeout'];
+    } elseif (isset($config['snmp']['timeout']))
+    {
+        $timeout =  $config['snmp']['timeout'];
     }
-  }
-  $runtime_stats['snmpwalk']++;
 
-  return $data;
+    if (is_numeric($device['retries']) && $device['retries'] > 0)
+    {
+        $retries = $device['retries'];
+    } elseif (isset($config['snmp']['retries'])) {
+        $retries =  $config['snmp']['retries'];
+    }
+    if (!isset($device['transport']))
+    {
+        $device['transport'] = "udp";
+    }
+
+    if ($device['snmpver'] == 'v1' || $config['os'][$device['os']]['nobulk'])
+    {
+        $snmpcommand = $config['snmpwalk'];
+    }
+    else
+    {
+        $snmpcommand = $config['snmpbulkwalk'];
+    }
+
+    $cmd = $snmpcommand;
+
+    $cmd .= snmp_gen_auth ($device);
+
+    if ($options) { $cmd .= " $options "; }
+    if ($mib) { $cmd .= " -m $mib"; }
+        $cmd .= mibdir($mibdir);
+    if (isset($timeout)) { $cmd .= " -t " . $timeout; }
+        if (isset($retries)) { $cmd .= " -r " . $retries; }
+
+            $cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." ".$oid;
+
+    if (!$debug) { $cmd .= " 2>/dev/null"; }
+        $data = trim(external_exec($cmd));
+    $data = str_replace("\"", "", $data);
+
+    if (is_string($data) && (preg_match("/No Such (Object|Instance)/i", $data)))
+    {
+        $data = false;
+    }
+    else
+    {
+        if (preg_match("/No more variables left in this MIB View \(It is past the end of the MIB tree\)$/",$data))  {
+            # Bit ugly :-(
+            $d_ex = explode("\n",$data);
+            unset($d_ex[count($d_ex)-1]);
+            $data = implode("\n",$d_ex);
+        }
+    }
+    $runtime_stats['snmpwalk']++;
+
+    return $data;
 }
 
 function snmpwalk_cache_cip($device, $oid, $array = array(), $mib = 0)
 {
-  global $config;
+    global $config;
 
-  if (is_numeric($device['timeout']) && $device['timeout'] > 0)
-  {
-     $timeout = $device['timeout'];
-  } elseif (isset($config['snmp']['timeout'])) {
-     $timeout =  $config['snmp']['timeout'];
-  }
-
-  if (is_numeric($device['retries']) && $device['retries'] > 0)
-  {
-    $retries = $device['retries'];
-  } elseif (isset($config['snmp']['retries'])) {
-    $retries =  $config['snmp']['retries'];
-  }
-
-  if (!isset($device['transport'])) { $device['transport'] = "udp"; }
-
-  if ($device['snmpver'] == 'v1' || $config['os'][$device['os']]['nobulk'])
-  {
-    $snmpcommand = $config['snmpwalk'];
-  }
-  else
-  {
-    $snmpcommand = $config['snmpbulkwalk'];
-  }
-
-  $cmd = $snmpcommand;
-  $cmd .= snmp_gen_auth ($device);
-
-  $cmd .= " -O snQ";
-  if ($mib) { $cmd .= " -m $mib"; }
-  $cmd .= mibdir(null);
-  if (isset($timeout)) { $cmd .= " -t " . $timeout; }
-  if (isset($retries)) { $cmd .= " -r " . $retries; }
-
-  $cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." ".$oid;
-
-  if (!$debug) { $cmd .= " 2>/dev/null"; }
-  $data = trim(external_exec($cmd));
-  $device_id = $device['device_id'];
-
-  #echo("Caching: $oid\n");
-  foreach (explode("\n", $data) as $entry)
-  {
-    list ($this_oid, $this_value) = preg_split("/=/", $entry);
-    $this_oid = trim($this_oid);
-    $this_value = trim($this_value);
-    $this_oid = substr($this_oid, 30);
-    list($ifIndex,$dir,$a,$b,$c,$d,$e,$f) = explode(".", $this_oid);
-    $h_a = zeropad(dechex($a));
-    $h_b = zeropad(dechex($b));
-    $h_c = zeropad(dechex($c));
-    $h_d = zeropad(dechex($d));
-    $h_e = zeropad(dechex($e));
-    $h_f = zeropad(dechex($f));
-    $mac = "$h_a$h_b$h_c$h_d$h_e$h_f";
-    if ($dir == "1") { $dir = "input"; } elseif ($dir == "2") { $dir = "output"; }
-    if ($mac && $dir)
+    if (is_numeric($device['timeout']) && $device['timeout'] > 0)
     {
-      $array[$ifIndex][$mac][$oid][$dir] = $this_value;
+        $timeout = $device['timeout'];
+    } elseif (isset($config['snmp']['timeout'])) {
+        $timeout =  $config['snmp']['timeout'];
     }
-  }
-  return $array;
+
+    if (is_numeric($device['retries']) && $device['retries'] > 0)
+    {
+        $retries = $device['retries'];
+    } elseif (isset($config['snmp']['retries'])) {
+        $retries =  $config['snmp']['retries'];
+    }
+
+    if (!isset($device['transport'])) { $device['transport'] = "udp"; }
+
+        if ($device['snmpver'] == 'v1' || $config['os'][$device['os']]['nobulk'])
+        {
+            $snmpcommand = $config['snmpwalk'];
+        }
+        else
+        {
+            $snmpcommand = $config['snmpbulkwalk'];
+        }
+
+    $cmd = $snmpcommand;
+    $cmd .= snmp_gen_auth ($device);
+
+    $cmd .= " -O snQ";
+    if ($mib) { $cmd .= " -m $mib"; }
+    $cmd .= mibdir(null);
+    if (isset($timeout)) { $cmd .= " -t " . $timeout; }
+    if (isset($retries)) { $cmd .= " -r " . $retries; }
+
+        $cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." ".$oid;
+
+    if (!$debug) { $cmd .= " 2>/dev/null"; }
+        $data = trim(external_exec($cmd));
+    $device_id = $device['device_id'];
+
+    #echo("Caching: $oid\n");
+    foreach (explode("\n", $data) as $entry)
+    {
+        list ($this_oid, $this_value) = preg_split("/=/", $entry);
+        $this_oid = trim($this_oid);
+        $this_value = trim($this_value);
+        $this_oid = substr($this_oid, 30);
+        list($ifIndex,$dir,$a,$b,$c,$d,$e,$f) = explode(".", $this_oid);
+        $h_a = zeropad(dechex($a));
+        $h_b = zeropad(dechex($b));
+        $h_c = zeropad(dechex($c));
+        $h_d = zeropad(dechex($d));
+        $h_e = zeropad(dechex($e));
+        $h_f = zeropad(dechex($f));
+        $mac = "$h_a$h_b$h_c$h_d$h_e$h_f";
+        if ($dir == "1") { $dir = "input"; } elseif ($dir == "2") { $dir = "output"; }
+        if ($mac && $dir)
+        {
+            $array[$ifIndex][$mac][$oid][$dir] = $this_value;
+        }
+    }
+    return $array;
 }
 
 function snmp_cache_ifIndex($device)
 {
-  // FIXME: this is not yet using our own snmp_*
-  global $config;
+    // FIXME: this is not yet using our own snmp_*
+    global $config;
 
-  if (is_numeric($device['timeout']) && $device['timeout'] > 0)
-  {
-     $timeout = $device['timeout'];
-  } elseif (isset($config['snmp']['timeout'])) {
-     $timeout =  $config['snmp']['timeout'];
-  }
-
-  if (is_numeric($device['retries']) && $device['retries'] > 0)
-  {
-    $retries = $device['retries'];
-  } elseif (isset($config['snmp']['retries'])) {
-    $retries =  $config['snmp']['retries'];
-  }
-
-  if (!isset($device['transport'])) { $device['transport'] = "udp"; }
-
-  if ($device['snmpver'] == 'v1' || $config['os'][$device['os']]['nobulk'])
-  {
-    $snmpcommand = $config['snmpwalk'];
-  }
-  else
-  {
-    $snmpcommand = $config['snmpbulkwalk'];
-  }
-
-  $cmd = $snmpcommand;
-  $cmd .= snmp_gen_auth ($device);
-
-  $cmd .= " -O Qs";
-  $cmd .= mibdir(null);
-  $cmd .= " -m IF-MIB ifIndex";
-
-  if (isset($timeout)) { $cmd .= " -t " . $timeout; }
-  if (isset($retries)) { $cmd .= " -r " . $retries; }
-  if (!$debug) { $cmd .= " 2>/dev/null"; }
-  $data = trim(external_exec($cmd));
-  $device_id = $device['device_id'];
-
-  foreach (explode("\n", $data) as $entry)
-  {
-    list ($this_oid, $this_value) = preg_split("/=/", $entry);
-    list ($this_oid, $this_index) = explode(".", $this_oid, 2);
-    $this_index = trim($this_index);
-    $this_oid = trim($this_oid);
-    $this_value = trim($this_value);
-    if (!strstr($this_value, "at this OID") && $this_index)
+    if (is_numeric($device['timeout']) && $device['timeout'] > 0)
     {
-      $array[] = $this_value;
+        $timeout = $device['timeout'];
+    } elseif (isset($config['snmp']['timeout'])) {
+        $timeout =  $config['snmp']['timeout'];
     }
-  }
 
-  return $array;
+    if (is_numeric($device['retries']) && $device['retries'] > 0)
+    {
+        $retries = $device['retries'];
+    } elseif (isset($config['snmp']['retries'])) {
+        $retries =  $config['snmp']['retries'];
+    }
+
+    if (!isset($device['transport'])) { $device['transport'] = "udp"; }
+
+        if ($device['snmpver'] == 'v1' || $config['os'][$device['os']]['nobulk'])
+        {
+            $snmpcommand = $config['snmpwalk'];
+        }
+        else
+        {
+            $snmpcommand = $config['snmpbulkwalk'];
+        }
+
+    $cmd = $snmpcommand;
+    $cmd .= snmp_gen_auth ($device);
+
+    $cmd .= " -O Qs";
+    $cmd .= mibdir(null);
+    $cmd .= " -m IF-MIB ifIndex";
+
+    if (isset($timeout)) { $cmd .= " -t " . $timeout; }
+    if (isset($retries)) { $cmd .= " -r " . $retries; }
+        if (!$debug) { $cmd .= " 2>/dev/null"; }
+            $data = trim(external_exec($cmd));
+    $device_id = $device['device_id'];
+
+    foreach (explode("\n", $data) as $entry)
+    {
+        list ($this_oid, $this_value) = preg_split("/=/", $entry);
+        list ($this_oid, $this_index) = explode(".", $this_oid, 2);
+        $this_index = trim($this_index);
+        $this_oid = trim($this_oid);
+        $this_value = trim($this_value);
+        if (!strstr($this_value, "at this OID") && $this_index)
+        {
+            $array[] = $this_value;
+        }
+    }
+
+    return $array;
 }
 
 function snmpwalk_cache_oid($device, $oid, $array, $mib = NULL, $mibdir = NULL, $snmpflags = "-OQUs")
 {
-  $data = snmp_walk($device, $oid, $snmpflags, $mib, $mibdir);
-  foreach (explode("\n", $data) as $entry)
-  {
-    list($oid,$value) = explode("=", $entry, 2);
-    $oid = trim($oid); $value = trim($value);
-    list($oid, $index) = explode(".", $oid, 2);
-    if (!strstr($value, "at this OID") && isset($oid) && isset($index))
+    $data = snmp_walk($device, $oid, $snmpflags, $mib, $mibdir);
+    foreach (explode("\n", $data) as $entry)
     {
-      $array[$index][$oid] = $value;
+        list($oid,$value) = explode("=", $entry, 2);
+        $oid = trim($oid); $value = trim($value);
+        list($oid, $index) = explode(".", $oid, 2);
+        if (!strstr($value, "at this OID") && isset($oid) && isset($index))
+        {
+            $array[$index][$oid] = $value;
+        }
     }
-  }
 
-  return $array;
+    return $array;
 }
 
 // just like snmpwalk_cache_oid except that it returns the numerical oid as the index
@@ -351,458 +351,458 @@ function snmpwalk_cache_oid_num($device, $oid, $array, $mib = NULL, $mibdir = NU
 
 function snmpwalk_cache_multi_oid($device, $oid, $array, $mib = NULL, $mibdir = NULL)
 {
-  global $cache;
+    global $cache;
 
-  if (!(is_array($cache['snmp'][$device['device_id']]) && array_key_exists($oid,$cache['snmp'][$device['device_id']])))
-  {
-    $data = snmp_walk($device, $oid, "-OQUs", $mib, $mibdir);
-    foreach (explode("\n", $data) as $entry)
+    if (!(is_array($cache['snmp'][$device['device_id']]) && array_key_exists($oid,$cache['snmp'][$device['device_id']])))
     {
-      list($r_oid,$value) = explode("=", $entry, 2);
-      $r_oid = trim($r_oid); $value = trim($value);
-      $oid_parts = explode(".", $r_oid);
-      $r_oid = $oid_parts['0'];
-      $index = $oid_parts['1'];
-      if (isset($oid_parts['2'])) { $index .= ".".$oid_parts['2']; }
-      if (isset($oid_parts['3'])) { $index .= ".".$oid_parts['3']; }
-      if (isset($oid_parts['4'])) { $index .= ".".$oid_parts['4']; }
-      if (isset($oid_parts['5'])) { $index .= ".".$oid_parts['5']; }
-      if (isset($oid_parts['6'])) { $index .= ".".$oid_parts['6']; }
-      if (!strstr($value, "at this OID") && isset($r_oid) && isset($index))
-      {
-        $array[$index][$r_oid] = $value;
-      }
+        $data = snmp_walk($device, $oid, "-OQUs", $mib, $mibdir);
+        foreach (explode("\n", $data) as $entry)
+        {
+            list($r_oid,$value) = explode("=", $entry, 2);
+            $r_oid = trim($r_oid); $value = trim($value);
+            $oid_parts = explode(".", $r_oid);
+            $r_oid = $oid_parts['0'];
+            $index = $oid_parts['1'];
+            if (isset($oid_parts['2'])) { $index .= ".".$oid_parts['2']; }
+            if (isset($oid_parts['3'])) { $index .= ".".$oid_parts['3']; }
+                if (isset($oid_parts['4'])) { $index .= ".".$oid_parts['4']; }
+                    if (isset($oid_parts['5'])) { $index .= ".".$oid_parts['5']; }
+                        if (isset($oid_parts['6'])) { $index .= ".".$oid_parts['6']; }
+                            if (!strstr($value, "at this OID") && isset($r_oid) && isset($index))
+                            {
+                                $array[$index][$r_oid] = $value;
+                            }
+        }
+        $cache['snmp'][$device['device_id']][$oid] = $array;
     }
-    $cache['snmp'][$device['device_id']][$oid] = $array;
-  }
 
-  return $cache['snmp'][$device['device_id']][$oid];
+    return $cache['snmp'][$device['device_id']][$oid];
 }
 
 function snmpwalk_cache_double_oid($device, $oid, $array, $mib = NULL, $mibdir = NULL)
 {
-  $data = snmp_walk($device, $oid, "-OQUs", $mib, $mibdir);
+    $data = snmp_walk($device, $oid, "-OQUs", $mib, $mibdir);
 
-  foreach (explode("\n", $data) as $entry)
-  {
-    list($oid,$value) = explode("=", $entry, 2);
-    $oid = trim($oid); $value = trim($value);
-    list($oid, $first, $second) = explode(".", $oid);
-    if (!strstr($value, "at this OID") && isset($oid) && isset($first) && isset($second))
+    foreach (explode("\n", $data) as $entry)
     {
-      $double = $first.".".$second;
-      $array[$double][$oid] = $value;
+        list($oid,$value) = explode("=", $entry, 2);
+        $oid = trim($oid); $value = trim($value);
+        list($oid, $first, $second) = explode(".", $oid);
+        if (!strstr($value, "at this OID") && isset($oid) && isset($first) && isset($second))
+        {
+            $double = $first.".".$second;
+            $array[$double][$oid] = $value;
+        }
     }
-  }
 
-  return $array;
+    return $array;
 }
 
 function snmpwalk_cache_triple_oid($device, $oid, $array, $mib = NULL, $mibdir = NULL)
 {
-  $data = snmp_walk($device, $oid, "-OQUs", $mib, $mibdir);
+    $data = snmp_walk($device, $oid, "-OQUs", $mib, $mibdir);
 
-  foreach (explode("\n", $data) as $entry)
-  {
-    list($oid,$value) = explode("=", $entry, 2);
-    $oid = trim($oid); $value = trim($value);
-    list($oid, $first, $second, $third) = explode(".", $oid);
-    if (!strstr($value, "at this OID") && isset($oid) && isset($first) && isset($second))
+    foreach (explode("\n", $data) as $entry)
     {
-      $index = $first.".".$second.".".$third;
-      $array[$index][$oid] = $value;
+        list($oid,$value) = explode("=", $entry, 2);
+        $oid = trim($oid); $value = trim($value);
+        list($oid, $first, $second, $third) = explode(".", $oid);
+        if (!strstr($value, "at this OID") && isset($oid) && isset($first) && isset($second))
+        {
+            $index = $first.".".$second.".".$third;
+            $array[$index][$oid] = $value;
+        }
     }
-  }
 
-  return $array;
+    return $array;
 }
 
 function snmpwalk_cache_twopart_oid($device, $oid, $array, $mib = 0)
 {
-  global $config;
+    global $config;
 
-  if (is_numeric($device['timeout']) && $device['timeout'] > 0)
-  {
-     $timeout = $device['timeout'];
-  } elseif (isset($config['snmp']['timeout'])) {
-     $timeout =  $config['snmp']['timeout'];
-  }
-
-  if (is_numeric($device['retries']) && $device['retries'] > 0)
-  {
-    $retries = $device['retries'];
-  } elseif (isset($config['snmp']['retries'])) {
-    $retries =  $config['snmp']['retries'];
-  }
-
-  if (!isset($device['transport']))
-  {
-    $device['transport'] = "udp";
-  }
-
-  if ($device['snmpver'] == 'v1' || $config['os'][$device['os']]['nobulk'])
-  {
-    $snmpcommand = $config['snmpwalk'];
-  }
-  else
-  {
-    $snmpcommand = $config['snmpbulkwalk'];
-  }
-
-  $cmd = $snmpcommand;
-  $cmd .= snmp_gen_auth ($device);
-
-  $cmd .= " -O QUs";
-  $cmd .= mibdir(null);
-  if ($mib) { $cmd .= " -m $mib"; }
-  if (isset($timeout)) { $cmd .= " -t " . $timeout; }
-  if (isset($retries)) { $cmd .= " -r " . $retries; }
-  $cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." ".$oid;
-  if (!$debug) { $cmd .= " 2>/dev/null"; }
-
-  $data = trim(external_exec($cmd));
-
-  $device_id = $device['device_id'];
-  foreach (explode("\n", $data) as $entry)
-  {
-    list($oid,$value) = explode("=", $entry, 2);
-    $oid = trim($oid); $value = trim($value); $value = str_replace("\"", "", $value);
-    list($oid, $first, $second) = explode(".", $oid);
-    if (!strstr($value, "at this OID") && isset($oid) && isset($first) && isset($second))
+    if (is_numeric($device['timeout']) && $device['timeout'] > 0)
     {
-      $array[$first][$second][$oid] = $value;
+        $timeout = $device['timeout'];
+    } elseif (isset($config['snmp']['timeout'])) {
+        $timeout =  $config['snmp']['timeout'];
     }
-  }
 
-  return $array;
+    if (is_numeric($device['retries']) && $device['retries'] > 0)
+    {
+        $retries = $device['retries'];
+    } elseif (isset($config['snmp']['retries'])) {
+        $retries =  $config['snmp']['retries'];
+    }
+
+    if (!isset($device['transport']))
+    {
+        $device['transport'] = "udp";
+    }
+
+    if ($device['snmpver'] == 'v1' || $config['os'][$device['os']]['nobulk'])
+    {
+        $snmpcommand = $config['snmpwalk'];
+    }
+    else
+    {
+        $snmpcommand = $config['snmpbulkwalk'];
+    }
+
+    $cmd = $snmpcommand;
+    $cmd .= snmp_gen_auth ($device);
+
+    $cmd .= " -O QUs";
+    $cmd .= mibdir(null);
+    if ($mib) { $cmd .= " -m $mib"; }
+    if (isset($timeout)) { $cmd .= " -t " . $timeout; }
+        if (isset($retries)) { $cmd .= " -r " . $retries; }
+            $cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." ".$oid;
+    if (!$debug) { $cmd .= " 2>/dev/null"; }
+
+        $data = trim(external_exec($cmd));
+
+    $device_id = $device['device_id'];
+    foreach (explode("\n", $data) as $entry)
+    {
+        list($oid,$value) = explode("=", $entry, 2);
+        $oid = trim($oid); $value = trim($value); $value = str_replace("\"", "", $value);
+        list($oid, $first, $second) = explode(".", $oid);
+        if (!strstr($value, "at this OID") && isset($oid) && isset($first) && isset($second))
+        {
+            $array[$first][$second][$oid] = $value;
+        }
+    }
+
+    return $array;
 }
 
 function snmpwalk_cache_threepart_oid($device, $oid, $array, $mib = 0)
 {
-  global $config, $debug;
+    global $config, $debug;
 
-  if (is_numeric($device['timeout']) && $device['timeout'] > 0)
-  {
-     $timeout = $device['timeout'];
-  } elseif (isset($config['snmp']['timeout'])) {
-     $timeout =  $config['snmp']['timeout'];
-  }
-
-  if (is_numeric($device['retries']) && $device['retries'] > 0)
-  {
-    $retries = $device['retries'];
-  } elseif (isset($config['snmp']['retries'])) {
-    $retries =  $config['snmp']['retries'];
-  }
-
-  if (!isset($device['transport']))
-  {
-    $device['transport'] = "udp";
-  }
-
-  if ($device['snmpver'] == 'v1' || $config['os'][$device['os']]['nobulk'])
-  {
-    $snmpcommand = $config['snmpwalk'];
-  }
-  else
-  {
-    $snmpcommand = $config['snmpbulkwalk'];
-  }
-
-  $cmd = $snmpcommand;
-  $cmd .= snmp_gen_auth ($device);
-
-  $cmd .= " -O QUs";
-  $cmd .= mibdir(null);
-  if ($mib) { $cmd .= " -m $mib"; }
-  if (isset($timeout)) { $cmd .= " -t " . $timeout; }
-  if (isset($retries)) { $cmd .= " -r " . $retries; }
-  $cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." ".$oid;
-  if (!$debug) { $cmd .= " 2>/dev/null"; }
-  $data = trim(external_exec($cmd));
-
-  $device_id = $device['device_id'];
-  foreach (explode("\n", $data) as $entry)
-  {
-    list($oid,$value) = explode("=", $entry, 2);
-    $oid = trim($oid); $value = trim($value); $value = str_replace("\"", "", $value);
-    list($oid, $first, $second, $third) = explode(".", $oid);
-    if ($debug) {echo("$entry || $oid || $first || $second || $third\n"); }
-    if (!strstr($value, "at this OID") && isset($oid) && isset($first) && isset($second) && isset($third))
+    if (is_numeric($device['timeout']) && $device['timeout'] > 0)
     {
-      $array[$first][$second][$third][$oid] = $value;
+        $timeout = $device['timeout'];
+    } elseif (isset($config['snmp']['timeout'])) {
+        $timeout =  $config['snmp']['timeout'];
     }
-  }
 
-  return $array;
+    if (is_numeric($device['retries']) && $device['retries'] > 0)
+    {
+        $retries = $device['retries'];
+    } elseif (isset($config['snmp']['retries'])) {
+        $retries =  $config['snmp']['retries'];
+    }
+
+    if (!isset($device['transport']))
+    {
+        $device['transport'] = "udp";
+    }
+
+    if ($device['snmpver'] == 'v1' || $config['os'][$device['os']]['nobulk'])
+    {
+        $snmpcommand = $config['snmpwalk'];
+    }
+    else
+    {
+        $snmpcommand = $config['snmpbulkwalk'];
+    }
+
+    $cmd = $snmpcommand;
+    $cmd .= snmp_gen_auth ($device);
+
+    $cmd .= " -O QUs";
+    $cmd .= mibdir(null);
+    if ($mib) { $cmd .= " -m $mib"; }
+    if (isset($timeout)) { $cmd .= " -t " . $timeout; }
+        if (isset($retries)) { $cmd .= " -r " . $retries; }
+            $cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." ".$oid;
+    if (!$debug) { $cmd .= " 2>/dev/null"; }
+        $data = trim(external_exec($cmd));
+
+    $device_id = $device['device_id'];
+    foreach (explode("\n", $data) as $entry)
+    {
+        list($oid,$value) = explode("=", $entry, 2);
+        $oid = trim($oid); $value = trim($value); $value = str_replace("\"", "", $value);
+        list($oid, $first, $second, $third) = explode(".", $oid);
+        if ($debug) {echo("$entry || $oid || $first || $second || $third\n"); }
+        if (!strstr($value, "at this OID") && isset($oid) && isset($first) && isset($second) && isset($third))
+        {
+            $array[$first][$second][$third][$oid] = $value;
+        }
+    }
+
+    return $array;
 }
 
 function snmp_cache_slotport_oid($oid, $device, $array, $mib = 0)
 {
-  global $config;
+    global $config;
 
-  if (is_numeric($device['timeout']) && $device['timeout'] > 0)
-  {
-     $timeout = $device['timeout'];
-  } elseif (isset($config['snmp']['timeout'])) {
-     $timeout =  $config['snmp']['timeout'];
-  }
-
-  if (is_numeric($device['retries']) && $device['retries'] > 0)
-  {
-    $retries = $device['retries'];
-  } elseif (isset($config['snmp']['retries'])) {
-    $retries =  $config['snmp']['retries'];
-  }
-
-  if (!isset($device['transport']))
-  {
-    $device['transport'] = "udp";
-  }
-
-  if ($device['snmpver'] == 'v1' || $config['os'][$device['os']]['nobulk'])
-  {
-    $snmpcommand = $config['snmpwalk'];
-  }
-  else
-  {
-    $snmpcommand = $config['snmpbulkwalk'];
-  }
-
-  $cmd = $snmpcommand;
-  $cmd .= snmp_gen_auth ($device);
-
-  $cmd .= " -O QUs";
-  if ($mib) { $cmd .= " -m $mib"; }
-  $cmd .= mibdir(null);
-  if (isset($timeout)) { $cmd .= " -t " . $timeout; }
-  if (isset($retries)) { $cmd .= " -r " . $retries; }
-  $cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." ".$oid;
-  if (!$debug) { $cmd .= " 2>/dev/null"; }
-  $data = trim(external_exec($cmd));
-  $device_id = $device['device_id'];
-
-  foreach (explode("\n", $data) as $entry)
-  {
-    $entry = str_replace($oid.".", "", $entry);
-    list($slotport, $value) = explode("=", $entry, 2);
-    $slotport = trim($slotport); $value = trim($value);
-    if ($array[$slotport]['ifIndex'])
+    if (is_numeric($device['timeout']) && $device['timeout'] > 0)
     {
-      $ifIndex = $array[$slotport]['ifIndex'];
-      $array[$ifIndex][$oid] = $value;
+        $timeout = $device['timeout'];
+    } elseif (isset($config['snmp']['timeout'])) {
+        $timeout =  $config['snmp']['timeout'];
     }
-  }
 
-  return $array;
+    if (is_numeric($device['retries']) && $device['retries'] > 0)
+    {
+        $retries = $device['retries'];
+    } elseif (isset($config['snmp']['retries'])) {
+        $retries =  $config['snmp']['retries'];
+    }
+
+    if (!isset($device['transport']))
+    {
+        $device['transport'] = "udp";
+    }
+
+    if ($device['snmpver'] == 'v1' || $config['os'][$device['os']]['nobulk'])
+    {
+        $snmpcommand = $config['snmpwalk'];
+    }
+    else
+    {
+        $snmpcommand = $config['snmpbulkwalk'];
+    }
+
+    $cmd = $snmpcommand;
+    $cmd .= snmp_gen_auth ($device);
+
+    $cmd .= " -O QUs";
+    if ($mib) { $cmd .= " -m $mib"; }
+    $cmd .= mibdir(null);
+    if (isset($timeout)) { $cmd .= " -t " . $timeout; }
+    if (isset($retries)) { $cmd .= " -r " . $retries; }
+        $cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." ".$oid;
+    if (!$debug) { $cmd .= " 2>/dev/null"; }
+        $data = trim(external_exec($cmd));
+    $device_id = $device['device_id'];
+
+    foreach (explode("\n", $data) as $entry)
+    {
+        $entry = str_replace($oid.".", "", $entry);
+        list($slotport, $value) = explode("=", $entry, 2);
+        $slotport = trim($slotport); $value = trim($value);
+        if ($array[$slotport]['ifIndex'])
+        {
+            $ifIndex = $array[$slotport]['ifIndex'];
+            $array[$ifIndex][$oid] = $value;
+        }
+    }
+
+    return $array;
 }
 
 function snmp_cache_oid($oid, $device, $array, $mib = 0)
 {
-  $array = snmpwalk_cache_oid($device, $oid, $array, $mib);
-  return $array;
+    $array = snmpwalk_cache_oid($device, $oid, $array, $mib);
+    return $array;
 }
 
 function snmp_cache_port_oids($oids, $port, $device, $array, $mib=0)
 {
-  global $config;
+    global $config;
 
-  if (is_numeric($device['timeout']) && $device['timeout'] > 0)
-  {
-     $timeout = $device['timeout'];
-  } elseif (isset($config['snmp']['timeout'])) {
-     $timeout =  $config['snmp']['timeout'];
-  }
-
-  if (is_numeric($device['retries']) && $device['retries'] > 0)
-  {
-    $retries = $device['retries'];
-  } elseif (isset($config['snmp']['retries'])) {
-    $retries =  $config['snmp']['retries'];
-  }
-
-  if (!isset($device['transport']))
-  {
-    $device['transport'] = "udp";
-  }
-
-  foreach ($oids as $oid)
-  {
-    $string .= " $oid.$port";
-  }
-
-  $cmd = $config['snmpget'];
-  $cmd .= snmp_gen_auth ($device);
-
-  $cmd .= " -O vq";
-  if (isset($timeout)) { $cmd .= " -t " . $timeout; }
-  if (isset($retries)) { $cmd .= " -r " . $retries; }
-  $cmd .= mibdir(null);
-  if ($mib) { $cmd .= " -m $mib"; }
-  $cmd .= " -t " . $timeout . " -r " . $retries;
-  $cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." ".$string;
-  if (!$debug) { $cmd .= " 2>/dev/null"; }
-  $data = trim(external_exec($cmd));
-  $x=0;
-  $values = explode("\n", $data);
-  #echo("Caching: ifIndex $port\n");
-  foreach ($oids as $oid) {
-    if (!strstr($values[$x], "at this OID"))
+    if (is_numeric($device['timeout']) && $device['timeout'] > 0)
     {
-      $array[$port][$oid] = $values[$x];
+        $timeout = $device['timeout'];
+    } elseif (isset($config['snmp']['timeout'])) {
+        $timeout =  $config['snmp']['timeout'];
     }
-    $x++;
-  }
 
-  return $array;
+    if (is_numeric($device['retries']) && $device['retries'] > 0)
+    {
+        $retries = $device['retries'];
+    } elseif (isset($config['snmp']['retries'])) {
+        $retries =  $config['snmp']['retries'];
+    }
+
+    if (!isset($device['transport']))
+    {
+        $device['transport'] = "udp";
+    }
+
+    foreach ($oids as $oid)
+    {
+        $string .= " $oid.$port";
+    }
+
+    $cmd = $config['snmpget'];
+    $cmd .= snmp_gen_auth ($device);
+
+    $cmd .= " -O vq";
+    if (isset($timeout)) { $cmd .= " -t " . $timeout; }
+    if (isset($retries)) { $cmd .= " -r " . $retries; }
+        $cmd .= mibdir(null);
+    if ($mib) { $cmd .= " -m $mib"; }
+        $cmd .= " -t " . $timeout . " -r " . $retries;
+    $cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." ".$string;
+    if (!$debug) { $cmd .= " 2>/dev/null"; }
+    $data = trim(external_exec($cmd));
+    $x=0;
+    $values = explode("\n", $data);
+    #echo("Caching: ifIndex $port\n");
+    foreach ($oids as $oid) {
+        if (!strstr($values[$x], "at this OID"))
+        {
+            $array[$port][$oid] = $values[$x];
+        }
+        $x++;
+    }
+
+    return $array;
 }
 
 function snmp_cache_portIfIndex($device, $array)
 {
-  global $config;
+    global $config;
 
-  if (is_numeric($device['timeout']) && $device['timeout'] > 0)
-  {
-     $timeout = $device['timeout'];
-  } elseif (isset($config['snmp']['timeout'])) {
-     $timeout =  $config['snmp']['timeout'];
-  }
-
-  if (is_numeric($device['retries']) && $device['retries'] > 0)
-  {
-    $retries = $device['retries'];
-  } elseif (isset($config['snmp']['retries'])) {
-    $retries =  $config['snmp']['retries'];
-  }
-
-  if (!isset($device['transport']))
-  {
-    $device['transport'] = "udp";
-  }
-
-  $cmd = $config['snmpwalk'];
-  $cmd .= snmp_gen_auth ($device);
-
-  $cmd .= " -CI -m CISCO-STACK-MIB -O q";
-  $cmd .= mibdir(null);
-  if (isset($timeout)) { $cmd .= " -t " . $timeout; }
-  if (isset($retries)) { $cmd .= " -r " . $retries; }
-  $cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." portIfIndex";
-  $output = trim(external_exec($cmd));
-  $device_id = $device['device_id'];
-
-  foreach (explode("\n", $output) as $entry)
-  {
-    $entry = str_replace("CISCO-STACK-MIB::portIfIndex.", "", $entry);
-    list($slotport, $ifIndex) = explode(" ", $entry, 2);
-    if ($slotport && $ifIndex) {
-      $array[$ifIndex]['portIfIndex'] = $slotport;
-      $array[$slotport]['ifIndex'] = $ifIndex;
+    if (is_numeric($device['timeout']) && $device['timeout'] > 0)
+    {
+        $timeout = $device['timeout'];
+    } elseif (isset($config['snmp']['timeout'])) {
+        $timeout =  $config['snmp']['timeout'];
     }
-  }
 
-  return $array;
+    if (is_numeric($device['retries']) && $device['retries'] > 0)
+    {
+        $retries = $device['retries'];
+    } elseif (isset($config['snmp']['retries'])) {
+        $retries =  $config['snmp']['retries'];
+    }
+
+    if (!isset($device['transport']))
+    {
+        $device['transport'] = "udp";
+    }
+
+    $cmd = $config['snmpwalk'];
+    $cmd .= snmp_gen_auth ($device);
+
+    $cmd .= " -CI -m CISCO-STACK-MIB -O q";
+    $cmd .= mibdir(null);
+    if (isset($timeout)) { $cmd .= " -t " . $timeout; }
+    if (isset($retries)) { $cmd .= " -r " . $retries; }
+        $cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." portIfIndex";
+    $output = trim(external_exec($cmd));
+    $device_id = $device['device_id'];
+
+    foreach (explode("\n", $output) as $entry)
+    {
+        $entry = str_replace("CISCO-STACK-MIB::portIfIndex.", "", $entry);
+        list($slotport, $ifIndex) = explode(" ", $entry, 2);
+        if ($slotport && $ifIndex) {
+            $array[$ifIndex]['portIfIndex'] = $slotport;
+            $array[$slotport]['ifIndex'] = $ifIndex;
+        }
+    }
+
+    return $array;
 }
 
 function snmp_cache_portName($device, $array)
 {
-  global $config;
+    global $config;
 
-  if (is_numeric($device['timeout']) && $device['timeout'] > 0)
-  {
-     $timeout = $device['timeout'];
-  } elseif (isset($config['snmp']['timeout'])) {
-     $timeout =  $config['snmp']['timeout'];
-  }
-
-  if (is_numeric($device['retries']) && $device['retries'] > 0)
-  {
-    $retries = $device['retries'];
-  } elseif (isset($config['snmp']['retries'])) {
-    $retries =  $config['snmp']['retries'];
-  }
-
-  if (!isset($device['transport']))
-  {
-    $device['transport'] = "udp";
-  }
-
-  $cmd = $config['snmpwalk'];
-  $cmd .= snmp_gen_auth ($device);
-
-  $cmd .= " -CI -m CISCO-STACK-MIB -O Qs";
-  $cmd .= mibdir(null);
-  if (isset($timeout)) { $cmd .= " -t " . $timeout; }
-  if (isset($retries)) { $cmd .= " -r " . $retries; }
-  $cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." portName";
-  $output = trim(external_exec($cmd));
-  $device_id = $device['device_id'];
-  #echo("Caching: portName\n");
-
-  foreach (explode("\n", $output) as $entry)
-  {
-    $entry = str_replace("portName.", "", $entry);
-    list($slotport, $portName) = explode("=", $entry, 2);
-    $slotport = trim($slotport); $portName = trim($portName);
-    if ($array[$slotport]['ifIndex'])
+    if (is_numeric($device['timeout']) && $device['timeout'] > 0)
     {
-      $ifIndex = $array[$slotport]['ifIndex'];
-      $array[$slotport]['portName'] = $portName;
-      $array[$ifIndex]['portName'] = $portName;
+        $timeout = $device['timeout'];
+    } elseif (isset($config['snmp']['timeout'])) {
+        $timeout =  $config['snmp']['timeout'];
     }
-  }
 
-  return $array;
+    if (is_numeric($device['retries']) && $device['retries'] > 0)
+    {
+        $retries = $device['retries'];
+    } elseif (isset($config['snmp']['retries'])) {
+        $retries =  $config['snmp']['retries'];
+    }
+
+    if (!isset($device['transport']))
+    {
+        $device['transport'] = "udp";
+    }
+
+    $cmd = $config['snmpwalk'];
+    $cmd .= snmp_gen_auth ($device);
+
+    $cmd .= " -CI -m CISCO-STACK-MIB -O Qs";
+    $cmd .= mibdir(null);
+    if (isset($timeout)) { $cmd .= " -t " . $timeout; }
+    if (isset($retries)) { $cmd .= " -r " . $retries; }
+        $cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." portName";
+    $output = trim(external_exec($cmd));
+    $device_id = $device['device_id'];
+    #echo("Caching: portName\n");
+
+    foreach (explode("\n", $output) as $entry)
+    {
+        $entry = str_replace("portName.", "", $entry);
+        list($slotport, $portName) = explode("=", $entry, 2);
+        $slotport = trim($slotport); $portName = trim($portName);
+        if ($array[$slotport]['ifIndex'])
+        {
+            $ifIndex = $array[$slotport]['ifIndex'];
+            $array[$slotport]['portName'] = $portName;
+            $array[$ifIndex]['portName'] = $portName;
+        }
+    }
+
+    return $array;
 }
 
 function snmp_gen_auth (&$device)
 {
-  global $debug;
+    global $debug;
 
-  $cmd = "";
+    $cmd = "";
 
-  if ($device['snmpver'] === "v3")
-  {
-    $cmd = " -v3 -n \"\" -l " . $device['authlevel'];
-
-    if ($device['authlevel'] === "noAuthNoPriv")
+    if ($device['snmpver'] === "v3")
     {
-      // We have to provide a username anyway (see Net-SNMP doc)
-      // FIXME: There are two other places this is set - why are they ignored here?
-      $cmd .= " -u root";
+        $cmd = " -v3 -n \"\" -l " . $device['authlevel'];
+
+        if ($device['authlevel'] === "noAuthNoPriv")
+        {
+            // We have to provide a username anyway (see Net-SNMP doc)
+            // FIXME: There are two other places this is set - why are they ignored here?
+            $cmd .= " -u root";
+        }
+        elseif ($device['authlevel'] === "authNoPriv")
+        {
+            $cmd .= " -a " . $device['authalgo'];
+            $cmd .= " -A \"" . $device['authpass'] . "\"";
+            $cmd .= " -u " . $device['authname'];
+        }
+        elseif ($device['authlevel'] === "authPriv")
+        {
+            $cmd .= " -a " . $device['authalgo'];
+            $cmd .= " -A \"" . $device['authpass'] . "\"";
+            $cmd .= " -u " . $device['authname'];
+            $cmd .= " -x " . $device['cryptoalgo'];
+            $cmd .= " -X \"" . $device['cryptopass'] . "\"";
+        }
+        else
+        {
+            if ($debug) { print "DEBUG: " . $device['snmpver'] ." : Unsupported SNMPv3 AuthLevel (wtf have you done ?)\n"; }
+        }
     }
-    elseif ($device['authlevel'] === "authNoPriv")
+    elseif ($device['snmpver'] === "v2c" or $device['snmpver'] === "v1")
     {
-      $cmd .= " -a " . $device['authalgo'];
-      $cmd .= " -A \"" . $device['authpass'] . "\"";
-      $cmd .= " -u " . $device['authname'];
-    }
-    elseif ($device['authlevel'] === "authPriv")
-    {
-      $cmd .= " -a " . $device['authalgo'];
-      $cmd .= " -A \"" . $device['authpass'] . "\"";
-      $cmd .= " -u " . $device['authname'];
-      $cmd .= " -x " . $device['cryptoalgo'];
-      $cmd .= " -X \"" . $device['cryptopass'] . "\"";
+        $cmd  = " -" . $device['snmpver'];
+        $cmd .= " -c " . $device['community'];
     }
     else
     {
-      if ($debug) { print "DEBUG: " . $device['snmpver'] ." : Unsupported SNMPv3 AuthLevel (wtf have you done ?)\n"; }
+        if ($debug) { print "DEBUG: " . $device['snmpver'] ." : Unsupported SNMP Version (wtf have you done ?)\n"; }
     }
-  }
-  elseif ($device['snmpver'] === "v2c" or $device['snmpver'] === "v1")
-  {
-    $cmd  = " -" . $device['snmpver'];
-    $cmd .= " -c " . $device['community'];
-  }
-  else
-  {
-    if ($debug) { print "DEBUG: " . $device['snmpver'] ." : Unsupported SNMP Version (wtf have you done ?)\n"; }
-  }
 
-  if ($debug) { print "DEBUG: SNMP Auth options = $cmd\n"; }
+    if ($debug) { print "DEBUG: SNMP Auth options = $cmd\n"; }
 
-  return $cmd;
+        return $cmd;
 }
 
 /*