mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
Remove legacy function calls (#12651)
* massive inlines * fix style and wtf * remove rrdtool.inc.php include * fix CommonFunctions namespace issues * looking for missing class space, fix undefined class issues * style fixes
This commit is contained in:
@@ -40,7 +40,7 @@ foreach ($rrd_list as $rrd) {
|
||||
$ds = $rrd['ds'];
|
||||
$filename = $rrd['filename'];
|
||||
|
||||
$descr = rrdtool_escape($rrd['descr'], $descr_len);
|
||||
$descr = \LibreNMS\Data\Store\Rrd::fixedSafeDescr($rrd['descr'], $descr_len);
|
||||
$id = 'ds' . $i;
|
||||
|
||||
$rrd_options .= ' DEF:' . $rrd['ds'] . $i . '=' . $rrd['filename'] . ':' . $rrd['ds'] . ':AVERAGE ';
|
||||
@@ -97,7 +97,7 @@ foreach ($rrd_list as $rrd) {
|
||||
$rrd_options .= ' GPRINT:' . $t_defname . $i . 'max:MAX:%8.0lf%s GPRINT:' . $t_defname . $i . ":AVERAGE:'%8.0lf%s\\n'";
|
||||
|
||||
if ($printtotal === 1) {
|
||||
$rrd_options .= ' GPRINT:tot' . $rrd['ds'] . $i . ":%8.0lf%s'" . rrdtool_escape($total_units) . "'";
|
||||
$rrd_options .= ' GPRINT:tot' . $rrd['ds'] . $i . ":%8.0lf%s'" . Rrd::safeDescr($total_units) . "'";
|
||||
}
|
||||
|
||||
$rrd_options .= " COMMENT:'\\n'";
|
||||
|
Reference in New Issue
Block a user