Misc graph fixes (librenms#18148)

Author: murrant

LibreNMS/Billing.php

@@ -150,7 +150,7 @@ private static function get95thIn($bill_id, $datefrom, $dateto): float
         $q_95_sql = 'SELECT (in_delta / period * 8) AS rate FROM bill_data  WHERE bill_id = ?';
         $q_95_sql .= ' AND timestamp > ? AND timestamp <= ? ORDER BY rate ASC';
         $a_95th = dbFetchColumn($q_95_sql, [$bill_id, $datefrom, $dateto]);
-        $m_95th = $a_95th[$measurement_95th];
+        $m_95th = $a_95th[$measurement_95th] ?? 0;
 
         return round($m_95th, 2);
     }
@@ -165,7 +165,7 @@ private static function get95thout($bill_id, $datefrom, $dateto): float
         $q_95_sql = 'SELECT (out_delta / period * 8) AS rate FROM bill_data  WHERE bill_id = ?';
         $q_95_sql .= ' AND timestamp > ? AND timestamp <= ? ORDER BY rate ASC';
         $a_95th = dbFetchColumn($q_95_sql, [$bill_id, $datefrom, $dateto]);
-        $m_95th = $a_95th[$measurement_95th];
+        $m_95th = $a_95th[$measurement_95th] ?? 0;
 
         return round($m_95th, 2);
     }

includes/html/graphs/bill/bits.inc.php

@@ -3,12 +3,13 @@
 use LibreNMS\Billing;
 use LibreNMS\Util\Number;
 
-$datefrom = date('YmdHis', $vars['from']);
-$dateto = date('YmdHis', $vars['to']);
+$datefrom = date('YmdHis', $vars['from'] ?? null);
+$dateto = date('YmdHis', $vars['to'] ?? null);
+$bill_id = $vars['id'] ?? 0;
 
-$rates = Billing::getRates($vars['id'], $datefrom, $dateto, $vars['dir']);
+$rates = Billing::getRates($bill_id, $datefrom, $dateto, $vars['dir'] ?? null);
 
-$ports = dbFetchRows('SELECT * FROM `bill_ports` AS B, `ports` AS P, `devices` AS D WHERE B.bill_id = ? AND P.port_id = B.port_id AND D.device_id = P.device_id', [$vars['id']]);
+$ports = dbFetchRows('SELECT * FROM `bill_ports` AS B, `ports` AS P, `devices` AS D WHERE B.bill_id = ? AND P.port_id = B.port_id AND D.device_id = P.device_id', [$bill_id]);
 
 // Generate a list of ports and then call the multi_bits grapher to generate from the list
 $i = 0;

includes/html/graphs/generic_multi_bits_separated.inc.php

@@ -65,12 +65,8 @@
     $colour_out = \App\Facades\LibrenmsConfig::get("graph_colours.$colours_out.$iter");
 
     if (! $nodetails) {
-        if (isset($rrd['descr_in'])) {
-            $descr = \LibreNMS\Data\Store\Rrd::fixedSafeDescr($rrd['descr_in'], $descr_len) . '  In';
-        } else {
-            $descr = \LibreNMS\Data\Store\Rrd::fixedSafeDescr($rrd['descr'], $descr_len) . '  In';
-        }
-        $descr_out = \LibreNMS\Data\Store\Rrd::fixedSafeDescr($rrd['descr_out'], $descr_len) . ' Out';
+        $descr = \LibreNMS\Data\Store\Rrd::fixedSafeDescr($rrd['descr_in'] ?? $rrd['descr'] ?? '', $descr_len) . '  In';
+        $descr_out = \LibreNMS\Data\Store\Rrd::fixedSafeDescr($rrd['descr_out'] ?? '', $descr_len) . ' Out';
     }
 
     $rrd_options .= ' DEF:' . $in . $i . '=' . $rrd['filename'] . ':' . $ds_in . ':AVERAGE ';

includes/html/graphs/multiport/bits_separate.inc.php

@@ -6,6 +6,10 @@
 
 foreach (explode(',', $vars['id']) as $ifid) {
     $port = dbFetchRow('SELECT * FROM `ports` AS I, devices as D WHERE I.port_id = ? AND I.device_id = D.device_id', [$ifid]);
+    if (! $port) {
+        continue;
+    }
+
     $rrd_file = get_port_rrdfile_path($port['hostname'], $ifid);
     if (Rrd::checkRrdExists($rrd_file)) {
         $port = cleanPort($port);