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

more rrdtool_escape goodness

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@3230 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2012-05-23 10:37:23 +00:00
parent 75113e0218
commit cc7f01ee26
19 changed files with 54 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
html/includes/graphs/application/shoutcast_multi_stats.inc.php
View File

@@ -59,7 +59,7 @@ foreach ($rrd_list as $rrd)
{
$colours = (isset($rrd['colour']) ? $rrd['colour'] : "default");
$strlen = ((strlen($rrd['descr'])<$descr_len) ? ($descr_len - strlen($rrd['descr'])) : "0");
$descr = (isset($rrd['descr']) ? str_replace(":", "\:", substr(str_pad($rrd['descr'], $desc_len+$strlen), 0, $descr_len+$strlen)) : "Unkown");
$descr = (isset($rrd['descr']) ? rrdtool_escape($rrd['descr'], $desc_len+$strlen) : "Unkown");
for ($z=0; $z<$strlen; $z++) { $descr .= " "; }
if ($i) { $stack = "STACK"; }
$colour = $config['graph_colours'][$colours][$x];
@@ -86,7 +86,7 @@ foreach ($rrd_list as $rrd)
if (!$nototal)
{
$strlen = ((strlen($total_text)<$descr_len) ? ($descr_len - strlen($total_text)) : "0");
$descr = (isset($total_text) ? str_replace(":", "\:", substr(str_pad($total_text, $desc_len+$strlen), 0, $descr_len+$strlen)) : "Total");
$descr = (isset($total_text) ? rrdtool_escape($total_text, $desc_len+$strlen) : "Total");
$colour = $config['graph_colours'][$colours][$x];
for ($z=0; $z<$strlen; $z++) { $descr .= " "; }
$rrd_options .= " CDEF:totcur=cur0".$totcur;