add some data fetched from RRD; make RRD fetch actually return data correctly

[php-utility-classes.git] / include / classes / rrdstat.php-class

diff --git a/include/classes/rrdstat.php-class b/include/classes/rrdstat.php-class
index 7532f00bfc637d649eea5599543b89e7b372c159..7ac9c04973b6b536e7c7fd228c2c4fbe431aa236 100644 (file)
--- a/include/classes/rrdstat.php-class
+++ b/include/classes/rrdstat.php-class
@@ -366,8 +366,13 @@ class rrdstat {
             $evalcode = 'function { return trim('.substr($ds['update'], 4).')); }';
           }
           elseif (substr($ds['update'], 0, 8) == 'snmp-if:') {
-            $snmphost = 'localhost'; $snmpcomm = 'public';
-            list($nix, $ifname, $valtype) = explode(':', $ds['update'], 3);
+            if (substr_count($ds['update'], ':') >= 4) {
+              list($nix, $snmphost, $snmpcomm, $ifname, $valtype) = explode(':', $ds['update'], 5);
+            }
+            else {
+              $snmphost = 'localhost'; $snmpcomm = 'public';
+              list($nix, $ifname, $valtype) = explode(':', $ds['update'], 3);
+            }
             $iflist = explode("\n", `snmpwalk -v2c -c $snmpcomm $snmphost interfaces.ifTable.ifEntry.ifDescr`);
             $ifnr = null;
             foreach ($iflist as $ifdesc) {
@@ -451,8 +456,8 @@ class rrdstat {
       $fresult = array();
       $rows = explode("\n", $return);
       $fields = preg_split('/\s+/', array_shift($rows));
-      if (array_shift($fields) == 'timestamp') {
-        $fresult[0] = $fields;
+      if (in_array(array_shift($fields), array('timestamp', ''))) {
+        //$fresult[0] = $fields;
         foreach ($rows as $row) {
           if (strlen(trim($row))) {
             $rvals = preg_split('/\s+/', $row);