From b01adece6e555164cc2b22cbcdc299e9d5be971a Mon Sep 17 00:00:00 2001 From: jim-p Date: Mon, 2 May 2011 15:32:04 -0400 Subject: Set default colors explicity, the theme can then override them. This prevents missing colors in themes from crashing the graphs. --- usr/local/www/status_rrd_graph_img.php | 41 ++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 19 deletions(-) (limited to 'usr/local/www') diff --git a/usr/local/www/status_rrd_graph_img.php b/usr/local/www/status_rrd_graph_img.php index a6dbef0..d21f91c 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"); +$colortrafficdown = array("990000", "CC0000"); +$colortraffic95 = array("660000", "FF0000"); +$colorpacketsup = array("666666", "CCCCCC"); +$colorpacketsdown = array("990000", "CC0000"); +$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"); - $colortrafficdown = array("990000", "CC0000"); - $colortraffic95 = array("660000", "FF0000"); - $colorpacketsup = array("666666", "CCCCCC"); - $colorpacketsdown = array("990000", "CC0000"); - $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) { -- cgit v1.1