From cd2f60c968ae0c7f3bec66c98019d69e68e11a46 Mon Sep 17 00:00:00 2001 From: smos Date: Wed, 30 Mar 2011 18:22:15 +0200 Subject: Add missing color, add multiplier to calculus for inverting line --- usr/local/www/status_rrd_graph_img.php | 2 +- usr/local/www/themes/the_wall/rrdcolors.inc.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'usr/local') diff --git a/usr/local/www/status_rrd_graph_img.php b/usr/local/www/status_rrd_graph_img.php index 22802bc..795980f 100644 --- a/usr/local/www/status_rrd_graph_img.php +++ b/usr/local/www/status_rrd_graph_img.php @@ -315,7 +315,7 @@ if((strstr($curdatabase, "-traffic.rrd")) && (file_exists("$rrddbpath$curdatabas $graphcmd .= "CDEF:\"$curif-bytes_t=$curif-bytes_in_t_pass,$curif-bytes_out_t_block,+\" "; $graphcmd .= "VDEF:\"$curif-in_bits_95=$curif-in_bits,95,PERCENT\" "; - $graphcmd .= "VDEF:\"$curif-out_bits_95=$curif-out_bits,95,PERCENT\" "; + $graphcmd .= "VDEF:\"$curif-out_bits_95=$curif-out_bits,95,PERCENT,$multiplier,*\" "; $graphcmd .= "AREA:\"$curif-in_bits_block#{$colortrafficdown[1]}:$curif-in-block\" "; $graphcmd .= "AREA:\"$curif-in_bits_pass#{$colortrafficdown[0]}:$curif-in-pass:STACK\" "; diff --git a/usr/local/www/themes/the_wall/rrdcolors.inc.php b/usr/local/www/themes/the_wall/rrdcolors.inc.php index c2bc613..09956cc 100644 --- a/usr/local/www/themes/the_wall/rrdcolors.inc.php +++ b/usr/local/www/themes/the_wall/rrdcolors.inc.php @@ -32,6 +32,7 @@ $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'); -- cgit v1.1 From 44bcc1bedceb947c58623b85dcc83b2bc578f79d Mon Sep 17 00:00:00 2001 From: jim-p Date: Wed, 30 Mar 2011 15:21:00 -0400 Subject: Allow importing a CRL for an external CA. --- usr/local/www/system_crlmanager.php | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'usr/local') diff --git a/usr/local/www/system_crlmanager.php b/usr/local/www/system_crlmanager.php index 90b61d6..67e4b2f 100644 --- a/usr/local/www/system_crlmanager.php +++ b/usr/local/www/system_crlmanager.php @@ -253,14 +253,14 @@ include("head.inc"); function method_change() { - method = document.iform.method.selectedIndex; + method = document.iform.method.value; switch (method) { - case 0: + case "internal": document.getElementById("existing").style.display="none"; document.getElementById("internal").style.display=""; break; - case 1: + case "existing": document.getElementById("existing").style.display=""; document.getElementById("internal").style.display="none"; break; @@ -302,6 +302,8 @@ function method_change() { + + + @@ -260,7 +289,7 @@ function method_change() { - + + + + + + + +
@@ -303,6 +332,15 @@ function method_change() {
+ +
@@ -482,6 +520,9 @@ function method_change() {
    + + " alt="" width="17" height="17" border="0" /> + " alt="" width="17" height="17" border="0" /> -- cgit v1.1 From 84575284b533458fe914ee0bd0640056890dec1a Mon Sep 17 00:00:00 2001 From: jim-p Date: Wed, 30 Mar 2011 20:48:24 -0400 Subject: Apparently rrdtool VDEF functions can't take a multiplier, only CDEF. Fixes traffic graphs. --- usr/local/www/status_rrd_graph_img.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'usr/local') diff --git a/usr/local/www/status_rrd_graph_img.php b/usr/local/www/status_rrd_graph_img.php index 795980f..22802bc 100644 --- a/usr/local/www/status_rrd_graph_img.php +++ b/usr/local/www/status_rrd_graph_img.php @@ -315,7 +315,7 @@ if((strstr($curdatabase, "-traffic.rrd")) && (file_exists("$rrddbpath$curdatabas $graphcmd .= "CDEF:\"$curif-bytes_t=$curif-bytes_in_t_pass,$curif-bytes_out_t_block,+\" "; $graphcmd .= "VDEF:\"$curif-in_bits_95=$curif-in_bits,95,PERCENT\" "; - $graphcmd .= "VDEF:\"$curif-out_bits_95=$curif-out_bits,95,PERCENT,$multiplier,*\" "; + $graphcmd .= "VDEF:\"$curif-out_bits_95=$curif-out_bits,95,PERCENT\" "; $graphcmd .= "AREA:\"$curif-in_bits_block#{$colortrafficdown[1]}:$curif-in-block\" "; $graphcmd .= "AREA:\"$curif-in_bits_pass#{$colortrafficdown[0]}:$curif-in-pass:STACK\" "; -- cgit v1.1 From 78544d4a99c90f3c19b3cd53c2f1873b625c21bf Mon Sep 17 00:00:00 2001 From: Chris Buechler Date: Thu, 31 Mar 2011 06:05:39 -0400 Subject: clarify text --- usr/local/www/system_advanced_admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'usr/local') diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php index e23ceb0..9f8b2d7 100644 --- a/usr/local/www/system_advanced_admin.php +++ b/usr/local/www/system_advanced_admin.php @@ -331,7 +331,7 @@ function prot_change() { /> - +