mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove legacy function calls (#12651)

Browse Source 
* 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:
Tony Murray
2021-03-28 17:25:30 -05:00
committed by GitHub
parent 1695f86af8
commit 1c379dcd05
832 changed files with 2023 additions and 2596 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/html/graphs/mempool/auth.inc.php
View File

@@ -5,7 +5,7 @@ if (is_numeric($vars['id'])) {
if (is_numeric($mempool['device_id']) && ($auth || device_permitted($mempool['device_id']))) {
$device = device_by_id_cache($mempool['device_id']);
$rrd_filename = rrd_name($device['hostname'], ['mempool', $mempool['mempool_type'], $mempool['mempool_class'], $mempool['mempool_index']]);
$rrd_filename = Rrd::name($device['hostname'], ['mempool', $mempool['mempool_type'], $mempool['mempool_class'], $mempool['mempool_index']]);
$title = generate_device_link($device);
$title .= ' :: Memory Pool :: ' . htmlentities($mempool['mempool_descr']);
$auth = true;

4
includes/html/graphs/mempool/usage.inc.php
View File

@@ -23,10 +23,10 @@ if ($width > '500') {
$rrd_options .= " COMMENT:'" . substr(str_pad($unit_text, ($descr_len + 5)), 0, ($descr_len + 5)) . "Total Used Free\l'";
}
$descr = rrdtool_escape(short_hrDeviceDescr($mempool['mempool_descr']), $descr_len);
$descr = \LibreNMS\Data\Store\Rrd::fixedSafeDescr(short_hrDeviceDescr($mempool['mempool_descr']), $descr_len);
$perc = round($mempool['mempool_perc'], 0);
$background = get_percentage_colours($perc, $mempool['mempool_perc_warn']);
$background = \LibreNMS\Util\Colors::percentage($perc, $mempool['mempool_perc_warn']);
$rrd_options .= " DEF:{$mempool['mempool_id']}used=$rrd_filename:used:AVERAGE";
$rrd_options .= " DEF:{$mempool['mempool_id']}free=$rrd_filename:free:AVERAGE";