diff options
author | Seth Mos <seth.mos@dds.nl> | 2011-05-03 10:09:06 +0200 |
---|---|---|
committer | Seth Mos <seth.mos@dds.nl> | 2011-05-03 10:09:06 +0200 |
commit | dcb846e3cd1604ec9c0a024b6bd721d306bbce46 (patch) | |
tree | 49624a702780f2714c9141ead186bfe113043550 /usr/local/www/status_rrd_graph_img.php | |
parent | 03f824a5e540cb32a025b79ddc29baba4d1ea959 (diff) | |
parent | 8c218e1d0190a218686cf2b65913be3198791206 (diff) | |
download | pfsense-dcb846e3cd1604ec9c0a024b6bd721d306bbce46.zip pfsense-dcb846e3cd1604ec9c0a024b6bd721d306bbce46.tar.gz |
Merge remote branch 'upstream/master'
Conflicts:
usr/local/www/status_rrd_graph_img.php
Diffstat (limited to 'usr/local/www/status_rrd_graph_img.php')
-rw-r--r-- | usr/local/www/status_rrd_graph_img.php | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/usr/local/www/status_rrd_graph_img.php b/usr/local/www/status_rrd_graph_img.php index 553a629..d7e828e 100644 --- a/usr/local/www/status_rrd_graph_img.php +++ b/usr/local/www/status_rrd_graph_img.php @@ -186,31 +186,34 @@ if ($altq_list_queues[$curif]) { $speedlimit = ($upstream + $downstream); +/* Set default colors explicity, the theme can then override them below. + This prevents missing colors in themes from crashing the graphs. */ +$colortrafficup = array("666666", "CCCCCC", "b36666", "bd9090"); +$colortrafficdown = array("990000", "CC0000", "b36666", "bd9090"); +$colorpacketsup = array("666666", "CCCCCC", "b36666", "bd9090"); +$colorpacketsdown = array("990000", "CC0000", "b36666", "bd9090"); +$colortraffic95 = array("660000", "FF0000"); +$colorstates = array('990000','a83c3c','b36666','bd9090','cccccc','000000'); +$colorprocessor = array('990000','a83c3c','b36666','bd9090','cccccc','000000'); +$colormemory = array('990000','a83c3c','b36666','bd9090','cccccc','000000'); +$colorqueuesup = array('000000','7B0000','990000','BB0000','CC0000','D90000','EE0000','FF0000','CC0000'); +$colorqueuesdown = array('000000','7B7B7B','999999','BBBBBB','CCCCCC','D9D9D9','EEEEEE','FFFFFF','CCCCCC'); +$colorqueuesdropup = array('000000','7B0000','990000','BB0000','CC0000','D90000','EE0000','FF0000','CC0000'); +$colorqueuesdropdown = array('000000','7B7B7B','999999','BBBBBB','CCCCCC','D9D9D9','EEEEEE','FFFFFF','CCCCCC'); +$colorqualityrtt = array('990000','a83c3c','b36666','bd9090','cccccc','000000'); +$colorqualityloss = "ee0000"; +$colorwireless = array('333333','a83c3c','999999'); +$colorspamdtime = array('DDDDFF', 'AAAAFF', 'DDDDFF', '000066'); +$colorspamdconn = array('00AA00BB', 'FFFFFFFF', '00660088', 'FFFFFF88', '006600'); +$colorvpnusers = array('990000'); +$colorcaptiveportalusers = array('990000'); + /* select theme colors if the inclusion file exists */ $rrdcolors = "{$g['www_path']}/themes/{$g['theme']}/rrdcolors.inc.php"; if(file_exists($rrdcolors)) { include($rrdcolors); } else { log_error(sprintf(gettext("rrdcolors.inc.php for theme %s does not exist, using defaults!"),$g['theme'])); - $colortrafficup = array("666666", "CCCCCC", "b36666", "bd9090"); - $colortrafficdown = array("990000", "CC0000", "b36666", "bd9090"); - $colorpacketsup = array("666666", "CCCCCC", "b36666", "bd9090"); - $colorpacketsdown = array("990000", "CC0000", "b36666", "bd9090"); - $colortraffic95 = array("660000", "FF0000"); - $colorstates = array('990000','a83c3c','b36666','bd9090','cccccc','000000'); - $colorprocessor = array('990000','a83c3c','b36666','bd9090','cccccc','000000'); - $colormemory = array('990000','a83c3c','b36666','bd9090','cccccc','000000'); - $colorqueuesup = array('000000','7B0000','990000','BB0000','CC0000','D90000','EE0000','FF0000','CC0000'); - $colorqueuesdown = array('000000','7B7B7B','999999','BBBBBB','CCCCCC','D9D9D9','EEEEEE','FFFFFF','CCCCCC'); - $colorqueuesdropup = array('000000','7B0000','990000','BB0000','CC0000','D90000','EE0000','FF0000','CC0000'); - $colorqueuesdropdown = array('000000','7B7B7B','999999','BBBBBB','CCCCCC','D9D9D9','EEEEEE','FFFFFF','CCCCCC'); - $colorqualityrtt = array('990000','a83c3c','b36666','bd9090','cccccc','000000'); - $colorqualityloss = "ee0000"; - $colorwireless = array('333333','a83c3c','999999'); - $colorspamdtime = array('DDDDFF', 'AAAAFF', 'DDDDFF', '000066'); - $colorspamdconn = array('00AA00BB', 'FFFFFFFF', '00660088', 'FFFFFF88', '006600'); - $colorvpnusers = array('990000'); - $colorcaptiveportalusers = array('990000'); } switch ($curstyle) { @@ -351,7 +354,8 @@ if((strstr($curdatabase, "-traffic.rrd")) && (file_exists("$rrddbpath$curdatabas $graphcmd .= "CDEF:\"$curif-bytes_t6=$curif-bytes_in6_t_pass,$curif-bytes_out6_t_block,+\" "; $graphcmd .= "VDEF:\"$curif-in_bits_95=$curif-in_bits,95,PERCENT\" "; $graphcmd .= "CDEF:\"$curif-out_bits_mul=$curif-out_bits,$multiplier,*\" "; - $graphcmd .= "VDEF:\"$curif-out_bits_95=$curif-out_bits_mul,95,PERCENT\" "; + $perc = $multiplier > 0 ? "95" : "5"; + $graphcmd .= "VDEF:\"$curif-out_bits_95=$curif-out_bits_mul,{$perc},PERCENT\" "; $graphcmd .= "AREA:\"$curif-in_bits_block#{$colortrafficdown[1]}:$curif-in-block\" "; $graphcmd .= "AREA:\"$curif-in_bits_pass#{$colortrafficdown[0]}:$curif-in-pass:STACK\" "; |