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

Fix logic bugs and strip %%

Browse Source
This commit is contained in:
f0o
2015-05-11 13:02:40 +00:00
parent 651f9d9d87
commit a8e5880423
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
html/includes/graphs/common.inc.php
View File

@ -7,9 +7,9 @@ if($config['trim_tobias']) { $width+=12; }
if ($_GET['height']) { $height = mres($_GET['height']); } if ($_GET['height']) { $height = mres($_GET['height']); }
if ($_GET['inverse']) { $in = 'out'; $out = 'in'; $inverse=TRUE; } else { $in = 'in'; $out = 'out'; } if ($_GET['inverse']) { $in = 'out'; $out = 'in'; $inverse=TRUE; } else { $in = 'in'; $out = 'out'; }
if ($_GET['legend'] == "no") { $rrd_options .= " -g"; } if ($_GET['legend'] == "no") { $rrd_options .= " -g"; }
if ($_GET['nototal']) { $nototal=TRUE;} else { $nototal=FALSE;} if (empty($_GET['nototal'])) { $nototal=TRUE; } else { $nototal=FALSE; }
if ($_GET['nodetails']) { $nodetails=TRUE; } else { $nodetails=FALSE; } if (empty($_GET['nodetails'])) { $nodetails=TRUE; } else { $nodetails=FALSE; }
if ($_GET['noagg']) { $noagg=TRUE; } else { $noagg=FALSE; } if (empty($_GET['noagg'])) { $noagg=TRUE; } else { $noagg=FALSE; }
if ($_GET['title'] == "yes") { $rrd_options .= " --title='".$graph_title."' "; } if ($_GET['title'] == "yes") { $rrd_options .= " --title='".$graph_title."' "; }
if (isset($_GET['graph_title'])) { $rrd_options .= " --title='".$_GET['graph_title']."' "; } if (isset($_GET['graph_title'])) { $rrd_options .= " --title='".$_GET['graph_title']."' "; }

1
includes/rrdtool.inc.php
View File

@ -257,6 +257,7 @@ function rrdtool_lastupdate($filename, $options)
function rrdtool_escape($string, $maxlength = NULL) function rrdtool_escape($string, $maxlength = NULL)
{ {
$result = shorten_interface_type($string); $result = shorten_interface_type($string);
$result = str_replace('%','%%',$result);
if ( is_numeric($maxlength) ) { if ( is_numeric($maxlength) ) {
$extra = substr_count($string,':',0,$maxlength); $extra = substr_count($string,':',0,$maxlength);
$result = substr(str_pad($result, $maxlength),0,$maxlength+$extra); $result = substr(str_pad($result, $maxlength),0,$maxlength+$extra);