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:
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

View File

@@ -56,7 +56,7 @@ function levsortos($base, $obj, $keys)
header('Content-type: application/json');
if (isset($_GET['term'])) {
\LibreNMS\Util\OS::loadAllDefinitions(false, true);
$_GET['term'] = clean($_GET['term']);
$_GET['term'] = strip_tags($_GET['term']);
$sortos = levsortos($_GET['term'], \LibreNMS\Config::get('os'), ['text', 'os']);
$sortos = array_slice($sortos, 0, 20);
foreach ($sortos as $lev => $os) {

View File

@@ -15,7 +15,7 @@ $bgp = [];
$limit = (int) \LibreNMS\Config::get('webui.global_search_result_limit');
if (isset($_REQUEST['search'])) {
$search = mres($_REQUEST['search']);
$search = $_REQUEST['search'];
header('Content-type: application/json');
if (strlen($search) > 0) {
$found = 0;
@@ -124,7 +124,7 @@ if (isset($_REQUEST['search'])) {
$device[] = [
'name' => $name,
'device_id' => $result['device_id'],
'url' => generate_device_url($result),
'url' => \LibreNMS\Util\Url::deviceUrl((int) $result['device_id']),
'colours' => $highlight_colour,
'device_ports' => $num_ports,
'device_image' => getIcon($result),
@@ -157,7 +157,7 @@ if (isset($_REQUEST['search'])) {
foreach ($results as $result) {
$name = $result['ifDescr'] == $result['ifAlias'] ? $result['ifName'] : $result['ifDescr'];
$description = display($result['ifAlias']);
$description = \LibreNMS\Util\Clean::html($result['ifAlias'], []);
if ($result['deleted'] == 0 && ($result['ignore'] == 0 || $result['ignore'] == 0) && ($result['ifInErrors_delta'] > 0 || $result['ifOutErrors_delta'] > 0)) {
// Errored ports
@@ -225,7 +225,7 @@ if (isset($_REQUEST['search'])) {
$bgp[] = [
'count' => count($results),
'url' => generate_peer_url($result),
'url' => \LibreNMS\Util\Url::generate(['page' => 'device', 'device' => $result['device_id'], 'tab' => 'routing', 'proto' => 'bgp'], []),
'name' => $name,
'description' => $description,
'localas' => $localas,

View File

@@ -31,7 +31,7 @@ $ifname = $port['label']; //Interface name that will be showed on top right of g
$hostname = shorthost($device['hostname']);
if ($_GET['title']) {
$ifname = display($_GET['title']);
$ifname = \LibreNMS\Util\Clean::html($_GET['title'], []);
}
/********* Other conf *******/