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

Apply fixes from StyleCI (#12120)

Browse Source
This commit is contained in:
Jellyfrog
2020-09-21 15:40:17 +02:00
committed by GitHub
parent 77c531527c
commit 82f43cb98d
1733 changed files with 18337 additions and 18540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/html/graphs/location/auth.inc.php
View File

@@ -3,7 +3,7 @@
foreach (dbFetchRows('SELECT * FROM `devices`,`locations` WHERE location_id = ? && devices.location_id = locations.id', [$vars['id']]) as $device) {
if ($auth || device_permitted($device['device_id'])) {
$devices[] = $device;
$title = $device['location'];
$auth = true;
$title = $device['location'];
$auth = true;
}
}

30
includes/html/graphs/location/bits.inc.php
View File

@@ -1,16 +1,16 @@
<?php
// Generate a list of ports and then call the multi_bits grapher to generate from the list
$ds_in = 'INOCTETS';
$ds_in = 'INOCTETS';
$ds_out = 'OUTOCTETS';
$i = 1;
foreach ($devices as $device) {
foreach (dbFetchRows('SELECT * FROM `ports` WHERE `device_id` = ? AND `disabled` = 0', array($device['device_id'])) as $int) {
foreach (dbFetchRows('SELECT * FROM `ports` WHERE `device_id` = ? AND `disabled` = 0', [$device['device_id']]) as $int) {
$ignore = 0;
if (is_array(\LibreNMS\Config::get('device_traffic_iftype'))) {
foreach (\LibreNMS\Config::get('device_traffic_iftype') as $iftype) {
if (preg_match($iftype.'i', $int['ifType'])) {
if (preg_match($iftype . 'i', $int['ifType'])) {
$ignore = 1;
}
}
@@ -18,7 +18,7 @@ foreach ($devices as $device) {
if (is_array(\LibreNMS\Config::get('device_traffic_descr'))) {
foreach (\LibreNMS\Config::get('device_traffic_descr') as $ifdescr) {
if (preg_match($ifdescr.'i', $int['ifDescr']) || preg_match($ifdescr.'i', $int['ifName'])) {
if (preg_match($ifdescr . 'i', $int['ifDescr']) || preg_match($ifdescr . 'i', $int['ifName'])) {
$ignore = 1;
}
}
@@ -26,13 +26,13 @@ foreach ($devices as $device) {
$rrd_file = get_port_rrdfile_path($device['hostname'], $int['port_id']);
if (rrdtool_check_rrd_exists($rrd_file) && $ignore != 1) {
$rrd_filename = $rrd_file; // FIXME: Can this be unified without side-effects?
$rrd_list[$i]['filename'] = $rrd_filename;
$rrd_list[$i]['descr'] = $port['label'];
$rrd_list[$i]['descr_in'] = $device['hostname'];
$rrd_filename = $rrd_file; // FIXME: Can this be unified without side-effects?
$rrd_list[$i]['filename'] = $rrd_filename;
$rrd_list[$i]['descr'] = $port['label'];
$rrd_list[$i]['descr_in'] = $device['hostname'];
$rrd_list[$i]['descr_out'] = display($port['ifAlias']);
$rrd_list[$i]['ds_in'] = $ds_in;
$rrd_list[$i]['ds_out'] = $ds_out;
$rrd_list[$i]['ds_in'] = $ds_in;
$rrd_list[$i]['ds_out'] = $ds_out;
$i++;
}
@@ -40,19 +40,19 @@ foreach ($devices as $device) {
}//end foreach
}//end foreach
$units = 'b';
$units = 'b';
$total_units = 'B';
$colours_in = 'greens';
$multiplier = '8';
$colours_in = 'greens';
$multiplier = '8';
$colours_out = 'blues';
$nototal = 1;
$graph_title .= '::bits';
$colour_line_in = '006600';
$colour_line_in = '006600';
$colour_line_out = '000099';
$colour_area_in = 'CDEB8B';
$colour_area_in = 'CDEB8B';
$colour_area_out = 'C3D9FF';
require 'includes/html/graphs/generic_multi_bits_separated.inc.php';