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

Fixed some scrut issues labelled Major

Browse Source
This commit is contained in:
laf
2015-07-15 22:04:19 +01:00
parent c2bcb69982
commit ef6d7b9565
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
html/billing-graph.php
View File

@ -112,7 +112,7 @@ if ($count <= 1) {
$i = '0'; $i = '0';
foreach (dbFetch('SELECT *, UNIX_TIMESTAMP(timestamp) AS formatted_date FROM bill_data WHERE bill_id = ? AND `timestamp` >= FROM_UNIXTIME( ? ) AND `timestamp` <= FROM_UNIXTIME( ? ) ORDER BY timestamp ASC', array($bill_id, $start, $end)) as $row) { foreach (dbFetch('SELECT *, UNIX_TIMESTAMP(timestamp) AS formatted_date FROM bill_data WHERE bill_id = ? AND `timestamp` >= FROM_UNIXTIME( ? ) AND `timestamp` <= FROM_UNIXTIME( ? ) ORDER BY timestamp ASC', array($bill_id, $start, $end)) as $row) {
@$timestamp = $row['formatted_date']; $timestamp = $row['formatted_date'];
if (!$first) { if (!$first) {
$first = $timestamp; $first = $timestamp;
} }

2
html/csv.php
View File

@ -37,7 +37,7 @@ require 'includes/authenticate.inc.php';
$report = mres($vars['report']); $report = mres($vars['report']);
if (!empty($report) && file_exists("includes/reports/$report.csv.inc.php")) { if (!empty($report) && file_exists("includes/reports/$report.csv.inc.php")) {
if ($debug == false) { if ($debug === false) {
header('Content-Type: text/csv'); header('Content-Type: text/csv');
header('Content-Disposition: attachment; filename="'.$report.'-'.date('Ymd').'.csv"'); header('Content-Disposition: attachment; filename="'.$report.'-'.date('Ymd').'.csv"');
} }

2
html/includes/PasswordHash.php
View File

@ -47,8 +47,6 @@ class PasswordHash {
function get_random_bytes($count) function get_random_bytes($count)
{ {
$output = '';
$output = openssl_random_pseudo_bytes($count,$strong); $output = openssl_random_pseudo_bytes($count,$strong);
if(empty($output)) if(empty($output))

3
html/includes/functions.inc.php
View File

@ -673,6 +673,7 @@ function overlibprint($text) {
function humanmedia($media) { function humanmedia($media) {
global $rewrite_iftype;
array_preg_replace($rewrite_iftype, $media); array_preg_replace($rewrite_iftype, $media);
return $media; return $media;
@ -825,7 +826,7 @@ function generate_ap_link($args, $text=null, $type=null) {
$url = generate_ap_url($args); $url = generate_ap_url($args);
if (port_permitted($args['interface_id'], $args['device_id'])) { if (port_permitted($args['interface_id'], $args['device_id'])) {
return overlib_link($url, $text, $content, $class); return overlib_link($url, $text, $content, null);
} }
else { else {
return fixifName($text); return fixifName($text);

3
html/includes/graphs/device/collectd.inc.php
View File

@ -94,6 +94,7 @@ function error($code, $code_msg, $title, $msg) {
imagestring($png, 5, 60, 35, sprintf('%s [%d]', $code_msg, $code), $c_etxt); imagestring($png, 5, 60, 35, sprintf('%s [%d]', $code_msg, $code), $c_etxt);
if (function_exists('imagettfbbox') && is_file($config['error_font'])) { if (function_exists('imagettfbbox') && is_file($config['error_font'])) {
// Detailled error message // Detailled error message
$errorfont = $config['error_font'];
$fmt_msg = makeTextBlock($msg, $errorfont, 10, ($w - 86)); $fmt_msg = makeTextBlock($msg, $errorfont, 10, ($w - 86));
$fmtbox = imagettfbbox(12, 0, $errorfont, $fmt_msg); $fmtbox = imagettfbbox(12, 0, $errorfont, $fmt_msg);
imagettftext($png, 10, 0, 55, (35 + 3 + imagefontwidth(5) - $fmtbox[7] + $fmtbox[1]), $c_txt, $errorfont, $fmt_msg); imagettftext($png, 10, 0, 55, (35 + 3 + imagefontwidth(5) - $fmtbox[7] + $fmtbox[1]), $c_txt, $errorfont, $fmt_msg);
@ -274,7 +275,7 @@ else if ($rrd_cmd) {
header('Cache-Control: max-age=60'); header('Cache-Control: max-age=60');
$rt = 0; $rt = 0;
passthru($rrd_cmd, $rt); passthru($rrd_cmd, $rt);
if ($rt != 0) { if ($rt !== 0) {
return error500($graph_identifier, 'RRD failed to generate the graph: '.$rt); return error500($graph_identifier, 'RRD failed to generate the graph: '.$rt);
} }

2
html/includes/graphs/device/toner.inc.php
View File

@ -7,7 +7,7 @@ $rrd_options .= ' -l 0 -E ';
$iter = '1'; $iter = '1';
$rrd_options .= " COMMENT:'Toner level Cur Min Max\\n'"; $rrd_options .= " COMMENT:'Toner level Cur Min Max\\n'";
foreach (dbFetchRows('SELECT * FROM toner where device_id = ?', array($device['device_id'])) as $toner) { foreach (dbFetchRows('SELECT * FROM toner where device_id = ?', array($device['device_id'])) as $toner) {
$colour = toner2colour($toner['toner_descr']); $colour = toner2colour($toner['toner_descr'], 100 - $toner['toner_current']);
if ($colour['left'] == null) { if ($colour['left'] == null) {
// FIXME generic colour function // FIXME generic colour function

2
html/includes/graphs/toner/usage.inc.php
View File

@ -6,7 +6,7 @@ require 'includes/graphs/common.inc.php';
$rrd_options .= " COMMENT:' Cur Max\\n'"; $rrd_options .= " COMMENT:' Cur Max\\n'";
$colour = toner2colour($toner['toner_descr']); $colour = toner2colour($toner['toner_descr'], 100 - $toner['toner_current']);
if ($colour['left'] == null) { if ($colour['left'] == null) {
$colour['left'] = 'CC0000'; $colour['left'] = 'CC0000';
} }