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

Overhaul use of rrdtool_lastupdate & STACK for rrdtool 1.4/1.5 compatibility

Browse Source
This commit is contained in:
Paul Gear
2015-11-15 11:48:39 +10:00
parent 4ce22f410c
commit 0d2949f69e
19 changed files with 46 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
includes/rrdtool.inc.php
View File

@@ -280,7 +280,8 @@ function rrdtool_lastupdate($filename, $options){
function rrdtool_escape($string, $maxlength=null){
$result = shorten_interface_type($string);
$result = str_replace('%', '%%', $result);
$result = str_replace("'", '', $result); # remove quotes
$result = str_replace('%', '%%', $result); # double percent signs
if (is_numeric($maxlength)) {
$extra = substr_count($string, ':', 0, $maxlength);
$result = substr(str_pad($result, $maxlength), 0, ($maxlength + $extra));
@@ -289,7 +290,7 @@ function rrdtool_escape($string, $maxlength=null){
}
}
$result = str_replace(':', '\:', $result);
$result = str_replace(':', '\:', $result); # escape colons
return $result.' ';
}