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

PSR2 Cleanup: /html edition

Browse Source 
Travis tests for code conformance. Ignore warnings for now.
Fixed all errors, left most warnings.
This commit is contained in:
Tony Murray
2016-08-18 20:28:22 -05:00
parent f0c82498b5
commit 8c639aa5a4
468 changed files with 6605 additions and 7629 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
html/includes/graphs/generic_data.inc.php
View File

@@ -12,8 +12,7 @@ if ($rrd_filename) {
if ($inverse) {
$in = 'out';
$out = 'in';
}
else {
} else {
$in = 'in';
$out = 'out';
}
@@ -27,8 +26,7 @@ if ($multiplier) {
$rrd_options .= " CDEF:outoctets=poutoctets,$multiplier,*";
$rrd_options .= " CDEF:inoctets_max=pinoctets_max,$multiplier,*";
$rrd_options .= " CDEF:outoctets_max=poutoctets_max,$multiplier,*";
}
else {
} else {
$rrd_options .= ' DEF:'.$out.'octets='.$rrd_filename_out.':'.$ds_out.':AVERAGE';
$rrd_options .= ' DEF:'.$in.'octets='.$rrd_filename_in.':'.$ds_in.':AVERAGE';
$rrd_options .= ' DEF:'.$out.'octets_max='.$rrd_filename_out.':'.$ds_out.':MAX';
@@ -43,8 +41,7 @@ if ($_GET['previous'] == 'yes') {
$rrd_options .= ' SHIFT:p'.$in."octetsX:$period";
$rrd_options .= " CDEF:inoctetsX=pinoctetsX,$multiplier,*";
$rrd_options .= " CDEF:outoctetsX=poutoctetsX,$multiplier,*";
}
else {
} else {
$rrd_options .= ' DEF:'.$out.'octetsX='.$rrd_filename_out.':'.$ds_out.':AVERAGE:start='.$prev_from.':end='.$from;
$rrd_options .= ' DEF:'.$in.'octetsX='.$rrd_filename_in.':'.$ds_in.':AVERAGE:start='.$prev_from.':end='.$from;
$rrd_options .= ' SHIFT:'.$out."octetsX:$period";
@@ -92,8 +89,7 @@ if ($format == 'octets' || $format == 'bytes') {
$rrd_options .= ' VDEF:95thout=outoctets,95,PERCENT';
$units = 'Bps';
$format = 'octets';
}
else {
} else {
$rrd_options .= ' VDEF:95thin=inbits,95,PERCENT';
$rrd_options .= ' VDEF:95thout=outbits,95,PERCENT';
$units = 'bps';